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

288 lines
7.8 KiB
SCSS
Raw Normal View History

$colors: (
white_header_head_neutral : #e1fad7,
white_line_head_neutral : #effdec,
white_button_head_neutral : #9adb84,
white_header_head_chosen : #baf0a8,
white_line_head_chosen : #e1fad7,
white_button_head_chosen : #52c22d,
2016-08-08 17:39:07 -04:00
white_header_origin_neutral : #e0f0ff,
white_line_origin_neutral : #f2f9ff,
white_button_origin_neutral : #87c2fa,
2016-08-08 17:39:07 -04:00
white_header_origin_chosen : #add8ff,
white_line_origin_chosen : #e0f0ff,
white_button_origin_chosen : #268ced,
2016-08-08 17:39:07 -04:00
white_header_not_chosen : #f0f0f0,
white_line_not_chosen : $gray-light,
2016-08-08 17:39:07 -04:00
2016-08-15 16:14:36 -04:00
dark_header_head_neutral : rgba(#3f3, .2),
dark_line_head_neutral : rgba(#3f3, .1),
dark_button_head_neutral : #40874f,
2016-08-08 17:39:07 -04:00
2016-08-15 16:14:36 -04:00
dark_header_head_chosen : rgba(#3f3, .33),
dark_line_head_chosen : rgba(#3f3, .2),
dark_button_head_chosen : #258537,
2016-08-08 17:39:07 -04:00
dark_header_origin_neutral : rgba(#2878c9, .4),
dark_line_origin_neutral : rgba(#2878c9, .3),
dark_button_origin_neutral : #2a5c8c,
2016-08-08 17:39:07 -04:00
dark_header_origin_chosen : rgba(#2878c9, .6),
dark_line_origin_chosen : rgba(#2878c9, .4),
dark_button_origin_chosen : #1d6cbf,
2016-08-08 17:39:07 -04:00
dark_header_not_chosen : rgba(#fff, .25),
dark_line_not_chosen : rgba(#fff, .1),
2016-08-08 17:39:07 -04:00
monokai_header_head_neutral : rgba(#a6e22e, .25),
monokai_line_head_neutral : rgba(#a6e22e, .1),
monokai_button_head_neutral : #376b20,
2016-08-08 17:39:07 -04:00
monokai_header_head_chosen : rgba(#a6e22e, .4),
monokai_line_head_chosen : rgba(#a6e22e, .25),
monokai_button_head_chosen : #39800d,
2016-08-08 17:39:07 -04:00
monokai_header_origin_neutral : rgba(#60d9f1, .35),
monokai_line_origin_neutral : rgba(#60d9f1, .15),
monokai_button_origin_neutral : #38848c,
2016-08-08 17:39:07 -04:00
monokai_header_origin_chosen : rgba(#60d9f1, .5),
monokai_line_origin_chosen : rgba(#60d9f1, .35),
monokai_button_origin_chosen : #3ea4b2,
2016-08-08 17:39:07 -04:00
2016-08-12 16:23:47 -04:00
monokai_header_not_chosen : rgba(#76715d, .24),
monokai_line_not_chosen : rgba(#76715d, .1),
2016-08-08 17:39:07 -04:00
solarized_light_header_head_neutral : rgba(#859900, .37),
solarized_light_line_head_neutral : rgba(#859900, .2),
solarized_light_button_head_neutral : #afb262,
2016-08-08 17:39:07 -04:00
solarized_light_header_head_chosen : rgba(#859900, .5),
solarized_light_line_head_chosen : rgba(#859900, .37),
solarized_light_button_head_chosen : #94993d,
2016-08-08 17:39:07 -04:00
solarized_light_header_origin_neutral : rgba(#2878c9, .37),
solarized_light_line_origin_neutral : rgba(#2878c9, .15),
solarized_light_button_origin_neutral : #60a1bf,
2016-08-08 17:39:07 -04:00
solarized_light_header_origin_chosen : rgba(#2878c9, .6),
solarized_light_line_origin_chosen : rgba(#2878c9, .37),
solarized_light_button_origin_chosen : #2482b2,
2016-08-08 17:39:07 -04:00
2016-08-12 16:23:47 -04:00
solarized_light_header_not_chosen : rgba(#839496, .37),
solarized_light_line_not_chosen : rgba(#839496, .2),
2016-08-08 17:39:07 -04:00
solarized_dark_header_head_neutral : rgba(#859900, .35),
solarized_dark_line_head_neutral : rgba(#859900, .15),
solarized_dark_button_head_neutral : #376b20,
2016-08-08 17:39:07 -04:00
solarized_dark_header_head_chosen : rgba(#859900, .5),
solarized_dark_line_head_chosen : rgba(#859900, .35),
solarized_dark_button_head_chosen : #39800d,
2016-08-08 17:39:07 -04:00
solarized_dark_header_origin_neutral : rgba(#2878c9, .35),
solarized_dark_line_origin_neutral : rgba(#2878c9, .15),
solarized_dark_button_origin_neutral : #086799,
2016-08-08 17:39:07 -04:00
solarized_dark_header_origin_chosen : rgba(#2878c9, .6),
solarized_dark_line_origin_chosen : rgba(#2878c9, .35),
solarized_dark_button_origin_chosen : #0082cc,
2016-08-08 17:39:07 -04:00
2016-08-12 16:23:47 -04:00
solarized_dark_header_not_chosen : rgba(#839496, .25),
solarized_dark_line_not_chosen : rgba(#839496, .15)
);
2016-08-08 17:39:07 -04:00
@mixin color-scheme($color) {
.header.line_content, .diff-line-num {
&.origin {
background-color: map-get($colors, #{$color}_header_origin_neutral);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_origin_neutral);
button {
background-color: map-get($colors, #{$color}_button_origin_neutral);
border-color: darken(map-get($colors, #{$color}_button_origin_neutral), 15);
}
&.selected {
background-color: map-get($colors, #{$color}_header_origin_chosen);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_origin_chosen);
button {
background-color: map-get($colors, #{$color}_button_origin_chosen);
border-color: darken(map-get($colors, #{$color}_button_origin_chosen), 15);
}
2016-08-08 17:39:07 -04:00
}
2016-08-12 16:23:47 -04:00
&.unselected {
background-color: map-get($colors, #{$color}_header_not_chosen);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_not_chosen);
button {
background-color: lighten(map-get($colors, #{$color}_button_origin_neutral), 15);
border-color: map-get($colors, #{$color}_button_origin_neutral);
}
2016-08-08 17:39:07 -04:00
}
}
&.head {
background-color: map-get($colors, #{$color}_header_head_neutral);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_head_neutral);
button {
background-color: map-get($colors, #{$color}_button_head_neutral);
border-color: darken(map-get($colors, #{$color}_button_head_neutral), 15);
}
&.selected {
background-color: map-get($colors, #{$color}_header_head_chosen);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_head_chosen);
button {
background-color: map-get($colors, #{$color}_button_head_chosen);
border-color: darken(map-get($colors, #{$color}_button_head_chosen), 15);
}
2016-08-08 17:39:07 -04:00
}
2016-08-12 16:23:47 -04:00
&.unselected {
background-color: map-get($colors, #{$color}_header_not_chosen);
2016-08-12 16:23:47 -04:00
border-color: map-get($colors, #{$color}_header_not_chosen);
button {
background-color: lighten(map-get($colors, #{$color}_button_head_neutral), 15);
border-color: map-get($colors, #{$color}_button_head_neutral);
}
2016-08-08 17:39:07 -04:00
}
}
}
.line_content {
&.origin {
background-color: map-get($colors, #{$color}_line_origin_neutral);
2016-08-12 16:23:47 -04:00
&.selected {
background-color: map-get($colors, #{$color}_line_origin_chosen);
2016-08-03 11:04:00 -04:00
}
2016-08-12 16:23:47 -04:00
&.unselected {
background-color: map-get($colors, #{$color}_line_not_chosen);
2016-08-03 11:04:00 -04:00
}
}
&.head {
background-color: map-get($colors, #{$color}_line_head_neutral);
2016-08-12 16:23:47 -04:00
&.selected {
background-color: map-get($colors, #{$color}_line_head_chosen);
2016-08-03 11:04:00 -04:00
}
2016-08-12 16:23:47 -04:00
&.unselected {
background-color: map-get($colors, #{$color}_line_not_chosen);
2016-08-03 11:04:00 -04:00
}
}
}
}
2016-08-03 11:04:00 -04:00
2016-08-08 17:39:07 -04:00
#conflicts {
2016-08-08 17:39:07 -04:00
.white {
@include color-scheme('white')
2016-08-08 17:39:07 -04:00
}
.dark {
@include color-scheme('dark')
2016-08-08 17:39:07 -04:00
}
.monokai {
@include color-scheme('monokai')
}
2016-08-08 17:39:07 -04:00
.solarized-light {
@include color-scheme('solarized_light')
2016-08-08 17:39:07 -04:00
}
.solarized-dark {
@include color-scheme('solarized_dark')
}
2016-08-08 17:39:07 -04:00
.diff-wrap-lines .line_content {
white-space: normal;
min-height: 19px;
2016-08-03 11:04:00 -04:00
}
.line_content.header {
position: relative;
button {
2016-08-12 16:23:47 -04:00
border-radius: 2px;
font-size: 10px;
position: absolute;
right: 10px;
2016-08-12 16:23:47 -04:00
padding: 0;
outline: none;
2016-08-12 16:23:47 -04:00
color: #fff;
width: 75px; // static width to make 2 buttons have same width
height: 19px;
}
}
.btn-success .fa-spinner {
color: #fff;
}
.editor-wrap {
&.is-loading {
.editor {
display: none;
}
2016-09-19 12:04:52 -04:00
.loading {
display: block;
}
}
&.saved {
.editor {
2016-09-19 11:10:17 -04:00
border-top: solid 2px $border-green-extra-light;
}
}
.editor {
2016-09-16 20:41:15 -04:00
pre {
height: 350px;
border: none;
border-radius: 0;
margin-bottom: 0;
}
}
2016-09-19 12:04:52 -04:00
.loading {
display: none;
}
}
2016-09-19 11:10:17 -04:00
.discard-changes-alert {
background-color: $background-color;
text-align: right;
padding: $gl-padding-top $gl-padding;
color: $gl-text-color;
.discard-actions {
display: inline-block;
margin-left: 10px;
}
}
2016-09-19 11:51:09 -04:00
.resolve-conflicts-form {
padding-top: $gl-padding;
}
}