Add latest changes from gitlab-org/gitlab@master

10 files changed, 17 insertions, 17 deletions

diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index 86e701604b5..4f09f1a394b 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -232,7 +232,7 @@
       height: $default-icon-size;
       width: $default-icon-size;
       border-radius: 50%;
-      fill: $gray-700;
+      fill: $gray-500;
     }
   }
 
diff --git a/app/assets/stylesheets/framework/ci_variable_list.scss b/app/assets/stylesheets/framework/ci_variable_list.scss
index b9c8395dd37..2204b037f69 100644
--- a/app/assets/stylesheets/framework/ci_variable_list.scss
+++ b/app/assets/stylesheets/framework/ci_variable_list.scss
@@ -100,7 +100,7 @@
 }
 
 .group-variable-list {
-  color: $gray-700;
+  color: $gray-500;
 
   .table-section:not(:first-child) {
     @include media-breakpoint-down(sm) {
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 78f98b5936e..00679cf20fa 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -6,7 +6,7 @@
 .cdark { color: $common-gray-dark; }
 
 .fwhite { fill: $white; }
-.fgray { fill: $gray-700; }
+.fgray { fill: $gray-500; }
 
 .text-plain,
 .text-plain:hover {
diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index 2fa310cb90e..7aaed1fa9b7 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -296,7 +296,7 @@ body {
     @include gitlab-theme(
       $gray-200,
       $gray-300,
-      $gray-700,
+      $gray-500,
       $gray-800,
       $gray-900,
       $white
@@ -305,12 +305,12 @@ body {
 
   &.ui-light {
     @include gitlab-theme(
-      $gray-700,
+      $gray-500,
       $gray-800,
-      $gray-700,
-      $gray-700,
+      $gray-500,
+      $gray-500,
       $gray-50,
-      $gray-700
+      $gray-500
     );
 
     .navbar-gitlab {
@@ -341,7 +341,7 @@ body {
       .container-fluid {
         .navbar-toggler,
         .navbar-toggler:hover {
-          color: $gray-700;
+          color: $gray-500;
           border-left: 1px solid $gray-100;
         }
       }
diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index 536b645263d..ec0755b1614 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -98,5 +98,5 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  color: $gray-700;
+  color: $gray-500;
 }
diff --git a/app/assets/stylesheets/framework/responsive_tables.scss b/app/assets/stylesheets/framework/responsive_tables.scss
index 1878fac1c60..07c3eb19fd4 100644
--- a/app/assets/stylesheets/framework/responsive_tables.scss
+++ b/app/assets/stylesheets/framework/responsive_tables.scss
@@ -20,7 +20,7 @@
   @extend .gl-responsive-table-row-layout;
   margin-top: 10px;
   border: 1px solid $border-color;
-  color: $gray-700;
+  color: $gray-500;
 
   &.gl-responsive-table-row-clickable {
     &:hover {
diff --git a/app/assets/stylesheets/framework/spinner.scss b/app/assets/stylesheets/framework/spinner.scss
index b7a99d421c9..d734895c7dc 100644
--- a/app/assets/stylesheets/framework/spinner.scss
+++ b/app/assets/stylesheets/framework/spinner.scss
@@ -42,7 +42,7 @@
   }
 
   &.spinner-dark {
-    @include spinner-color($gray-700);
+    @include spinner-color($gray-500);
   }
 
   &.spinner-light {
diff --git a/app/assets/stylesheets/framework/stacked_progress_bar.scss b/app/assets/stylesheets/framework/stacked_progress_bar.scss
index 03ef886baef..a3037549881 100644
--- a/app/assets/stylesheets/framework/stacked_progress_bar.scss
+++ b/app/assets/stylesheets/framework/stacked_progress_bar.scss
@@ -24,7 +24,7 @@
 
   .status-unavailable {
     padding: 0 10px;
-    color: $gray-700;
+    color: $gray-500;
   }
 
   .status-green {
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 5bc2874ea05..1f60485aa36 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -16,7 +16,7 @@ table {
   * Remove this code as soon as this happens
   */
   &.gl-table {
-    @include gl-text-gray-700;
+    @include gl-text-gray-500;
   }
 
   &.table {
@@ -60,7 +60,7 @@ table {
         }
 
         &.original-gl-th {
-          @include gl-text-gray-700;
+          @include gl-text-gray-500;
           border-bottom: 1px solid $cycle-analytics-light-gray;
         }
       }
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 02f81157fce..bfb8d209868 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -169,7 +169,7 @@ $gray-300: #999 !default;
 $gray-400: #868686 !default;
 $gray-500: #666 !default;
 $gray-600: #5e5e5e !default;
-$gray-700: #707070 !default;
+$gray-700: #525252 !default;
 $gray-800: #4f4f4f !default;
 $gray-900: #303030 !default;
 $gray-950: #1f1f1f !default;
@@ -350,7 +350,7 @@ $gl-font-size-large: 16px;
 $gl-font-weight-normal: 400;
 $gl-font-weight-bold: 600;
 $gl-text-color: $gray-900;
-$gl-text-color-secondary: $gray-700;
+$gl-text-color-secondary: $gray-500;
 $gl-text-color-tertiary: $gray-400;
 $gl-text-color-quaternary: #d6d6d6;
 $gl-text-color-inverted: $white;