diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-06-04 13:19:32 -0700 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-06-04 13:19:32 -0700 |
commit | 0866682d9f8ab8c0ef8a87753b1e68c4d55066fa (patch) | |
tree | 1880f33d0542ed4fdff7cdb344d3f20aedda69b6 | |
parent | ad1efa13d9efcb8a9e12d024ad85c2e5b44a1f91 (diff) | |
download | gitlab-ce-43597-new-navigation-themes.tar.gz |
Update previews43597-new-navigation-themes
-rw-r--r-- | app/assets/stylesheets/pages/profiles/preferences.scss | 20 | ||||
-rw-r--r-- | app/views/profiles/preferences/show.html.haml | 2 | ||||
-rw-r--r-- | lib/gitlab/themes.rb | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index 3ac1cc6b546..f151ac24883 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -26,43 +26,43 @@ border-radius: 4px; min-width: 110px; - &.indigo { + &.ui_indigo { background-color: $indigo-900; } - &.light-indigo { + &.ui_light_indigo { background-color: $indigo-700; } - &.blue { + &.ui_blue { background-color: $theme-blue-900; } - &.light-blue { + &.ui_light_blue { background-color: $theme-blue-700; } - &.green { + &.ui_green { background-color: $theme-green-900; } - &.light-green { + &.ui_light_green { background-color: $theme-green-700; } - &.red { + &.ui_red { background-color: $theme-red-900; } - &.light-red { + &.ui_light_red { background-color: $theme-red-700; } - &.dark { + &.ui_dark { background-color: $theme-gray-900; } - &.light { + &.ui_light { background-color: $theme-gray-600; } } diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 911c68b793c..54c21bc8be8 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -9,7 +9,7 @@ .col-lg-8.application-theme - Gitlab::Themes.each do |theme| = label_tag do - .preview{ class: theme.name.downcase } + .preview{ class: theme.css_class } = f.radio_button :theme_id, theme.id, checked: Gitlab::Themes.for_user(@user).id == theme.id = theme.name diff --git a/lib/gitlab/themes.rb b/lib/gitlab/themes.rb index a1c927a217f..ecaeb051d96 100644 --- a/lib/gitlab/themes.rb +++ b/lib/gitlab/themes.rb @@ -13,13 +13,13 @@ module Gitlab # All available Themes THEMES = [ Theme.new(1, 'Indigo', 'ui_indigo'), - Theme.new(2, 'Light-Indigo', 'ui_light_indigo'), + Theme.new(2, 'Light Indigo', 'ui_light_indigo'), Theme.new(3, 'Blue', 'ui_blue'), - Theme.new(4, 'Light-Blue', 'ui_light_blue'), + Theme.new(4, 'Light Blue', 'ui_light_blue'), Theme.new(5, 'Green', 'ui_green'), - Theme.new(6, 'Light-Green', 'ui_light_green'), + Theme.new(6, 'Light Green', 'ui_light_green'), Theme.new(7, 'Red', 'ui_red'), - Theme.new(8, 'Light-Red', 'ui_light_red'), + Theme.new(8, 'Light Red', 'ui_light_red'), Theme.new(9, 'Dark', 'ui_dark'), Theme.new(10, 'Light', 'ui_light') ].freeze |