2012-06-13 13:02:30 -04:00
|
|
|
|
2014-07-30 16:04:47 -04:00
|
|
|
/**
|
|
|
|
* MR -> show: Automerge widget
|
2012-06-13 13:02:30 -04:00
|
|
|
*
|
|
|
|
*/
|
2012-09-19 02:14:07 -04:00
|
|
|
.automerge_widget {
|
|
|
|
form {
|
2012-11-23 11:33:43 -05:00
|
|
|
margin-bottom: 0;
|
2012-09-19 02:14:07 -04:00
|
|
|
.clearfix {
|
2012-11-23 11:33:43 -05:00
|
|
|
margin-bottom: 0;
|
2012-06-13 13:02:30 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-30 10:28:34 -05:00
|
|
|
.accept-merge-holder {
|
|
|
|
margin-top: 5px;
|
|
|
|
|
|
|
|
.accept-action {
|
|
|
|
display: inline-block;
|
|
|
|
|
|
|
|
.accept_merge_request {
|
|
|
|
padding: 10px 20px;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.accept-control {
|
|
|
|
display: inline-block;
|
2014-01-06 08:05:57 -05:00
|
|
|
margin-left: 20px;
|
2014-12-30 10:28:34 -05:00
|
|
|
padding: 10px 0;
|
|
|
|
line-height: 20px;
|
|
|
|
font-weight: bold;
|
|
|
|
|
2015-01-12 07:35:29 -05:00
|
|
|
.remove_source_checkbox {
|
2014-12-30 10:28:34 -05:00
|
|
|
margin: 0;
|
|
|
|
}
|
2014-01-06 08:05:57 -05:00
|
|
|
}
|
2012-06-13 13:02:30 -04:00
|
|
|
}
|
|
|
|
}
|
2012-06-29 14:55:22 -04:00
|
|
|
|
2014-12-25 07:46:18 -05:00
|
|
|
@media(min-width: $screen-sm-max) {
|
|
|
|
.merge-request .merge-request-tabs{
|
|
|
|
margin: 20px 0;
|
2014-06-03 03:27:50 -04:00
|
|
|
|
2014-12-25 07:46:18 -05:00
|
|
|
li {
|
|
|
|
a {
|
|
|
|
padding: 15px 40px;
|
|
|
|
font-size: 14px;
|
|
|
|
}
|
2012-06-29 14:55:22 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-07-17 01:17:16 -04:00
|
|
|
|
2012-09-19 02:14:07 -04:00
|
|
|
.mr_source_commit,
|
|
|
|
.mr_target_commit {
|
|
|
|
.commit {
|
2012-11-23 11:33:43 -05:00
|
|
|
margin: 0;
|
2014-02-15 07:52:33 -05:00
|
|
|
padding: 2px 0;
|
2012-11-23 11:33:43 -05:00
|
|
|
list-style: none;
|
2012-09-19 02:14:07 -04:00
|
|
|
&:hover {
|
2012-11-23 11:33:43 -05:00
|
|
|
background: none;
|
2012-08-29 15:29:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-06 08:10:24 -04:00
|
|
|
.label-branch {
|
|
|
|
@include border-radius(4px);
|
2014-07-30 16:04:47 -04:00
|
|
|
padding: 3px 4px;
|
2013-04-06 08:10:24 -04:00
|
|
|
border: none;
|
2014-07-30 16:04:47 -04:00
|
|
|
background: $hover;
|
|
|
|
color: #333;
|
2013-04-06 08:10:24 -04:00
|
|
|
font-family: $monospace_font;
|
|
|
|
font-weight: normal;
|
2013-08-08 10:29:31 -04:00
|
|
|
overflow: hidden;
|
|
|
|
|
|
|
|
.label-project {
|
|
|
|
@include border-radius-left(4px);
|
|
|
|
padding: 3px 4px;
|
2013-08-08 11:59:46 -04:00
|
|
|
background: #279;
|
2013-08-08 10:29:31 -04:00
|
|
|
position: relative;
|
|
|
|
left: -4px;
|
|
|
|
letter-spacing: -1px;
|
|
|
|
}
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.mr-list {
|
|
|
|
.merge-request {
|
2014-06-03 03:01:15 -04:00
|
|
|
padding: 10px 15px;
|
2013-04-06 08:10:24 -04:00
|
|
|
position: relative;
|
|
|
|
|
|
|
|
.merge-request-title {
|
|
|
|
margin-bottom: 5px;
|
2015-01-15 17:55:45 -05:00
|
|
|
font-size: $list-font-size;
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-info {
|
|
|
|
color: #999;
|
2014-04-14 21:12:07 -04:00
|
|
|
|
|
|
|
.merge-request-labels {
|
|
|
|
display: inline-block;
|
|
|
|
}
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-07-17 08:48:22 -04:00
|
|
|
|
|
|
|
.merge-request-angle {
|
|
|
|
text-align: center;
|
2013-11-12 15:32:28 -05:00
|
|
|
margin: 0 auto;
|
2014-01-01 15:27:10 -05:00
|
|
|
font-size: 2em;
|
|
|
|
line-height: 1.1;
|
2013-07-17 08:48:22 -04:00
|
|
|
}
|
|
|
|
|
2013-07-17 11:35:28 -04:00
|
|
|
.merge-request-form-info {
|
2013-11-12 15:32:28 -05:00
|
|
|
padding-top: 15px;
|
|
|
|
}
|
2014-02-28 15:23:08 -05:00
|
|
|
|
|
|
|
// hide mr close link for inline diff comment form
|
2014-02-28 15:43:16 -05:00
|
|
|
.diff-file .close-mr-link,
|
|
|
|
.diff-file .reopen-mr-link {
|
|
|
|
display: none;
|
2014-02-28 15:23:08 -05:00
|
|
|
}
|
2014-04-06 10:10:37 -04:00
|
|
|
|
|
|
|
.mr-state-widget {
|
2014-10-08 08:47:24 -04:00
|
|
|
background: $box_bg;
|
2014-10-07 08:11:18 -04:00
|
|
|
margin-bottom: 20px;
|
2014-12-25 07:32:49 -05:00
|
|
|
color: #666;
|
2014-10-07 08:11:18 -04:00
|
|
|
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.09));
|
|
|
|
|
|
|
|
.ci_widget {
|
|
|
|
padding: 10px 15px;
|
|
|
|
font-size: 15px;
|
2014-10-14 10:47:31 -04:00
|
|
|
border-bottom: 1px solid #BBB;
|
|
|
|
color: #777;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #F5F5F5;
|
2014-10-07 08:11:18 -04:00
|
|
|
|
|
|
|
&.ci-success {
|
|
|
|
color: $bg_success;
|
|
|
|
border-color: $border_success;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #F1FAF1;
|
2014-10-07 08:11:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-pending {
|
|
|
|
color: #548;
|
|
|
|
border-color: #548;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #F4F1FA;
|
2014-10-07 08:11:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-running {
|
|
|
|
color: $bg_warning;
|
|
|
|
border-color: $border_warning;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #FAF5F1;
|
2014-10-07 08:11:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-failed {
|
|
|
|
color: $bg_danger;
|
|
|
|
border-color: $border_danger;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #FAF1F1;
|
2014-10-07 08:11:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-error {
|
|
|
|
color: $bg_danger;
|
|
|
|
border-color: $border_danger;
|
2014-10-17 13:27:30 -04:00
|
|
|
background-color: #FAF1F1;
|
2014-10-07 08:11:18 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.mr-widget-body {
|
|
|
|
padding: 10px 15px;
|
|
|
|
|
2014-04-06 10:10:37 -04:00
|
|
|
h4 {
|
2014-10-14 10:47:31 -04:00
|
|
|
font-weight: normal;
|
2014-04-06 10:10:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
p:last-child {
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
|
|
|
}
|
2014-10-02 11:17:47 -04:00
|
|
|
|
2014-10-07 08:11:18 -04:00
|
|
|
.mr-widget-footer {
|
|
|
|
padding: 10px 15px;
|
|
|
|
border-top: 1px solid #EEE;
|
|
|
|
}
|
|
|
|
|
2014-10-02 11:17:47 -04:00
|
|
|
.ci-coverage {
|
|
|
|
float: right;
|
|
|
|
}
|
2014-04-06 10:10:37 -04:00
|
|
|
}
|
2014-04-14 21:12:07 -04:00
|
|
|
|
|
|
|
.merge-request-show-labels .label {
|
|
|
|
padding: 6px 10px;
|
|
|
|
}
|