2012-06-13 17:02:30 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* MR -> show: Automerge widget
|
|
|
|
*
|
|
|
|
*/
|
2012-09-19 06:14:07 +00:00
|
|
|
.automerge_widget {
|
|
|
|
&.can_be_merged {
|
2012-06-13 17:02:30 +00:00
|
|
|
background: #DFF0D8;
|
|
|
|
}
|
|
|
|
|
2012-09-19 06:14:07 +00:00
|
|
|
form {
|
2012-11-23 16:33:43 +00:00
|
|
|
margin-bottom: 0;
|
2012-09-19 06:14:07 +00:00
|
|
|
.clearfix {
|
2012-11-23 16:33:43 +00:00
|
|
|
margin-bottom: 0;
|
2012-06-13 17:02:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-19 06:14:07 +00:00
|
|
|
.accept_group {
|
2012-11-23 16:33:43 +00:00
|
|
|
float: left;
|
2012-06-13 17:02:30 +00:00
|
|
|
border: 1px solid #ADA;
|
|
|
|
padding: 2px;
|
|
|
|
@include border-radius(5px);
|
|
|
|
background: #CEB;
|
|
|
|
|
2012-09-19 06:14:07 +00:00
|
|
|
.accept_merge_request {
|
2012-11-23 16:33:43 +00:00
|
|
|
font-size: 13px;
|
|
|
|
float: left;
|
2012-06-13 17:02:30 +00:00
|
|
|
}
|
2012-09-19 06:14:07 +00:00
|
|
|
.remove_branch_holder {
|
2012-11-23 16:33:43 +00:00
|
|
|
margin-left: 20px;
|
|
|
|
margin-right: 10px;
|
|
|
|
float: left;
|
2012-06-13 17:02:30 +00:00
|
|
|
}
|
2012-09-19 06:14:07 +00:00
|
|
|
label {
|
2012-11-23 16:51:38 +00:00
|
|
|
color: #444;
|
2012-12-31 16:35:38 +00:00
|
|
|
text-align: left
|
2012-06-13 17:02:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-09-19 06:14:07 +00:00
|
|
|
.how_to_merge_link {
|
2012-06-13 17:02:30 +00:00
|
|
|
@extend .primary;
|
|
|
|
}
|
|
|
|
}
|
2012-06-29 18:55:22 +00:00
|
|
|
|
2013-01-05 01:18:39 +00:00
|
|
|
.merge-request .nav-tabs{
|
2012-09-19 06:14:07 +00:00
|
|
|
li {
|
|
|
|
a {
|
2012-11-23 16:33:43 +00:00
|
|
|
font-weight: bold;
|
2012-11-23 16:51:38 +00:00
|
|
|
padding: 8px 20px;
|
2012-11-23 16:33:43 +00:00
|
|
|
text-align: center;
|
2012-06-29 18:55:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-07-17 05:17:16 +00:00
|
|
|
|
2013-01-05 01:18:39 +00:00
|
|
|
.merge-in-progress {
|
2012-08-18 21:45:46 +00:00
|
|
|
@extend .padded;
|
|
|
|
@extend .append-bottom-10;
|
|
|
|
}
|
2012-08-29 18:23:43 +00:00
|
|
|
|
2012-09-19 06:14:07 +00:00
|
|
|
.mr_source_commit,
|
|
|
|
.mr_target_commit {
|
|
|
|
.commit {
|
2012-11-23 16:33:43 +00:00
|
|
|
margin: 0;
|
|
|
|
padding: 0;
|
2012-08-29 19:29:50 +00:00
|
|
|
padding: 5px;
|
|
|
|
margin-bottom: 5px;
|
|
|
|
.avatar { position:relative }
|
2012-09-19 06:14:07 +00:00
|
|
|
.row_title {
|
2012-11-23 16:51:38 +00:00
|
|
|
color: #444;
|
2012-08-29 19:29:50 +00:00
|
|
|
}
|
|
|
|
.commit-author-name,
|
|
|
|
.dash,
|
|
|
|
.committed_ago,
|
|
|
|
.browse_code_link_holder {
|
2012-11-23 16:33:43 +00:00
|
|
|
display: none;
|
2012-08-29 19:29:50 +00:00
|
|
|
}
|
2012-11-23 16:33:43 +00:00
|
|
|
list-style: none;
|
2012-09-19 06:14:07 +00:00
|
|
|
&:hover {
|
2012-11-23 16:33:43 +00:00
|
|
|
background: none;
|
2012-08-29 19:29:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-06 12:10:24 +00:00
|
|
|
.label-branch {
|
|
|
|
@include border-radius(4px);
|
|
|
|
padding: 2px 4px;
|
|
|
|
border: none;
|
|
|
|
font-size: 14px;
|
|
|
|
background: #474D57;
|
|
|
|
color: #fff;
|
|
|
|
font-family: $monospace_font;
|
|
|
|
text-shadow: 0 1px 1px #111;
|
|
|
|
font-weight: normal;
|
|
|
|
}
|
|
|
|
|
|
|
|
.mr-list {
|
|
|
|
.merge-request {
|
|
|
|
padding: 10px;
|
|
|
|
position: relative;
|
|
|
|
|
|
|
|
.merge-request-title {
|
|
|
|
margin-bottom: 5px;
|
|
|
|
font-size: 14px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.merge-request-info {
|
|
|
|
color: #999;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-07-17 12:48:22 +00:00
|
|
|
|
|
|
|
.merge-request-angle {
|
|
|
|
text-align: center;
|
|
|
|
margin-top: 45px;
|
|
|
|
}
|
|
|
|
|
2013-07-17 15:35:28 +00:00
|
|
|
.merge-request-form-info {
|
2013-07-17 12:48:22 +00:00
|
|
|
padding: 15px 0;
|
|
|
|
}
|