Add latest changes from gitlab-org/gitlab@master

28 files changed, 88 insertions, 88 deletions

diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index a9079f036ab..78d4383ce28 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -211,7 +211,7 @@
 
 .board-blank-state,
 .board-promotion-state {
-  background-color: $white-light;
+  background-color: $white;
   flex: 1;
   overflow-y: auto;
   overflow-x: hidden;
@@ -245,7 +245,7 @@
 }
 
 .board-card {
-  background: $white-light;
+  background: $white;
   border: 1px solid $gray-200;
   box-shadow: 0 1px 2px $issue-boards-card-shadow;
   line-height: $gl-padding;
@@ -426,7 +426,7 @@
   max-width: 1100px;
   min-height: 500px;
   padding: 25px 15px 0;
-  background-color: $white-light;
+  background-color: $white;
   box-shadow: 0 2px 12px rgba($black, 0.5);
 
   .empty-state {
@@ -501,7 +501,7 @@
   top: -3px;
   width: 17px;
   background-color: $blue-500;
-  color: $white-light;
+  color: $white;
   border: 1px solid $blue-600;
   font-size: 9px;
   line-height: 15px;
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 2ddab6c3065..f8b8a7271ce 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -253,7 +253,7 @@
       color: $blue-500;
 
       &:hover {
-        color: $white-light;
+        color: $white;
       }
     }
   }
@@ -267,7 +267,7 @@
   }
 
   .builds-container {
-    background-color: $white-light;
+    background-color: $white;
     border-top: 1px solid $border-color;
     border-bottom: 1px solid $border-color;
     max-height: 300px;
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index b9d415ae237..5a69aa15303 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -1,6 +1,6 @@
 .edit-cluster-form {
   .clipboard-addon {
-    background-color: $white-light;
+    background-color: $white;
   }
 }
 
@@ -35,11 +35,11 @@
 }
 
 .cluster-application-logo {
-  border: 3px solid $white-light;
+  border: 3px solid $white;
   box-shadow: 0 0 0 1px $gray-normal;
 
   &.avatar:hover {
-    border-color: $white-light;
+    border-color: $white;
   }
 }
 
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 781b6c09458..1a07600769c 100644
--- a/app/assets/stylesheets/pages/commits.scss
+++ b/app/assets/stylesheets/pages/commits.scss
@@ -88,7 +88,7 @@
     font-family: inherit;
     left: $left;
     height: 100%;
-    border-right: 1px solid mix($input-border, $white-light);
+    border-right: 1px solid mix($input-border, $white);
     position: absolute;
     z-index: 1;
   }
@@ -127,7 +127,7 @@
 
 .text-expander {
   display: inline-flex;
-  background: $white-light;
+  background: $white;
   color: $gl-text-color-secondary;
   padding: 1px $gl-padding-4;
   cursor: pointer;
@@ -260,7 +260,7 @@
     color: $gl-text-color;
 
     &.autodevops-badge {
-      color: $white-light;
+      color: $white;
     }
   }
 
diff --git a/app/assets/stylesheets/pages/dev_ops_score.scss b/app/assets/stylesheets/pages/dev_ops_score.scss
index 6b6dce43dba..b9ee905f4b6 100644
--- a/app/assets/stylesheets/pages/dev_ops_score.scss
+++ b/app/assets/stylesheets/pages/dev_ops_score.scss
@@ -199,7 +199,7 @@ $space-between-cards: 8px;
   flex-direction: column;
   align-items: center;
   border: solid 1px $border-color;
-  background: $white-light;
+  background: $white;
   transform: translate(-50%, -50%);
   color: $gl-text-color-secondary;
   fill: $gl-text-color-secondary;
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 0c043e4f3fb..ddd1a373e2a 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -30,7 +30,7 @@
         left: -11px;
         width: 10px;
         height: calc(100% + 1px);
-        background: $white-light;
+        background: $white;
         pointer-events: none;
       }
 
@@ -92,7 +92,7 @@
   }
 
   .diff-content {
-    background: $white-light;
+    background: $white;
     color: $gl-text-color;
     border-radius: 0 0 3px 3px;
 
@@ -133,11 +133,11 @@
 
     .frame {
       display: inline-block;
-      background-color: $white-light;
+      background-color: $white;
       line-height: 0;
 
       img {
-        border: 1px solid $white-light;
+        border: 1px solid $white;
         background-image: linear-gradient(45deg,
         $border-color 25%,
         transparent 25%,
@@ -692,7 +692,7 @@ table.code {
   position: absolute;
   left: 0;
   margin-right: 0;
-  border-color: $white-light;
+  border-color: $white;
   cursor: pointer;
   transition: all 0.1s ease-out;
   @include code-icon-size();
@@ -742,7 +742,7 @@ table.code {
 
   .collapse-icon,
   path {
-    fill: $white-light;
+    fill: $white;
   }
 
   &:focus {
@@ -760,7 +760,7 @@ table.code {
     @include media-breakpoint-up(sm) {
       margin-left: -$gl-padding;
       padding-left: $gl-padding;
-      background-color: $white-light;
+      background-color: $white;
     }
   }
 
@@ -768,7 +768,7 @@ table.code {
     position: -webkit-sticky;
     position: sticky;
     top: $header-height;
-    background-color: $white-light;
+    background-color: $white;
     z-index: 200;
 
     .with-performance-bar & {
@@ -872,27 +872,27 @@ table.code {
     display: block;
     width: 100%;
     height: 10px;
-    background-color: $white-light;
+    background-color: $white;
     background-image: linear-gradient(45deg,
     transparent,
     transparent 73%,
     $diff-jagged-border-gradient-color 75%,
-    $white-light 80%),
+    $white 80%),
       linear-gradient(225deg,
     transparent,
     transparent 73%,
     $diff-jagged-border-gradient-color 75%,
-    $white-light 80%),
+    $white 80%),
       linear-gradient(135deg,
     transparent,
     transparent 73%,
     $diff-jagged-border-gradient-color 75%,
-    $white-light 80%),
+    $white 80%),
       linear-gradient(-45deg,
     transparent,
     transparent 73%,
     $diff-jagged-border-gradient-color 75%,
-    $white-light 80%);
+    $white 80%);
     background-position: 5px 5px, 0 5px, 0 5px, 5px 5px;
     background-size: 10px 10px;
     background-repeat: repeat;
@@ -981,8 +981,8 @@ table.code {
 .notes > .badge.badge-pill {
   position: absolute;
   background-color: $blue-400;
-  color: $white-light;
-  border: $white-light 1px solid;
+  color: $white;
+  border: $white 1px solid;
   min-height: $gl-padding;
   padding: 5px 8px;
   border-radius: 12px;
@@ -1037,7 +1037,7 @@ table.code {
   }
 
   &.collapsed {
-    background-color: $white-light;
+    background-color: $white;
 
     .diff-notes-collapse,
     .note,
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 1c9bfe962f6..ab6716903c7 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -112,13 +112,13 @@
 
 
 .rect-text-metric {
-  fill: $white-light;
+  fill: $white;
   stroke-width: 1;
   stroke: $gray-darkest;
 }
 
 .rect-axis-text {
-  fill: $white-light;
+  fill: $white;
 }
 
 .text-metric {
diff --git a/app/assets/stylesheets/pages/experimental_separate_sign_up.scss b/app/assets/stylesheets/pages/experimental_separate_sign_up.scss
index 710d89d9341..dfc56654229 100644
--- a/app/assets/stylesheets/pages/experimental_separate_sign_up.scss
+++ b/app/assets/stylesheets/pages/experimental_separate_sign_up.scss
@@ -8,7 +8,7 @@
   }
 
   .signup-box {
-    background-color: $white-light;
+    background-color: $white;
     box-shadow: 0 0 0 1px $border-color;
     border-radius: $border-radius;
   }
@@ -16,7 +16,7 @@
   .form-control {
     &:active,
     &:focus {
-      background-color: $white-light;
+      background-color: $white;
     }
   }
 
diff --git a/app/assets/stylesheets/pages/graph.scss b/app/assets/stylesheets/pages/graph.scss
index a8de8303a19..f9beb6fe037 100644
--- a/app/assets/stylesheets/pages/graph.scss
+++ b/app/assets/stylesheets/pages/graph.scss
@@ -10,7 +10,7 @@
   }
 
   .network-graph {
-    background: $white-light;
+    background: $white;
     height: 500px;
     overflow-y: scroll;
     overflow-x: hidden;
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss
index f6edf86e96e..beb0ea27de0 100644
--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -374,7 +374,7 @@ table.pipeline-project-metrics tr td {
       }
 
       &:last-child::before {
-        background: $white-light;
+        background: $white;
         height: auto;
         top: 30px;
         bottom: 0;
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 6de4dbfa8e5..d61fbae81f2 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -137,7 +137,7 @@
     position: absolute;
     bottom: 0;
     right: 0;
-    text-shadow: -1px -1px 0 $white-light, 1px -1px 0 $white-light, -1px 1px 0 $white-light, 1px 1px 0 $white-light;
+    text-shadow: -1px -1px 0 $white, 1px -1px 0 $white, -1px 1px 0 $white, 1px 1px 0 $white;
   }
 }
 
@@ -914,7 +914,7 @@
   }
 
   .time-tracking-help-state {
-    background: $white-light;
+    background: $white;
     margin: 16px -20px -20px;
     padding: 16px 20px;
     border-top: 1px solid $border-gray-light;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index d77b30ce259..e74b420f9e9 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -5,7 +5,7 @@
     padding: $gl-padding-8;
 
     .issue {
-      background-color: $white-light;
+      background-color: $white;
       margin-bottom: $gl-padding-8;
       border-radius: $border-radius-default;
       border: 1px solid $gray-100;
@@ -160,7 +160,7 @@ ul.related-merge-requests > li {
   margin-bottom: 10px;
 
   .form-control {
-    background-color: $white-light;
+    background-color: $white;
   }
 
   .btn {
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss
index 095e881c50a..7f6542261b8 100644
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -65,14 +65,14 @@
   padding: 0 $grid-size;
   line-height: 16px;
   border-radius: $label-border-radius;
-  color: $white-light;
+  color: $white;
 }
 
 .dropdown-labels-error {
   padding: 5px 10px;
   margin-bottom: 10px;
   background-color: $red-500;
-  color: $white-light;
+  color: $white;
 }
 
 .manage-labels-list {
@@ -80,7 +80,7 @@
   margin-bottom: 0;
 
   > li:not(.empty-message):not(.no-border) {
-    background-color: $white-light;
+    background-color: $white;
     margin-bottom: 5px;
     display: flex;
     justify-content: space-between;
diff --git a/app/assets/stylesheets/pages/login.scss b/app/assets/stylesheets/pages/login.scss
index 7488a5b16a2..67a8f689e9d 100644
--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -175,7 +175,7 @@
   .form-control {
     &:active,
     &:focus {
-      background-color: $white-light;
+      background-color: $white;
     }
   }
 
@@ -236,7 +236,7 @@
       left: 0;
       right: 0;
       height: 40px;
-      background: $white-light;
+      background: $white;
     }
 
     .login-page-broadcast {
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index 278a9014458..9d583dcaa52 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -240,14 +240,14 @@ $colors: (
       right: 10px;
       padding: 0;
       outline: none;
-      color: $white-light;
+      color: $white;
       width: 75px; // static width to make 2 buttons have same width
       height: 19px;
     }
   }
 
   .btn-success .fa-spinner {
-    color: $white-light;
+    color: $white;
   }
 
   .editor-wrap {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index ad8b251d3e4..1e5e6da4e6c 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -714,7 +714,7 @@ $mr-widget-min-height: 69px;
 .table-holder {
   .ci-table {
     th {
-      background-color: $white-light;
+      background-color: $white;
       color: $gl-text-color-secondary;
     }
   }
@@ -729,7 +729,7 @@ $mr-widget-min-height: 69px;
 .mr-version-controls {
   position: relative;
   z-index: 203;
-  background: $white-light;
+  background: $white;
   color: $gl-text-color;
   margin-top: -1px;
 
@@ -806,7 +806,7 @@ $mr-widget-min-height: 69px;
 .epic-tabs-holder {
   top: $header-height;
   z-index: 250;
-  background-color: $white-light;
+  background-color: $white;
   border-bottom: 1px solid $border-color;
 
   @include media-breakpoint-up(sm) {
@@ -857,7 +857,7 @@ $mr-widget-min-height: 69px;
     margin-right: auto;
 
     .inner-page-scroll-tabs {
-      background-color: $white-light;
+      background-color: $white;
       margin-left: -$gl-padding;
       padding-left: $gl-padding;
     }
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index cd1154b88a5..fa10ab022dc 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -14,7 +14,7 @@ $status-box-line-height: 26px;
     border: 0;
     padding: $gl-padding-top $gl-padding;
     border-radius: $border-radius-default;
-    background-color: $white-light;
+    background-color: $white;
 
     &:not(:last-child) {
       margin-bottom: $gl-padding-4;
@@ -238,7 +238,7 @@ $status-box-line-height: 26px;
 }
 
 .issuable-row {
-  background-color: $white-light;
+  background-color: $white;
 }
 
 .milestone-popover-instructions-list {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index c6bac33e888..43c7c03fa58 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -59,7 +59,7 @@
     border-radius: $border-radius-base;
     transition: border-color ease-in-out 0.15s,
       box-shadow ease-in-out 0.15s;
-    background-color: $white-light;
+    background-color: $white;
 
     &.is-focused {
       @extend .form-control:focus;
@@ -173,7 +173,7 @@
 }
 
 .discussion-form {
-  background-color: $white-light;
+  background-color: $white;
 
   @include media-breakpoint-down(xs) {
     .user-avatar-link {
@@ -217,7 +217,7 @@ table {
   font-size: 14px;
 
   .md-area {
-    background-color: $white-light;
+    background-color: $white;
   }
 }
 
@@ -235,7 +235,7 @@ table {
 
   &.alert-dismissable {
     .close {
-      color: $white-light;
+      color: $white;
       opacity: 0.85;
       font-weight: $gl-font-weight-normal;
 
@@ -416,7 +416,7 @@ table {
     float: right;
 
     i {
-      color: $white-light;
+      color: $white;
       padding-right: 2px;
       margin-top: 2px;
     }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index f2b8433a995..25d8fc1f9a3 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -364,7 +364,7 @@ $note-form-margin-left: 72px;
             left: $gl-padding-24;
             right: 0;
             bottom: 0;
-            background: linear-gradient(rgba($white-light, 0.1) -100px, $white-light 100%);
+            background: linear-gradient(rgba($white, 0.1) -100px, $white 100%);
           }
         }
       }
@@ -380,7 +380,7 @@ $note-form-margin-left: 72px;
     .timeline-icon {
       display: flex;
       align-items: center;
-      background-color: $white-light;
+      background-color: $white;
       width: $system-note-icon-size;
       height: $system-note-icon-size;
       border: 1px solid $border-color;
@@ -470,7 +470,7 @@ $note-form-margin-left: 72px;
     }
 
     .system-note {
-      background-color: $white-light;
+      background-color: $white;
       padding: $gl-padding;
     }
   }
@@ -506,7 +506,7 @@ $note-form-margin-left: 72px;
         // Fixes subpixel rounding issue https://gitlab.com/gitlab-org/gitlab-foss/issues/53973
         // background-color is needed for dark code preference
         padding-bottom: 1px;
-        background-color: $white-light;
+        background-color: $white;
 
         &.parallel {
           border-width: 1px;
@@ -517,7 +517,7 @@ $note-form-margin-left: 72px;
         }
 
         .notes {
-          background-color: $white-light;
+          background-color: $white;
         }
 
         a code {
@@ -561,7 +561,7 @@ $note-form-margin-left: 72px;
 
 .code-commit .notes-content,
 .diff-viewer > .image ~ .note-container {
-  background-color: $white-light;
+  background-color: $white;
 
   .avatar-note-form-holder {
     .user-avatar-link img {
@@ -827,7 +827,7 @@ $note-form-margin-left: 72px;
 
   &.discussion-locked {
     border: 0;
-    background-color: $white-light;
+    background-color: $white;
   }
 
   a:not(.learn-more) {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 8b0dd73c565..154717f9776 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -16,7 +16,7 @@
   width: 100%;
   border: 1px solid $border-color;
   border-radius: $border-radius;
-  background-color: $white-light;
+  background-color: $white;
 
   &:hover {
     background-color: $gray-darker;
@@ -675,7 +675,7 @@
     &.ci-action-icon-wrapper {
       height: 30px;
       width: 30px;
-      background: $white-light;
+      background: $white;
       border: 1px solid $border-color;
       border-radius: 100%;
       display: block;
@@ -768,7 +768,7 @@
 
 @mixin mini-pipeline-item() {
   border-radius: 100px;
-  background-color: $white-light;
+  background-color: $white;
   border-width: 1px;
   border-style: solid;
   width: $ci-action-icon-size;
@@ -852,7 +852,7 @@ button.mini-pipeline-graph-dropdown-toggle {
       height: $ci-action-dropdown-button-size;
       width: $ci-action-dropdown-button-size;
 
-      background: $white-light;
+      background: $white;
       border: 1px solid $border-color;
       border-radius: 50%;
       display: block;
@@ -977,7 +977,7 @@ button.mini-pipeline-graph-dropdown-toggle {
   &::after {
     left: -5px;
     border-width: 10px 7px 10px 0;
-    border-right-color: $white-light;
+    border-right-color: $white;
   }
 }
 
@@ -1012,7 +1012,7 @@ button.mini-pipeline-graph-dropdown-toggle {
 
   &::after {
     margin-top: 1px;
-    border-bottom-color: $white-light;
+    border-bottom-color: $white;
   }
 
   /**
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 82b3698287c..85836962b06 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -428,7 +428,7 @@ table.u2f-registrations {
 }
 
 .gitlab-slack-well {
-  background-color: $white-light;
+  background-color: $white;
   box-shadow: none;
   max-width: $add-to-slack-well-max-width;
 }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 8b2c67378d9..c0a1cf10fe4 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -542,7 +542,7 @@
 
     .input-group-text {
       width: 100%;
-      background-color: $white-light;
+      background-color: $white;
     }
 
     .selected-icon {
@@ -655,7 +655,7 @@
       z-index: 10;
       padding: $gl-padding-8 0;
       text-align: center;
-      background-color: $white-light;
+      background-color: $white;
       color: $gl-text-color-tertiary;
       transform: translateY(-50%);
       font-size: 12px;
@@ -821,7 +821,7 @@
 .repository-languages-bar {
   height: 8px;
   margin-bottom: $gl-padding-8;
-  background-color: $white-light;
+  background-color: $white;
   border-radius: $border-radius-default;
 
   .progress-bar {
@@ -1150,7 +1150,7 @@ pre.light-well {
 
   .form-control {
     @extend .monospace;
-    background-color: $white-light;
+    background-color: $white;
     border-color: $border-color;
     font-size: 14px;
     margin-left: -1px;
@@ -1181,7 +1181,7 @@ pre.light-well {
   }
 
   i:nth-child(2) {
-    color: $white-light;
+    color: $white;
   }
 }
 
@@ -1385,7 +1385,7 @@ pre.light-well {
   padding: 32px;
   margin: 32px;
   border-radius: 3px;
-  background-color: $white-light;
+  background-color: $white;
 
   h3 {
     margin-top: 0;
diff --git a/app/assets/stylesheets/pages/prometheus.scss b/app/assets/stylesheets/pages/prometheus.scss
index 5872c90a25e..6e5daef3e7d 100644
--- a/app/assets/stylesheets/pages/prometheus.scss
+++ b/app/assets/stylesheets/pages/prometheus.scss
@@ -31,7 +31,7 @@
   }
 
   &.sortable-chosen .draggable-panel {
-    background: $white-light;
+    background: $white;
     box-shadow: 0 0 4px $gray-500;
   }
 
@@ -41,7 +41,7 @@
     .draggable-remove-link {
       cursor: pointer;
       color: $gray-600;
-      background-color: $white-light;
+      background-color: $white;
     }
   }
 }
diff --git a/app/assets/stylesheets/pages/runners.scss b/app/assets/stylesheets/pages/runners.scss
index 59f01f3e958..dc3811bab65 100644
--- a/app/assets/stylesheets/pages/runners.scss
+++ b/app/assets/stylesheets/pages/runners.scss
@@ -1,7 +1,7 @@
 .runner-state {
   padding: 6px 12px;
   margin-right: 10px;
-  color: $white-light;
+  color: $white;
 
   &.runner-state-shared {
     background: $green-400;
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss
index f8127dc794a..d8084a20af9 100644
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -63,7 +63,7 @@ input[type='checkbox']:hover {
     margin-left: 5px;
     line-height: 25px;
     width: 98%;
-    color: $white-light;
+    color: $white;
     background: none;
     transition: color ease-in-out $default-transition-duration;
   }
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index c90b92a5b49..2c0ca792ec3 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -261,7 +261,7 @@
     }
 
     .card-header .label-count {
-      color: $white-light;
+      color: $white;
       background: $common-gray-dark;
     }
 
@@ -325,7 +325,7 @@
 
 .saml-settings.info-well {
   .form-control[readonly] {
-    background: $white-light;
+    background: $white;
   }
 }
 
@@ -340,7 +340,7 @@
 
   a {
     font-weight: $gl-font-weight-bold;
-    color: $white-light;
+    color: $white;
   }
 }
 
@@ -355,7 +355,7 @@
   }
 
   .btn-clipboard {
-    background-color: $white-light;
+    background-color: $white;
     border: 1px solid $gray-200;
   }
 
@@ -368,7 +368,7 @@
 .mirror-error-badge {
   background-color: $red-400;
   border-radius: $border-radius-default;
-  color: $white-light;
+  color: $white;
 }
 
 .push-pull-table {
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index ece0ac04baf..bbb37479fb0 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -44,7 +44,7 @@
   }
 
   &.todo-pending.done-reversible {
-    background-color: $white-light;
+    background-color: $white;
 
     &:hover {
       border-color: $white-normal;
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 81e910f91c2..2ec3454630b 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -101,7 +101,7 @@
       border-top: 1px solid $white-normal;
 
       &:last-of-type {
-        border-bottom-color: $white-light;
+        border-bottom-color: $white;
       }
 
       td,