Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 4 deletions

diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss
index 81a934babfe..8738b712af6 100644
--- a/app/assets/stylesheets/startup/startup-dark.scss
+++ b/app/assets/stylesheets/startup/startup-dark.scss
@@ -1810,6 +1810,9 @@ body.gl-dark .navbar-gitlab .navbar-sub-nav {
 body.gl-dark .navbar-gitlab .nav > li {
   color: #fafafa;
 }
+body.gl-dark .navbar-gitlab .nav > li.header-search-new {
+  color: #fafafa;
+}
 body.gl-dark .navbar-gitlab .nav > li > a .notification-dot {
   border: 2px solid #fafafa;
 }
@@ -1847,8 +1850,8 @@ body.gl-dark
 body.gl-dark .header-search {
   background-color: rgba(250, 250, 250, 0.2) !important;
 }
-body.gl-dark .header-search svg {
-  color: rgba(250, 250, 250, 0.8) !important;
+body.gl-dark .header-search svg.gl-search-box-by-type-search-icon {
+  color: rgba(250, 250, 250, 0.8);
 }
 body.gl-dark .header-search input {
   background-color: transparent;
diff --git a/app/assets/stylesheets/themes/theme_helper.scss b/app/assets/stylesheets/themes/theme_helper.scss
index ec0928fc3d4..c6e29c7f8b0 100644
--- a/app/assets/stylesheets/themes/theme_helper.scss
+++ b/app/assets/stylesheets/themes/theme_helper.scss
@@ -64,6 +64,10 @@
       > li {
         color: $search-and-nav-links;
 
+        &.header-search-new {
+          color: $sidebar-text;
+        }
+
         > a {
           .notification-dot {
             border: 2px solid $nav-svg-color;
@@ -151,10 +155,11 @@
       background-color: rgba($search-and-nav-links, 0.3) !important;
     }
 
-    svg {
-      color: rgba($search-and-nav-links, 0.8) !important;
+    svg.gl-search-box-by-type-search-icon {
+      color: rgba($search-and-nav-links, 0.8);
     }
 
+
     input {
       background-color: transparent;
       color: rgba($search-and-nav-links, 0.8);