gitlabhq/app/assets/stylesheets/sections/merge_requests.scss

100 lines
1.4 KiB
SCSS
Raw Normal View History

2012-06-13 19:02:30 +02:00
/**
* MR -> show: Automerge widget
*
*/
.automerge_widget {
&.can_be_merged {
2012-06-13 19:02:30 +02:00
background: #DFF0D8;
}
form {
margin-bottom: 0;
.clearfix {
margin-bottom: 0;
2012-06-13 19:02:30 +02:00
}
}
.accept_group {
float: left;
2012-06-13 19:02:30 +02:00
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
background: #CEB;
.accept_merge_request {
font-size: 13px;
float: left;
2012-06-13 19:02:30 +02:00
}
.remove_branch_holder {
margin-left: 20px;
margin-right: 10px;
float: left;
2012-06-13 19:02:30 +02:00
}
label {
color: #444;
2012-12-31 17:35:38 +01:00
text-align: left
2012-06-13 19:02:30 +02:00
}
}
.how_to_merge_link {
2012-06-13 19:02:30 +02:00
@extend .primary;
}
}
.merge-request .nav-tabs{
li {
a {
font-weight: bold;
padding: 8px 20px;
text-align: center;
}
}
}
2012-07-17 07:17:16 +02:00
li.merge_request {
padding: 10px;
img.avatar {
2012-07-17 07:17:16 +02:00
width: 32px;
2012-11-10 22:45:13 +01:00
margin-top: 1px;
2012-07-17 07:17:16 +02:00
}
p {
2012-07-17 07:17:16 +02:00
padding: 0px;
padding-bottom: 2px;
}
}
2012-08-18 23:45:46 +02:00
.merge-in-progress {
2012-08-18 23:45:46 +02:00
@extend .padded;
@extend .append-bottom-10;
}
.mr_source_commit,
.mr_target_commit {
.commit {
margin: 0;
padding: 0;
padding: 5px;
margin-bottom: 5px;
.avatar { position:relative }
.row_title {
color: #444;
}
.commit-author-name,
.dash,
.committed_ago,
.browse_code_link_holder {
display: none;
}
list-style: none;
&:hover {
background: none;
}
}
}
.mr_direction_tip {
margin-top:40px
}