Fix variables after rebasing master38988-update-grey-variables-to-match-brand-ai

9 files changed, 12 insertions, 12 deletions

diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss
index 10f9e9b70b0..878bdfbed14 100644
--- a/app/assets/stylesheets/framework/blank.scss
+++ b/app/assets/stylesheets/framework/blank.scss
@@ -50,7 +50,7 @@
   }
 
   &:hover {
-    background-color: $gray-light;
+    background-color: $grey-50;
     text-decoration: none;
     color: $gl-text-color;
   }
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 5b78e6f838b..17163c056cb 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -170,7 +170,7 @@
           padding: 5px 10px;
           min-width: 400px;
           max-width: 400px;
-          background: $gray-light;
+          background: $grey-50;
           border-left: 3px solid;
 
           .commit-row-title {
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index a970b1498f3..b3db9c8c5f1 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -313,7 +313,7 @@ ul.indent-list {
       padding: 2px;
 
       .avatar {
-        border: 2px solid $white-normal;
+        border: 2px solid $grey-100;
 
         &.identicon {
           line-height: 30px;
@@ -417,7 +417,7 @@ ul.indent-list {
     }
 
     &:first-child {
-      border-top: 1px solid $white-normal;
+      border-top: 1px solid $grey-100;
     }
 
     &:last-of-type {
diff --git a/app/assets/stylesheets/framework/responsive_tables.scss b/app/assets/stylesheets/framework/responsive_tables.scss
index a4e1fb68b32..4b88277f5ff 100644
--- a/app/assets/stylesheets/framework/responsive_tables.scss
+++ b/app/assets/stylesheets/framework/responsive_tables.scss
@@ -84,7 +84,7 @@
     display: block;
     align-self: stretch;
     min-height: 0;
-    background-color: $gray-normal;
+    background-color: $grey-100;
     border-top: 1px solid $border-color;
 
     .table-action-buttons {
diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
index e74848d39a5..694573de3c5 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -178,8 +178,8 @@ $modal-title-padding: $gl-padding;
 // $modal-title-line-height:     $line-height-base
 
 //** Background color of modal content area
-$modal-content-bg: $gray-light;
-$modal-body-bg: $white-light;
+$modal-content-bg: $grey-50;
+$modal-body-bg: $white;
 //** Modal content border color
 // $modal-content-border-color:                   rgba(0,0,0,.2)
 //** Modal content border color **for IE8**
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index f9358f14c21..2208e03d8bf 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -305,7 +305,7 @@
 
     .y-label-text,
     .x-label-text {
-      fill: $gray-darkest;
+      fill: $grey-400;
     }
 
     .axis-tick {
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index c6421653a45..36340ddacf3 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -124,7 +124,7 @@
   bottom: 0;
   right: 0;
   transition: width $right-sidebar-transition-duration;
-  background: $gray-light;
+  background: $grey-50;
   z-index: 200;
   overflow: hidden;
 
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 26716e03533..dddefaaaf52 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -330,7 +330,7 @@ ul.notes {
     font-family: $regular_font;
 
     td {
-      border: 1px solid $white-normal;
+      border: 1px solid $grey-100;
       border-left: 0;
 
       &.notes_line {
@@ -470,7 +470,7 @@ ul.notes {
 .discussion-actions {
   float: right;
   margin-left: 10px;
-  color: $gey-400;
+  color: $grey-400;
 
   @include notes-media('max', $screen-md-max) {
     float: none;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index dc99686f3a8..ef646727649 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -478,7 +478,7 @@
       &.ci-action-icon-wrapper {
         height: 30px;
         width: 30px;
-        background: $white-light;
+        background: $white;
         border: 1px solid $border-color;
         border-radius: 100%;
         display: block;