From c5664761778a5f530ee7a738f25da3c6742e3ab2 Mon Sep 17 00:00:00 2001
From: BM5k <me@bm5k.com>
Date: Fri, 2 Dec 2016 18:05:02 -0700
Subject: [PATCH 1/4] rename charcoal theme variables for consistency

---
 app/assets/stylesheets/framework/gitlab-theme.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 5cd242af91d..642d1d15c14 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -84,10 +84,10 @@
   }
 }
 
-$theme-charcoal: #3d454d;
-$theme-charcoal-light: #485157;
-$theme-charcoal-dark: #383f45;
-$theme-charcoal-text: #b9bbbe;
+$theme-charcoal-light: #b9bbbe;
+$theme-charcoal: #485157;
+$theme-charcoal-dark: #3d454d;
+$theme-charcoal-darker: #383f45;
 
 $theme-blue-light: #becde9;
 $theme-blue: #2980b9;
@@ -120,7 +120,7 @@ body {
   }
 
   &.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 {

From 20b5f5af275a2b482baa0d2ff26e806517586c79 Mon Sep 17 00:00:00 2001
From: BM5k <me@bm5k.com>
Date: Fri, 2 Dec 2016 18:06:30 -0700
Subject: [PATCH 2/4] rename graphite theme variables for consistency

---
 app/assets/stylesheets/framework/gitlab-theme.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index 642d1d15c14..a8789ad9bf7 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -94,10 +94,10 @@ $theme-blue: #2980b9;
 $theme-blue-dark: #1970a9;
 $theme-blue-darker: #096099;
 
-$theme-graphite-lighter: #ccc;
-$theme-graphite-light: #777;
-$theme-graphite: #666;
-$theme-graphite-dark: #555;
+$theme-graphite-light: #ccc;
+$theme-graphite: #777;
+$theme-graphite-dark: #666;
+$theme-graphite-darker: #555;
 
 $theme-gray-light: #979797;
 $theme-gray: #373737;
@@ -124,7 +124,7 @@ body {
   }
 
   &.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 {

From 6cb6f58a6259c91f79489b7f5a71f413d0e0d81c Mon Sep 17 00:00:00 2001
From: BM5k <me@bm5k.com>
Date: Fri, 2 Dec 2016 18:44:06 -0700
Subject: [PATCH 3/4] rename theme to match actual colors

---
 app/assets/stylesheets/framework/gitlab-theme.scss   | 12 ++++++------
 .../stylesheets/pages/profiles/preferences.scss      |  4 ++--
 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

From 23f063e444ed308decf3ea42ef1d7fef76020fd6 Mon Sep 17 00:00:00 2001
From: BM5k <me@bm5k.com>
Date: Sat, 3 Dec 2016 14:46:00 -0700
Subject: [PATCH 4/4] add changelog entry

---
 changelogs/unreleased/issues-8081.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/issues-8081.yml

diff --git a/changelogs/unreleased/issues-8081.yml b/changelogs/unreleased/issues-8081.yml
new file mode 100644
index 00000000000..82f746937bc
--- /dev/null
+++ b/changelogs/unreleased/issues-8081.yml
@@ -0,0 +1,4 @@
+---
+title: change 'gray' color theme name to 'black' to match the actual color
+merge_request: 7908
+author: BM5k