2016-08-02 04:20:22 -04:00
|
|
|
$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;
|
2016-08-02 04:20:22 -04:00
|
|
|
$unselected_line: #f8f8f8;
|
2016-07-11 18:08:04 -04:00
|
|
|
|
|
|
|
|
|
|
|
#conflicts {
|
|
|
|
|
|
|
|
.diff-wrap-lines .line_content {
|
|
|
|
white-space: normal;
|
2016-07-29 05:15:10 -04:00
|
|
|
min-height: 19px;
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|
|
|
|
|
2016-08-03 11:04:00 -04:00
|
|
|
|
|
|
|
.header.line_content, .diff-line-num {
|
|
|
|
&.origin {
|
|
|
|
background-color: $origin_gutter;
|
|
|
|
&.selected {
|
|
|
|
background-color: $selected_origin_gutter;
|
|
|
|
}
|
|
|
|
&.unselected {
|
|
|
|
background-color: $unselected_gutter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
&.head {
|
|
|
|
background-color: $head_gutter;
|
|
|
|
&.selected {
|
|
|
|
background-color: $selected_head_gutter;
|
|
|
|
}
|
|
|
|
&.unselected {
|
|
|
|
background-color: $unselected_gutter;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.line_content {
|
|
|
|
&.origin {
|
|
|
|
background-color: $origin_line;
|
|
|
|
&.selected {
|
|
|
|
background-color: $selected_origin_line;
|
|
|
|
}
|
|
|
|
&.unselected {
|
|
|
|
background-color: $unselected_line;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
&.head {
|
|
|
|
background-color: $head_line;
|
|
|
|
&.selected {
|
|
|
|
background-color: $selected_head_line;
|
|
|
|
}
|
|
|
|
&.unselected {
|
|
|
|
background-color: $unselected_line;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-07-11 18:08:04 -04:00
|
|
|
.head {
|
|
|
|
.header, .diff-line-num {
|
2016-07-13 07:43:13 -04:00
|
|
|
background-color: $head_gutter;
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-11 18:08:04 -04:00
|
|
|
td {
|
|
|
|
background-color: $head_line;
|
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-13 07:43:13 -04:00
|
|
|
&.selected {
|
|
|
|
.header, .diff-line-num {
|
|
|
|
background-color: $selected_head_gutter;
|
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-13 07:43:13 -04:00
|
|
|
td {
|
|
|
|
background-color: $selected_head_line;
|
|
|
|
}
|
|
|
|
}
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.origin {
|
|
|
|
.header, .diff-line-num {
|
2016-07-13 07:43:13 -04:00
|
|
|
background-color: $origin_gutter;
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-11 18:08:04 -04:00
|
|
|
td {
|
|
|
|
background-color: $origin_line;
|
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-13 07:43:13 -04:00
|
|
|
&.selected {
|
|
|
|
.header, .diff-line-num {
|
|
|
|
background-color: $selected_origin_gutter;
|
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-13 07:43:13 -04:00
|
|
|
td {
|
|
|
|
background-color: $selected_origin_line;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.origin, .head {
|
|
|
|
&.unselected {
|
|
|
|
.header, .diff-line-num {
|
|
|
|
background-color: $unselected_gutter;
|
|
|
|
}
|
2016-07-13 17:57:31 -04:00
|
|
|
|
2016-07-13 07:43:13 -04:00
|
|
|
td {
|
|
|
|
background-color: $unselected_line;
|
|
|
|
}
|
|
|
|
}
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
.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;
|
2016-07-11 18:08:04 -04:00
|
|
|
font-size: 10px;
|
|
|
|
position: absolute;
|
|
|
|
right: 20px;
|
|
|
|
height: 17px;
|
|
|
|
line-height: 4px; // FIXME: 4px?
|
|
|
|
top: 1px;
|
|
|
|
outline: none;
|
|
|
|
}
|
|
|
|
}
|
2016-08-08 06:26:09 -04:00
|
|
|
|
|
|
|
.btn-success .fa-spinner {
|
|
|
|
color: #FFF;
|
|
|
|
}
|
2016-07-11 18:08:04 -04:00
|
|
|
}
|