kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'issues/8081' into 'master'

Browse source 
Issues/8081

See merge request !7908
This commit is contained in:
Annabel Dunstone Gray 2016-12-27 19:44:57 +00:00
commit 293eed4d63
4 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/assets/stylesheets/framework/gitlab-theme.scss
View file

@ -84,25 +84,25 @@
} }
} }
$theme-charcoal: #3d454d; $theme-charcoal-light: #b9bbbe;
$theme-charcoal-light: #485157; $theme-charcoal: #485157;
$theme-charcoal-dark: #383f45; $theme-charcoal-dark: #3d454d;
$theme-charcoal-text: #b9bbbe; $theme-charcoal-darker: #383f45;
$theme-blue-light: #becde9; $theme-blue-light: #becde9;
$theme-blue: #2980b9; $theme-blue: #2980b9;
$theme-blue-dark: #1970a9; $theme-blue-dark: #1970a9;
$theme-blue-darker: #096099; $theme-blue-darker: #096099;
$theme-graphite-lighter: #ccc; $theme-graphite-light: #ccc;
$theme-graphite-light: #777; $theme-graphite: #777;
$theme-graphite: #666; $theme-graphite-dark: #666;
$theme-graphite-dark: #555; $theme-graphite-darker: #555;
$theme-gray-light: #979797; $theme-black-light: #979797;
$theme-gray: #373737; $theme-black: #373737;
$theme-gray-dark: #272727; $theme-black-dark: #272727;
$theme-gray-darker: #222; $theme-black-darker: #222;
$theme-green-light: #adc; $theme-green-light: #adc;
$theme-green: #019875; $theme-green: #019875;
@ -120,15 +120,15 @@ body {
} }
&.ui_charcoal { &.ui_charcoal {
@include gitlab-theme($theme-charcoal-text, $theme-charcoal-light, $theme-charcoal, $theme-charcoal-dark); @include gitlab-theme($theme-charcoal-light, $theme-charcoal, $theme-charcoal-dark, $theme-charcoal-darker);
} }
&.ui_graphite { &.ui_graphite {
@include gitlab-theme($theme-graphite-lighter, $theme-graphite-light, $theme-graphite, $theme-graphite-dark); @include gitlab-theme($theme-graphite-light, $theme-graphite, $theme-graphite-dark, $theme-graphite-darker);
} }
&.ui_gray { &.ui_black {
@include gitlab-theme($theme-gray-light, $theme-gray, $theme-gray-dark, $theme-gray-darker); @include gitlab-theme($theme-black-light, $theme-black, $theme-black-dark, $theme-black-darker);
} }
&.ui_green { &.ui_green {

4
app/assets/stylesheets/pages/profiles/preferences.scss
View file

@ -22,8 +22,8 @@
background: $theme-graphite; background: $theme-graphite;
} }
&.ui_gray { &.ui_black {
background: $theme-gray; background: $theme-black;
} }
&.ui_green { &.ui_green {

4
changelogs/unreleased/issues-8081.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: change 'gray' color theme name to 'black' to match the actual color
merge_request: 7908
author: BM5k

2
lib/gitlab/themes.rb
View file

@ -15,7 +15,7 @@ module Gitlab
Theme.new(1, 'Graphite', 'ui_graphite'), Theme.new(1, 'Graphite', 'ui_graphite'),
Theme.new(2, 'Charcoal', 'ui_charcoal'), Theme.new(2, 'Charcoal', 'ui_charcoal'),
Theme.new(3, 'Green', 'ui_green'), 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(5, 'Violet', 'ui_violet'),
Theme.new(6, 'Blue', 'ui_blue') Theme.new(6, 'Blue', 'ui_blue')
].freeze ].freeze