gitlab-org--gitlab-foss/app/assets/stylesheets/pages/merge_conflicts.scss

108 lines
1.8 KiB
SCSS
Raw Normal View History

$head_line: #effdeb;
$head_gutter: #daface;
$selected_head_gutter: #b2ee9e;
$selected_head_line: #d4f5c9;
$origin_line: #f2f9ff;
$origin_gutter: #e0f0ff;
$selected_origin_gutter: #a3d3ff;
$selected_origin_line: #cee4f9;
2016-08-02 08:23:55 -04:00
$unselected_gutter: #eee;
$unselected_line: #f8f8f8;
#conflicts {
.diff-wrap-lines .line_content {
white-space: normal;
2016-07-29 05:15:10 -04:00
min-height: 19px;
}
.head {
.header, .diff-line-num {
background-color: $head_gutter;
}
td {
background-color: $head_line;
}
&.selected {
.header, .diff-line-num {
background-color: $selected_head_gutter;
}
td {
background-color: $selected_head_line;
}
}
}
.origin {
.header, .diff-line-num {
background-color: $origin_gutter;
}
td {
background-color: $origin_line;
}
&.selected {
.header, .diff-line-num {
background-color: $selected_origin_gutter;
}
td {
background-color: $selected_origin_line;
}
}
}
.origin, .head {
&.unselected {
.header, .diff-line-num {
background-color: $unselected_gutter;
}
td {
background-color: $unselected_line;
}
}
}
.parallel-view {
.diff-content {
overflow: hidden;
table {
width: 50%;
float: left;
}
}
}
.parallel .header {
button {
right: 10px;
}
}
.line_content.header {
position: relative;
button {
border-radius: 4px;
2016-08-02 08:23:55 -04:00
border: 1px solid #e1e1e1;
background: #fff;
font-size: 10px;
position: absolute;
right: 20px;
height: 17px;
line-height: 4px; // FIXME: 4px?
top: 1px;
outline: none;
}
}
}