gitlab-org--gitlab-foss/app/assets/stylesheets/sections/merge_requests.scss

139 lines
2.0 KiB
SCSS
Raw Normal View History

2012-06-13 17:02:30 +00:00
/**
* MR -> show: Automerge widget
*
*/
.automerge_widget {
&.can_be_merged {
2012-06-13 17:02:30 +00:00
background: #DFF0D8;
}
form {
margin-bottom: 0;
.clearfix {
margin-bottom: 0;
2012-06-13 17:02:30 +00:00
}
}
.accept_group {
float: left;
2012-06-13 17:02:30 +00:00
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
background: #CEB;
.accept_merge_request {
font-size: 13px;
float: left;
2012-06-13 17:02:30 +00:00
}
.remove_branch_holder {
margin-left: 20px;
margin-right: 10px;
float: left;
2012-06-13 17:02:30 +00:00
}
label {
color: #444;
2012-12-31 16:35:38 +00:00
text-align: left
2012-06-13 17:02:30 +00:00
}
}
.how_to_merge_link {
2012-06-13 17:02:30 +00:00
@extend .primary;
}
}
.merge-request .nav-tabs{
li {
a {
font-weight: bold;
padding: 8px 20px;
text-align: center;
}
}
}
2012-07-17 05:17:16 +00:00
.merge-in-progress {
2012-08-18 21:45:46 +00:00
@extend .padded;
@extend .append-bottom-10;
}
.mr_source_commit,
.mr_target_commit {
.commit {
margin: 0;
padding: 0;
2013-08-08 18:11:28 +00:00
padding: 5px 0;
list-style: none;
&:hover {
background: none;
}
}
}
2013-04-06 12:10:24 +00:00
.label-branch {
@include border-radius(4px);
padding: 3px 4px;
2013-04-06 12:10:24 +00:00
border: none;
font-size: 14px;
background: #474D57;
color: #fff;
font-family: $monospace_font;
font-weight: normal;
overflow: hidden;
.label-project {
@include border-radius-left(4px);
padding: 3px 4px;
2013-08-08 15:59:46 +00:00
background: #279;
position: relative;
left: -4px;
letter-spacing: -1px;
}
2013-04-06 12:10:24 +00:00
}
.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: 0 auto;
background: #eee;
border-radius: 100px;
width: 60px;
line-height: 60px;
color: #777;
text-shadow: 0 1px 2px #FFF;
2013-07-17 12:48:22 +00:00
}
.merge-request-form-info {
padding-top: 15px;
}
.merge-request-branches {
.commit-row-message {
font-weight: normal !important;
}
.chosen-container .chosen-single {
padding: 2px 0 2px 10px;
span {
font-weight: bold;
color: #555;
}
}
2013-07-17 12:48:22 +00:00
}