diff options
| author | BM5k <me@bm5k.com> | 2016-12-02 18:44:06 -0700 |
|---|---|---|
| committer | BM5k <me@bm5k.com> | 2016-12-06 12:51:06 -0700 |
| commit | 6cb6f58a6259c91f79489b7f5a71f413d0e0d81c (patch) | |
| tree | 7f366812de191498d5c1526da4326719a2b8fce8 | |
| parent | 20b5f5af275a2b482baa0d2ff26e806517586c79 (diff) | |
| download | gitlab-ce-6cb6f58a6259c91f79489b7f5a71f413d0e0d81c.tar.gz | |
rename theme to match actual colors
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profiles/preferences.scss | 4 | ||||
| -rw-r--r-- | lib/gitlab/themes.rb | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index a8789ad9bf7..1b52a6a8e71 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -99,10 +99,10 @@ $theme-graphite: #777; $theme-graphite-dark: #666; $theme-graphite-darker: #555; -$theme-gray-light: #979797; -$theme-gray: #373737; -$theme-gray-dark: #272727; -$theme-gray-darker: #222; +$theme-black-light: #979797; +$theme-black: #373737; +$theme-black-dark: #272727; +$theme-black-darker: #222; $theme-green-light: #adc; $theme-green: #019875; @@ -127,8 +127,8 @@ body { @include gitlab-theme($theme-graphite-light, $theme-graphite, $theme-graphite-dark, $theme-graphite-darker); } - &.ui_gray { - @include gitlab-theme($theme-gray-light, $theme-gray, $theme-gray-dark, $theme-gray-darker); + &.ui_black { + @include gitlab-theme($theme-black-light, $theme-black, $theme-black-dark, $theme-black-darker); } &.ui_green { diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index f8da0983b77..100ace41f2a 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -22,8 +22,8 @@ background: $theme-graphite; } - &.ui_gray { - background: $theme-gray; + &.ui_black { + background: $theme-black; } &.ui_green { diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb index d4020af76f9..19ab76ae80f 100644 --- a/lib/gitlab/themes.rb +++ b/lib/gitlab/themes.rb @@ -15,7 +15,7 @@ module Gitlab Theme.new(1, 'Graphite', 'ui_graphite'), Theme.new(2, 'Charcoal', 'ui_charcoal'), Theme.new(3, 'Green', 'ui_green'), - Theme.new(4, 'Gray', 'ui_gray'), + Theme.new(4, 'Black', 'ui_black'), Theme.new(5, 'Violet', 'ui_violet'), Theme.new(6, 'Blue', 'ui_blue') ].freeze |