diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-10-14 15:39:08 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-10-14 16:28:10 -0500 |
| commit | e88aa25f42c394785d4c176046f10c815250c8b1 (patch) | |
| tree | 2e4b4d29176a98687397eed7d7a2b4373b34c26a /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 2ebc63dd3ce08ff35bf89d39e1906ce1cf828b3a (diff) | |
| download | gitlab-ce-e88aa25f42c394785d4c176046f10c815250c8b1.tar.gz | |
Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lint
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 5ec660799e3..49013d7cac9 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); |