2015-08-07 09:17:10 -04:00
|
|
|
/**
|
|
|
|
* MR -> show: Automerge widget
|
2012-06-13 13:02:30 -04:00
|
|
|
*
|
|
|
|
*/
|
2015-06-11 09:14:50 -04:00
|
|
|
.mr-state-widget {
|
2015-10-05 15:18:21 -04:00
|
|
|
background: #F7F8FA;
|
2015-08-07 09:17:10 -04:00
|
|
|
margin-bottom: 20px;
|
2015-09-08 10:42:18 -04:00
|
|
|
color: $gl-gray;
|
2015-10-05 15:18:21 -04:00
|
|
|
border: 1px solid #dce0e6;
|
|
|
|
@include border-radius(2px);
|
2015-08-07 09:17:10 -04:00
|
|
|
|
2012-09-19 02:14:07 -04:00
|
|
|
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 {
|
|
|
|
.accept-action {
|
|
|
|
display: inline-block;
|
|
|
|
}
|
|
|
|
|
|
|
|
.accept-control {
|
|
|
|
display: inline-block;
|
2015-02-19 18:02:49 -05:00
|
|
|
margin: 0;
|
2014-01-06 08:05:57 -05:00
|
|
|
margin-left: 20px;
|
2015-08-07 09:17:10 -04:00
|
|
|
padding: 5px;
|
2014-12-30 10:28:34 -05:00
|
|
|
line-height: 20px;
|
|
|
|
|
2015-09-08 10:42:18 -04:00
|
|
|
&.right {
|
|
|
|
float: right;
|
|
|
|
padding-top: 12px;
|
|
|
|
a {
|
|
|
|
color: $gl-gray;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
2015-08-07 09:17:10 -04:00
|
|
|
|
|
|
|
.ci_widget {
|
2015-09-08 10:42:18 -04:00
|
|
|
border-bottom: 1px solid #eef0f2;
|
2015-08-07 09:17:10 -04:00
|
|
|
|
|
|
|
i {
|
|
|
|
margin-right: 4px;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-success {
|
|
|
|
color: $gl-success;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-skipped {
|
|
|
|
background-color: #eee;
|
|
|
|
color: #888;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-pending,
|
|
|
|
&.ci-running {
|
|
|
|
color: $gl-warning;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-failed,
|
|
|
|
&.ci-canceled,
|
|
|
|
&.ci-error {
|
|
|
|
color: $gl-danger;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.mr-widget-body,
|
|
|
|
.ci_widget,
|
|
|
|
.mr-widget-footer {
|
|
|
|
padding: 15px;
|
|
|
|
}
|
2015-10-08 16:22:34 -04:00
|
|
|
|
2015-10-05 15:18:21 -04:00
|
|
|
.normal {
|
|
|
|
color: #5c5d5e;
|
|
|
|
}
|
2015-08-07 09:17:10 -04:00
|
|
|
|
|
|
|
.mr-widget-body {
|
|
|
|
h4 {
|
2015-10-05 15:18:21 -04:00
|
|
|
font-weight: 600;
|
|
|
|
font-size: 17px;
|
2015-08-07 09:17:10 -04:00
|
|
|
margin: 5px 0;
|
2015-10-05 15:18:21 -04:00
|
|
|
color: #313236;
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
p:last-child {
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.mr-widget-footer {
|
|
|
|
border-top: 1px solid #EEE;
|
|
|
|
}
|
|
|
|
|
|
|
|
.ci-coverage {
|
|
|
|
float: right;
|
|
|
|
}
|
2012-06-13 13:02:30 -04:00
|
|
|
}
|
2012-06-29 14:55:22 -04:00
|
|
|
|
2015-10-08 16:22:34 -04:00
|
|
|
.merge-request .merge-request-tabs {
|
2015-09-07 19:25:51 -04:00
|
|
|
@include nav-menu;
|
2015-09-08 10:42:18 -04:00
|
|
|
margin: -$gl-padding;
|
|
|
|
padding: $gl-padding;
|
|
|
|
text-align: center;
|
2015-10-05 15:18:21 -04:00
|
|
|
margin-bottom: 1px;
|
2015-08-07 12:00:55 -04:00
|
|
|
}
|
|
|
|
|
2015-10-08 16:22:34 -04:00
|
|
|
// Mobile
|
|
|
|
@media (max-width: 480px) {
|
|
|
|
.merge-request .merge-request-tabs {
|
|
|
|
margin: 0;
|
|
|
|
padding: 0;
|
|
|
|
|
|
|
|
li {
|
|
|
|
a {
|
|
|
|
padding: 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 {
|
2015-10-05 15:18:21 -04:00
|
|
|
color: #313236;
|
2013-04-06 08:10:24 -04:00
|
|
|
font-family: $monospace_font;
|
2015-08-07 10:04:17 -04:00
|
|
|
font-weight: bold;
|
2013-08-08 10:29:31 -04:00
|
|
|
overflow: hidden;
|
2015-10-05 15:18:21 -04:00
|
|
|
font-size: 14px;
|
|
|
|
margin: 0 3px;
|
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;
|
2015-02-20 00:55:47 -05:00
|
|
|
font-weight: bold;
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-info {
|
2015-09-03 09:46:13 -04:00
|
|
|
color: $gl-gray;
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
2015-04-21 04:28:03 -04:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-labels {
|
|
|
|
display: inline-block;
|
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-no-comments {
|
|
|
|
opacity: 0.5;
|
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
|
|
|
|
2015-02-18 03:23:01 -05:00
|
|
|
.merge-request-show-labels {
|
|
|
|
a {
|
|
|
|
margin-right: 5px;
|
|
|
|
margin-bottom: 5px;
|
|
|
|
display: inline-block;
|
|
|
|
.color-label {
|
|
|
|
padding: 6px 10px;
|
|
|
|
}
|
|
|
|
}
|
2014-04-14 21:12:07 -04:00
|
|
|
}
|
2015-03-18 23:46:26 -04:00
|
|
|
|
|
|
|
.merge-request-form .select2-container {
|
|
|
|
width: 250px !important;
|
|
|
|
}
|
2015-08-08 15:17:43 -04:00
|
|
|
|
2015-08-09 11:34:28 -04:00
|
|
|
#modal_merge_info .modal-dialog {
|
|
|
|
width: 600px;
|
2015-10-23 09:44:39 -04:00
|
|
|
|
|
|
|
.btn-clipboard {
|
|
|
|
@extend .pull-right;
|
|
|
|
|
|
|
|
margin-right: 18px;
|
|
|
|
margin-top: 5px;
|
|
|
|
position: absolute;
|
|
|
|
right: 0;
|
|
|
|
}
|
2015-08-09 11:34:28 -04:00
|
|
|
}
|
2015-08-10 08:16:40 -04:00
|
|
|
|
2015-08-08 15:17:43 -04:00
|
|
|
.mr-source-target {
|
|
|
|
line-height: 31px;
|
|
|
|
}
|