diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-10-17 12:56:55 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-10-17 12:56:55 +0300 |
| commit | 86dcb79be37f5759dfeaa26283ed8bf031b38d54 (patch) | |
| tree | 70869aeaa6bfbdcaada873cfd3e4054c62d3e25a /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 26e327ea93140f6400b965b845958ff50461718c (diff) | |
| parent | 052de0600c6b137e6f9df08250b4cf5f38280295 (diff) | |
Merge branch 'master' into merge-conflicts-editor-2
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index d447ca53c16..eed2b0ab7cc 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -131,6 +131,7 @@ $colors: ( } } } + &.head { background-color: map-get($colors, #{$color}_header_head_neutral); border-color: map-get($colors, #{$color}_header_head_neutral); @@ -174,6 +175,7 @@ $colors: ( background-color: map-get($colors, #{$color}_line_not_chosen); } } + &.head { background-color: map-get($colors, #{$color}_line_head_neutral); |