Add latest changes from gitlab-org/gitlab@master

3 files changed, 72 insertions, 68 deletions

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d632689a4f6..ed4b6b7cdb7 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -283,75 +283,79 @@ $color-ranges: (
 
 // GitLab themes
 
-$indigo-50: #f7f7ff;
-$indigo-100: #ebebfa;
-$indigo-200: #d1d1f0;
-$indigo-300: #a6a6de;
-$indigo-400: #7c7ccc;
+$indigo-50: #f1f1ff;
+$indigo-100: #dbdbf8;
+$indigo-200: #c7c7f2;
+$indigo-300: #a2a2e6;
+$indigo-400: #8181d7;
 $indigo-500: #6666c4;
-$indigo-600: #5b5bbd;
-$indigo-700: #4b4ba3;
-$indigo-800: #393982;
-$indigo-900: #292961;
-$indigo-950: #1a1a40;
+$indigo-600: #5252b5;
+$indigo-700: #41419f;
+$indigo-800: #303083;
+$indigo-900: #222261;
+$indigo-950: #14143d;
 // To do this variant right for darkmode, we need to create a variable for it.
 $indigo-900-alpha-008: rgba($indigo-900, 0.08);
 
-$theme-blue-50: #f4f8fc;
-$theme-blue-100: #e6edf5;
-$theme-blue-200: #c8d7e6;
-$theme-blue-300: #97b3cf;
-$theme-blue-400: #648cb4;
-$theme-blue-500: #4a79a8;
-$theme-blue-600: #3e6fa0;
-$theme-blue-700: #305c88;
-$theme-blue-800: #25496e;
-$theme-blue-900: #1a3652;
-$theme-blue-950: #0f2235;
-
-$theme-light-blue-50: #f2f7fc;
-$theme-light-blue-100: #ebf1f7;
-$theme-light-blue-200: #c9dcf2;
-$theme-light-blue-300: #83abd4;
-$theme-light-blue-400: #4d86bf;
-$theme-light-blue-500: #367cc2;
-$theme-light-blue-600: #3771ab;
-$theme-light-blue-700: #2261a1;
-
-$theme-green-50: #f2faf6;
-$theme-green-100: #e4f3ea;
-$theme-green-200: #c0dfcd;
-$theme-green-300: #8ac2a1;
-$theme-green-400: #52a274;
-$theme-green-500: #35935c;
-$theme-green-600: #288a50;
-$theme-green-700: #1c7441;
-$theme-green-800: #145d33;
-$theme-green-900: #0d4524;
-$theme-green-950: #072d16;
-
-$theme-light-green-700: #156b39;
-
-$theme-red-50: #fcf4f2;
-$theme-red-100: #fae9e6;
-$theme-red-200: #ebcac5;
-$theme-red-300: #d99b91;
-$theme-red-400: #b0655a;
+$theme-blue-50: #cdd8e3;
+$theme-blue-100: #b9cadc;
+$theme-blue-200: #a6bdd5;
+$theme-blue-300: #81a5c9;
+$theme-blue-400: #628eb9;
+$theme-blue-500: #4977a5;
+$theme-blue-600: #346596;
+$theme-blue-700: #235180;
+$theme-blue-800: #153c63;
+$theme-blue-900: #0b2640;
+$theme-blue-950: #04101c;
+
+$theme-light-blue-50: #dde6ee;
+$theme-light-blue-100: #c1d4e6;
+$theme-light-blue-200: #a0bedc;
+$theme-light-blue-300: #74a3d3;
+$theme-light-blue-400: #4f8bc7;
+$theme-light-blue-500: #3476b9;
+$theme-light-blue-600: #2268ae;
+$theme-light-blue-700: #145aa1;
+$theme-light-blue-800: #0e4d8d;
+$theme-light-blue-900: #0c4277;
+$theme-light-blue-950: #0a3764;
+
+$theme-green-50: #dde9de;
+$theme-green-100: #b1d6b5;
+$theme-green-200: #8cc497;
+$theme-green-300: #69af7d;
+$theme-green-400: #499767;
+$theme-green-500: #308258;
+$theme-green-600: #25744c;
+$theme-green-700: #1b653f;
+$theme-green-800: #155635;
+$theme-green-900: #0e4328;
+$theme-green-950: #052e19;
+
+$theme-red-50: #f4e9e7;
+$theme-red-100: #ecd3d0;
+$theme-red-200: #e3bab5;
+$theme-red-300: #d59086;
+$theme-red-400: #c66e60;
 $theme-red-500: #ad4a3b;
-$theme-red-600: #9e4133;
-$theme-red-700: #912f20;
-$theme-red-800: #78291d;
-$theme-red-900: #691a16;
-$theme-red-950: #36140f;
-
-$theme-light-red-50: #fff6f5;
-$theme-light-red-100: #fae2de;
-$theme-light-red-200: #f7d5d0;
-$theme-light-red-300: #d9796a;
-$theme-light-red-400: #cf604e;
+$theme-red-600: #a13322;
+$theme-red-700: #8f2110;
+$theme-red-800: #761405;
+$theme-red-900: #580d02;
+$theme-red-950: #380700;
+
+$theme-light-red-50: #faf2f1;
+$theme-light-red-100: #f6d9d5;
+$theme-light-red-200: #ebada2;
+$theme-light-red-300: #e07f6f;
+$theme-light-red-400: #d36250;
 $theme-light-red-500: #c24b38;
-$theme-light-red-600: #b03927;
-$theme-light-red-700: #a62e21;
+$theme-light-red-600: #b53a26;
+$theme-light-red-700: #a02e1c;
+$theme-light-red-800: #8b2212;
+$theme-light-red-900: #751709;
+$theme-light-red-950: #5c1105;
 
 // Data visualization color palette
 
diff --git a/app/assets/stylesheets/page_bundles/profiles/preferences.scss b/app/assets/stylesheets/page_bundles/profiles/preferences.scss
index 1a59f96c6ee..d09ad42a722 100644
--- a/app/assets/stylesheets/page_bundles/profiles/preferences.scss
+++ b/app/assets/stylesheets/page_bundles/profiles/preferences.scss
@@ -1,9 +1,9 @@
 @import 'page_bundles/mixins_and_variables_and_functions';
 
 .application-theme {
-  $ui-gray-bg: #303030;
-  $ui-light-gray-bg: #f0f0f0;
-  $ui-dark-mode-bg: #1f1f1f;
+  $ui-gray-bg: $gray-900;
+  $ui-light-gray-bg: $gray-50;
+  $ui-dark-mode-bg: $gray-950;
 
   .preview {
     font-size: 0;
@@ -33,7 +33,7 @@
     }
 
     &.ui-light-green {
-      background-color: $theme-light-green-700;
+      background-color: $theme-green-700;
     }
 
     &.ui-red {
diff --git a/app/assets/stylesheets/themes/theme_light_green.scss b/app/assets/stylesheets/themes/theme_light_green.scss
index 720a0ec58b8..6b058b2dd7b 100644
--- a/app/assets/stylesheets/themes/theme_light_green.scss
+++ b/app/assets/stylesheets/themes/theme_light_green.scss
@@ -6,7 +6,7 @@ body {
       $theme-green-200,
       $theme-green-500,
       $theme-green-500,
-      $theme-light-green-700,
+      $theme-green-700,
       $white
     );