2012-06-13 13:02:30 -04:00
|
|
|
|
|
|
|
/**
|
|
|
|
* MR -> show: Automerge widget
|
|
|
|
*
|
|
|
|
*/
|
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-01-01 14:59:45 -05:00
|
|
|
.accept-group {
|
2014-01-06 08:05:57 -05:00
|
|
|
label {
|
|
|
|
margin: 5px;
|
|
|
|
margin-left: 20px;
|
|
|
|
}
|
2012-06-13 13:02:30 -04:00
|
|
|
}
|
|
|
|
}
|
2012-06-29 14:55:22 -04:00
|
|
|
|
2014-05-27 05:06:31 -04:00
|
|
|
.merge-request .merge-request-tabs{
|
|
|
|
border-color: #AAA;
|
2012-09-19 02:14:07 -04:00
|
|
|
li {
|
|
|
|
a {
|
2014-05-27 05:06:31 -04:00
|
|
|
border-color: #AAA;
|
|
|
|
padding: 14px 40px;
|
|
|
|
font-size: 14px;
|
|
|
|
background-color: #F9F9F9;
|
|
|
|
}
|
|
|
|
&.active a {
|
|
|
|
border-color: #AAA;
|
|
|
|
border-bottom-color: #FFF;
|
|
|
|
background-color: #FFF;
|
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-04-06 10:10:37 -04:00
|
|
|
padding: 2px 4px;
|
2013-04-06 08:10:24 -04:00
|
|
|
border: none;
|
2014-04-06 10:10:37 -04:00
|
|
|
background: #555;
|
2013-04-06 08:10:24 -04:00
|
|
|
color: #fff;
|
|
|
|
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;
|
|
|
|
font-size: 14px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.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 {
|
|
|
|
.panel-body {
|
|
|
|
h4 {
|
|
|
|
margin-top: 0px;
|
|
|
|
}
|
|
|
|
|
|
|
|
p:last-child {
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-04-14 21:12:07 -04:00
|
|
|
|
|
|
|
.merge-request-show-labels .label {
|
|
|
|
padding: 6px 10px;
|
|
|
|
}
|