Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 7 deletions

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) {