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

141 lines
2 KiB
SCSS
Raw Normal View History

/**
2012-06-13 19:02:30 +02:00
* MR form
*
*/
.mr_branch_box {
2012-06-13 19:02:30 +02:00
@extend .ui-box;
margin-bottom:20px;
.body {
2012-06-13 19:02:30 +02:00
background:#f1f1f1;
}
}
/**
* MR -> show: Automerge widget
*
*/
.automerge_widget {
&.can_be_merged {
2012-06-13 19:02:30 +02:00
background: #DFF0D8;
}
form {
2012-06-13 19:02:30 +02:00
margin-bottom:0;
.clearfix {
2012-06-13 19:02:30 +02:00
margin-bottom:0;
}
}
.accept_group {
2012-06-13 19:02:30 +02:00
float:left;
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
border-radius: 5px;
background: #CEB;
.accept_merge_request {
font-size:13px;
2012-06-13 19:02:30 +02:00
float:left;
}
.remove_branch_holder {
2012-06-13 19:02:30 +02:00
margin-left:20px;
margin-right:10px;
float:left;
}
label {
2012-06-13 19:02:30 +02:00
color:#444;
}
}
.how_to_merge_link {
2012-06-13 19:02:30 +02:00
@extend .primary;
}
}
.mr_nav_tabs {
li {
a {
font-weight:bold;
padding:8px 20px;
text-align:center;
}
}
}
2012-07-17 07:17:16 +02:00
li.merge_request {
2012-07-17 07:17:16 +02:00
padding:7px 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;
}
.label_branch {
@include round-borders-all(4px);
padding:2px 4px;
border:none;
font-size:14px;
background: #474D57;
color:#fff;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
}
.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
}
.merge_requests_form_box {
@extend .main_box;
.merge_requests_middle_box {
@extend .middle_box_content;
height:30px;
.merge_requests_assignee {
@extend .span6;
float:left;
}
.merge_requests_milestone {
@extend .span4;
float:left;
}
}
}