diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-11 20:51:07 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:51 +0300 |
commit | 66241c1b08eeb9bf538c1feebd046ec18ea07c87 (patch) | |
tree | be26d490dd20d2156ffd64e972f3fe506af509b9 /app/assets/stylesheets/pages | |
parent | 65747107099d7ac70879cb576042fceef1c1c746 (diff) | |
download | gitlab-ce-66241c1b08eeb9bf538c1feebd046ec18ea07c87.tar.gz |
Prefer lowercase hex values as declared in styling guideline.
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index af5f778cb7e..0c59a73a718 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -1,30 +1,30 @@ $colors: ( white_header_head_neutral : #e1fad7, white_line_head_neutral : #effdec, - white_button_head_neutral : #9ADB84, + white_button_head_neutral : #9adb84, white_header_head_chosen : #baf0a8, white_line_head_chosen : #e1fad7, - white_button_head_chosen : #52C22D, + white_button_head_chosen : #52c22d, white_header_origin_neutral : #e0f0ff, white_line_origin_neutral : #f2f9ff, - white_button_origin_neutral : #87C2FA, + white_button_origin_neutral : #87c2fa, white_header_origin_chosen : #add8ff, white_line_origin_chosen : #e0f0ff, - white_button_origin_chosen : #268CED, + white_button_origin_chosen : #268ced, - white_header_not_chosen : #F0F0F0, + white_header_not_chosen : #f0f0f0, white_line_not_chosen : #f9f9f9, - dark_header_head_neutral : rgba(#33FF33, .2), - dark_line_head_neutral : rgba(#33FF33, .1), - dark_button_head_neutral : #40874F, + dark_header_head_neutral : rgba(#33ff33, .2), + dark_line_head_neutral : rgba(#33ff33, .1), + dark_button_head_neutral : #40874f, - dark_header_head_chosen : rgba(#33FF33, .33), - dark_line_head_chosen : rgba(#33FF33, .2), + dark_header_head_chosen : rgba(#33ff33, .33), + dark_line_head_chosen : rgba(#33ff33, .2), dark_button_head_chosen : #258537, dark_header_origin_neutral : rgba(#2878c9, .4), @@ -35,28 +35,28 @@ $colors: ( dark_line_origin_chosen : rgba(#2878c9, .4), dark_button_origin_chosen : #1d6cbf, - dark_header_not_chosen : rgba(#FFF, .25), - dark_line_not_chosen : rgba(#FFF, .1), + dark_header_not_chosen : rgba(#fff, .25), + dark_line_not_chosen : rgba(#fff, .1), - monokai_header_head_neutral : rgba(#A6E22E, .25), - monokai_line_head_neutral : rgba(#A6E22E, .1), + monokai_header_head_neutral : rgba(#a6e22e, .25), + monokai_line_head_neutral : rgba(#a6e22e, .1), monokai_button_head_neutral : #376b20, - monokai_header_head_chosen : rgba(#A6E22E, .4), - monokai_line_head_chosen : rgba(#A6E22E, .25), + monokai_header_head_chosen : rgba(#a6e22e, .4), + monokai_line_head_chosen : rgba(#a6e22e, .25), monokai_button_head_chosen : #39800d, - monokai_header_origin_neutral : rgba(#60D9F1, .35), - monokai_line_origin_neutral : rgba(#60D9F1, .15), - monokai_button_origin_neutral : #38848C, + monokai_header_origin_neutral : rgba(#60d9f1, .35), + monokai_line_origin_neutral : rgba(#60d9f1, .15), + monokai_button_origin_neutral : #38848c, - monokai_header_origin_chosen : rgba(#60D9F1, .5), - monokai_line_origin_chosen : rgba(#60D9F1, .35), - monokai_button_origin_chosen : #3EA4B2, + monokai_header_origin_chosen : rgba(#60d9f1, .5), + monokai_line_origin_chosen : rgba(#60d9f1, .35), + monokai_button_origin_chosen : #3ea4b2, - monokai_header_not_chosen : rgba(#FFF, .24), - monokai_line_not_chosen : rgba(#FFF, .1), + monokai_header_not_chosen : rgba(#fff, .24), + monokai_line_not_chosen : rgba(#fff, .1), solarized_light_header_head_neutral : rgba(#859900, .37), @@ -67,16 +67,16 @@ $colors: ( solarized_light_line_head_chosen : rgba(#859900, .37), solarized_light_button_head_chosen : #94993d, - solarized_light_header_origin_neutral : rgba(#2878C9, .37), - solarized_light_line_origin_neutral : rgba(#2878C9, .15), - solarized_light_button_origin_neutral : #60A1BF, + solarized_light_header_origin_neutral : rgba(#2878c9, .37), + solarized_light_line_origin_neutral : rgba(#2878c9, .15), + solarized_light_button_origin_neutral : #60a1bf, - solarized_light_header_origin_chosen : rgba(#2878C9, .6), - solarized_light_line_origin_chosen : rgba(#2878C9, .37), + solarized_light_header_origin_chosen : rgba(#2878c9, .6), + solarized_light_line_origin_chosen : rgba(#2878c9, .37), solarized_light_button_origin_chosen : #2482b2, - solarized_light_header_not_chosen : rgba(#FFF, .37), - solarized_light_line_not_chosen : rgba(#FFF, .2), + solarized_light_header_not_chosen : rgba(#fff, .37), + solarized_light_line_not_chosen : rgba(#fff, .2), solarized_dark_header_head_neutral : rgba(#859900, .35), @@ -87,16 +87,16 @@ $colors: ( solarized_dark_line_head_chosen : rgba(#859900, .35), solarized_dark_button_head_chosen : #39800d, - solarized_dark_header_origin_neutral : rgba(#2878C9, .35), - solarized_dark_line_origin_neutral : rgba(#2878C9, .15), + solarized_dark_header_origin_neutral : rgba(#2878c9, .35), + solarized_dark_line_origin_neutral : rgba(#2878c9, .15), solarized_dark_button_origin_neutral : #086799, - solarized_dark_header_origin_chosen : rgba(#2878C9, .6), - solarized_dark_line_origin_chosen : rgba(#2878C9, .35), - solarized_dark_button_origin_chosen : #0082CC, + solarized_dark_header_origin_chosen : rgba(#2878c9, .6), + solarized_dark_line_origin_chosen : rgba(#2878c9, .35), + solarized_dark_button_origin_chosen : #0082cc, - solarized_dark_header_not_chosen : rgba(#FFF, .25), - solarized_dark_line_not_chosen : rgba(#FFF, .15) + solarized_dark_header_not_chosen : rgba(#fff, .25), + solarized_dark_line_not_chosen : rgba(#fff, .15) ); @@ -190,6 +190,6 @@ $colors: ( } .btn-success .fa-spinner { - color: #FFF; + color: #fff; } } |