gitlabhq/app/assets/stylesheets/sections/merge_requests.scss
Koen Punt e33debc214 Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes

Converted commits.js to coffeescript
image info in separate coffeescript file

Added swipe view mode

Added onion skin viewMode
2013-01-27 18:27:32 +01:00

110 lines
1.5 KiB
SCSS

/**
* MR -> show: Automerge widget
*
*/
.automerge_widget {
&.can_be_merged {
background: #DFF0D8;
}
form {
margin-bottom: 0;
.clearfix {
margin-bottom: 0;
}
}
.accept_group {
float: left;
border: 1px solid #ADA;
padding: 2px;
@include border-radius(5px);
background: #CEB;
.accept_merge_request {
font-size: 13px;
float: left;
}
.remove_branch_holder {
margin-left: 20px;
margin-right: 10px;
float: left;
}
label {
color: #444;
text-align: left
}
}
.how_to_merge_link {
@extend .primary;
}
}
.merge-request .nav-tabs{
li {
a {
font-weight: bold;
padding: 8px 20px;
text-align: center;
}
}
}
li.merge_request {
padding: 10px;
img.avatar {
width: 32px;
margin-top: 1px;
}
p {
padding: 0px;
padding-bottom: 2px;
}
}
.merge-in-progress {
@extend .padded;
@extend .append-bottom-10;
}
.label_branch {
@include border-radius(4px);
padding: 2px 4px;
border: none;
font-size: 14px;
background: #474D57;
color: #fff;
font-family: $monospace_font;
}
.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
}