diff options
| author | khm <khm@sciops.net> | 2018-12-18 00:34:50 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-18 00:34:50 +0000 |
| commit | 3a97bc9a4294685438be84a545945cef3f5ef4d0 (patch) | |
| tree | 3d93b9964b09d4fdde09faef0c64c42c622eb9c4 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | 18c78901bc49055bbfea44f4800e073847a89ad2 (diff) | |
| download | gitlab-ce-3a97bc9a4294685438be84a545945cef3f5ef4d0.tar.gz | |
Add "none" syntax highlighting "color" scheme
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index d26659701e1..e0f7d075fc7 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -93,8 +93,28 @@ $colors: ( solarized-dark-line-origin-chosen : rgba(#2878c9, .35), solarized-dark-button-origin-chosen : #0082cc, - solarized-dark-header-not-chosen : rgba(#839496, .25), - solarized-dark-line-not-chosen : rgba(#839496, .15) + solarized_dark_header_not_chosen : rgba(#839496, .25), + solarized_dark_line_not_chosen : rgba(#839496, .15), + + none_header_head_neutral : $gray-normal, + none_line_head_neutral : $gray-normal, + none_button_head_neutral : $gray-normal, + + none_header_head_chosen : $gray-darker, + none_line_head_chosen : $gray-darker, + none_button_head_chosen : $gray-darker, + + none_header_origin_neutral : $gray-normal, + none_line_origin_neutral : $gray-normal, + none_button_origin_neutral : $gray-normal, + + none_header_origin_chosen : $gray-darker, + none_line_origin_chosen : $gray-darker, + none_button_origin_chosen : $gray-darker, + + none_header_not_chosen : $gray-light, + none_line_not_chosen : $gray-light + ); // scss-lint:enable ColorVariable |