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 {
|
2016-01-13 09:58:04 -05:00
|
|
|
background: $background-color;
|
2015-09-08 10:42:18 -04:00
|
|
|
color: $gl-gray;
|
2016-01-13 09:58:04 -05:00
|
|
|
border: 1px solid $border-color;
|
2015-10-05 15:18:21 -04:00
|
|
|
@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;
|
2015-11-02 11:27:38 -05:00
|
|
|
float: left;
|
2015-11-06 17:45:33 -05:00
|
|
|
|
|
|
|
.accept_merge_request {
|
|
|
|
&.ci-pending,
|
|
|
|
&.ci-running {
|
|
|
|
@include btn-orange;
|
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-skipped,
|
|
|
|
&.ci-failed,
|
|
|
|
&.ci-canceled,
|
|
|
|
&.ci-error {
|
|
|
|
@include btn-red;
|
|
|
|
}
|
|
|
|
}
|
2014-12-30 10:28:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
.accept-control {
|
|
|
|
display: inline-block;
|
2015-11-02 11:27:38 -05:00
|
|
|
float: left;
|
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;
|
2016-05-31 15:08:40 -04:00
|
|
|
padding-top: 8px;
|
2014-12-30 10:28:34 -05:00
|
|
|
line-height: 20px;
|
|
|
|
|
2015-09-08 10:42:18 -04:00
|
|
|
&.right {
|
|
|
|
float: right;
|
|
|
|
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
|
|
|
|
2016-07-19 09:47:26 -04:00
|
|
|
svg {
|
2015-08-07 09:17:10 -04:00
|
|
|
margin-right: 4px;
|
2016-07-19 09:47:26 -04:00
|
|
|
position: relative;
|
|
|
|
top: 1px;
|
2016-07-21 10:28:41 -04:00
|
|
|
overflow: visible;
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
&.ci-success {
|
|
|
|
color: $gl-success;
|
|
|
|
}
|
|
|
|
|
2016-06-29 13:06:41 -04:00
|
|
|
&.ci-success_with_warnings {
|
|
|
|
color: $gl-success;
|
|
|
|
|
|
|
|
i {
|
|
|
|
color: $gl-warning;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-07 09:17:10 -04:00
|
|
|
&.ci-skipped {
|
|
|
|
background-color: #eee;
|
|
|
|
color: #888;
|
|
|
|
}
|
|
|
|
|
2016-07-12 16:58:26 -04:00
|
|
|
&.ci-pending {
|
2015-08-07 09:17:10 -04:00
|
|
|
color: $gl-warning;
|
|
|
|
}
|
|
|
|
|
2016-07-12 16:58:26 -04:00
|
|
|
&.ci-running {
|
|
|
|
color: $blue-normal;
|
|
|
|
}
|
|
|
|
|
2015-08-07 09:17:10 -04:00
|
|
|
&.ci-failed,
|
|
|
|
&.ci-error {
|
|
|
|
color: $gl-danger;
|
|
|
|
}
|
2015-12-08 07:04:47 -05:00
|
|
|
|
2016-06-01 12:29:44 -04:00
|
|
|
&.ci-canceled {
|
|
|
|
color: $gl-gray;
|
|
|
|
}
|
|
|
|
|
2015-12-08 07:04:47 -05:00
|
|
|
a.monospace {
|
|
|
|
color: inherit;
|
|
|
|
}
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.mr-widget-body,
|
|
|
|
.ci_widget,
|
|
|
|
.mr-widget-footer {
|
2015-12-02 08:46:15 -05:00
|
|
|
padding: $gl-padding;
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
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;
|
2016-04-25 16:02:15 -04:00
|
|
|
color: $gl-gray-dark;
|
2016-06-06 10:59:20 -04:00
|
|
|
|
|
|
|
&.has-conflicts .fa-exclamation-triangle {
|
|
|
|
color: $gl-warning;
|
|
|
|
}
|
|
|
|
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
p:last-child {
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
2016-05-31 15:08:40 -04:00
|
|
|
|
2016-06-16 15:59:17 -04:00
|
|
|
.btn-grouped {
|
|
|
|
margin-left: 0;
|
|
|
|
margin-right: 7px;
|
|
|
|
}
|
|
|
|
|
|
|
|
@media (max-width: $screen-xs-max) {
|
2016-05-31 15:08:40 -04:00
|
|
|
h4 {
|
|
|
|
font-size: 15px;
|
|
|
|
}
|
|
|
|
|
|
|
|
p {
|
|
|
|
font-size: 13px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.btn,
|
|
|
|
.btn-group,
|
|
|
|
.accept-action {
|
|
|
|
margin-bottom: 4px;
|
|
|
|
}
|
|
|
|
|
2016-06-16 15:59:17 -04:00
|
|
|
.accept-action {
|
|
|
|
width: 100%;
|
|
|
|
text-align: center;
|
|
|
|
}
|
|
|
|
|
2016-05-31 15:08:40 -04:00
|
|
|
.accept-control {
|
|
|
|
width: 100%;
|
|
|
|
text-align: center;
|
|
|
|
margin: 0;
|
|
|
|
}
|
|
|
|
}
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.mr-widget-footer {
|
2016-03-15 15:56:28 -04:00
|
|
|
border-top: 1px solid #eee;
|
2015-08-07 09:17:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.ci-coverage {
|
|
|
|
float: right;
|
|
|
|
}
|
2012-06-13 13:02:30 -04:00
|
|
|
}
|
2012-06-29 14:55:22 -04:00
|
|
|
|
2012-09-19 02:14:07 -04:00
|
|
|
.mr_source_commit,
|
|
|
|
.mr_target_commit {
|
2016-03-15 10:43:40 -04:00
|
|
|
margin-bottom: 0;
|
|
|
|
|
2012-09-19 02:14:07 -04:00
|
|
|
.commit {
|
2012-11-23 11:33:43 -05:00
|
|
|
margin: 0;
|
2016-07-05 11:16:49 -04:00
|
|
|
padding-top: 2px;
|
|
|
|
padding-bottom: 2px;
|
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 {
|
2016-04-25 16:02:15 -04:00
|
|
|
color: $gl-gray-dark;
|
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-12-08 06:54:32 -05:00
|
|
|
font-size: 90%;
|
2015-10-05 15:18:21 -04:00
|
|
|
margin: 0 3px;
|
2016-04-11 11:00:45 -04:00
|
|
|
word-break: break-all;
|
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 {
|
2016-02-26 08:48:25 -05:00
|
|
|
margin-bottom: 2px;
|
2016-07-19 09:47:26 -04:00
|
|
|
|
|
|
|
.ci-status-link {
|
|
|
|
|
|
|
|
svg {
|
|
|
|
height: 16px;
|
|
|
|
width: 16px;
|
|
|
|
position: relative;
|
|
|
|
top: 3px;
|
|
|
|
}
|
2016-07-21 16:55:21 -04:00
|
|
|
|
|
|
|
&:hover,
|
|
|
|
&:focus {
|
|
|
|
text-decoration: none;
|
|
|
|
}
|
2016-07-19 09:47:26 -04:00
|
|
|
}
|
2013-04-06 08:10:24 -04:00
|
|
|
}
|
2015-04-21 04:28:03 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-labels {
|
|
|
|
display: inline-block;
|
|
|
|
}
|
|
|
|
|
2016-02-22 06:50:26 -05:00
|
|
|
.merge-request-no-comments {
|
2015-04-21 04:28:03 -04:00
|
|
|
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
|
|
|
}
|
|
|
|
|
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-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;
|
|
|
|
|
2015-12-15 16:11:01 -05:00
|
|
|
margin-right: 20px;
|
2015-10-23 09:44:39 -04:00
|
|
|
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;
|
|
|
|
}
|
2016-01-20 00:15:55 -05:00
|
|
|
|
2016-03-27 11:15:07 -04:00
|
|
|
.builds {
|
|
|
|
.table-holder {
|
|
|
|
overflow-x: scroll;
|
|
|
|
}
|
|
|
|
}
|
2016-03-15 10:43:40 -04:00
|
|
|
|
|
|
|
.panel-new-merge-request {
|
|
|
|
.panel-heading {
|
|
|
|
padding: 5px 10px;
|
|
|
|
font-weight: 600;
|
|
|
|
line-height: 25px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.panel-body {
|
|
|
|
padding: 10px 5px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.panel-footer {
|
2016-04-06 06:08:24 -04:00
|
|
|
padding: 5px 10px;
|
2016-06-17 09:09:00 -04:00
|
|
|
|
|
|
|
.btn {
|
|
|
|
min-width: auto;
|
|
|
|
}
|
2016-03-15 10:43:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.commit {
|
|
|
|
.commit-row-title {
|
|
|
|
margin-bottom: 4px;
|
|
|
|
}
|
|
|
|
|
2016-06-24 07:52:48 -04:00
|
|
|
.item-title {
|
|
|
|
@media (min-width: $screen-sm-min) {
|
2016-07-17 12:47:46 -04:00
|
|
|
width: 45%;
|
2016-06-24 07:52:48 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-15 10:43:40 -04:00
|
|
|
.avatar {
|
2016-06-24 07:52:48 -04:00
|
|
|
left: 0;
|
|
|
|
top: 2px;
|
2016-03-15 10:43:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.commit-row-info {
|
|
|
|
line-height: 20px;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.btn-clipboard {
|
|
|
|
margin-right: 5px;
|
|
|
|
padding: 0;
|
|
|
|
background: transparent;
|
|
|
|
}
|
2016-04-06 07:52:07 -04:00
|
|
|
|
|
|
|
.ci-status-link {
|
|
|
|
margin-right: 5px;
|
|
|
|
}
|
2016-03-15 10:43:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-select {
|
|
|
|
padding-left: 5px;
|
|
|
|
padding-right: 5px;
|
2016-04-11 04:54:32 -04:00
|
|
|
margin-bottom: 10px;
|
|
|
|
|
|
|
|
&:last-child {
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
|
|
|
|
2016-06-16 15:59:17 -04:00
|
|
|
@media (min-width: $screen-xs-min) {
|
2016-04-11 04:54:32 -04:00
|
|
|
float: left;
|
|
|
|
width: 50%;
|
|
|
|
margin-bottom: 0;
|
|
|
|
}
|
2016-03-29 06:11:16 -04:00
|
|
|
|
|
|
|
.dropdown-menu-toggle {
|
|
|
|
width: 100%;
|
|
|
|
}
|
|
|
|
|
|
|
|
.dropdown-menu {
|
|
|
|
left: 5px;
|
|
|
|
right: 5px;
|
|
|
|
width: auto;
|
|
|
|
}
|
2016-03-15 10:43:40 -04:00
|
|
|
}
|
2016-04-06 11:25:38 -04:00
|
|
|
|
2016-04-11 04:43:59 -04:00
|
|
|
.issuable-form-select-holder {
|
|
|
|
display: inline-block;
|
|
|
|
width: 250px;
|
2016-04-06 11:25:38 -04:00
|
|
|
}
|
2016-04-25 16:02:15 -04:00
|
|
|
|
|
|
|
.table-holder {
|
|
|
|
.builds {
|
|
|
|
|
|
|
|
th {
|
|
|
|
background-color: $white-light;
|
|
|
|
color: $gl-placeholder-color;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-06-08 12:04:41 -04:00
|
|
|
|
|
|
|
.merged-buttons {
|
|
|
|
.btn {
|
|
|
|
float: left;
|
|
|
|
|
|
|
|
&:not(:last-child) {
|
|
|
|
margin-right: 10px;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|