diff options
author | Sam Rose <samrose3@gmail.com> | 2016-11-30 08:25:25 -0500 |
---|---|---|
committer | Sam Rose <samrose3@gmail.com> | 2016-12-01 20:22:51 -0500 |
commit | d6d22a5dbd2ee04b59b2a80b3b6228575c3ea3ec (patch) | |
tree | 4a9d214e6877c9432494d12532072a0e6432ea57 /app/assets/stylesheets/pages/merge_conflicts.scss | |
parent | 994530270899ae904fbf5a77b602990b8cd79c67 (diff) | |
download | gitlab-ce-d6d22a5dbd2ee04b59b2a80b3b6228575c3ea3ec.tar.gz |
Enable ColorVariable in scss-lint
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 19ab198c2e7..7a90713dd3f 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -1,3 +1,5 @@ +// Disabled to use the color map for creating color schemes +// scss-lint:disable ColorVariable $colors: ( white_header_head_neutral : #e1fad7, white_line_head_neutral : #effdec, @@ -98,6 +100,7 @@ $colors: ( solarized_dark_header_not_chosen : rgba(#839496, .25), solarized_dark_line_not_chosen : rgba(#839496, .15) ); +// scss-lint:enable ColorVariable @mixin color-scheme($color) { @@ -228,14 +231,15 @@ $colors: ( position: absolute; right: 10px; padding: 0; - color: #fff; + outline: none; + color: $white-light; width: 75px; // static width to make 2 buttons have same width height: 19px; } } .btn-success .fa-spinner { - color: #fff; + color: $white-light; } .editor-wrap { |