Merge branch 'gt-update-navigation-theme-colors' into 'master'

Update header navigation theme colors

Closes #49658

See merge request gitlab-org/gitlab-ce!23734

3 files changed, 14 insertions, 8 deletions

diff --git a/app/assets/stylesheets/framework/gitlab_theme.scss b/app/assets/stylesheets/framework/gitlab_theme.scss
index b8bb9e1e07b..0ef50e139f2 100644
--- a/app/assets/stylesheets/framework/gitlab_theme.scss
+++ b/app/assets/stylesheets/framework/gitlab_theme.scss
@@ -22,6 +22,10 @@
     .container-fluid {
       .navbar-toggler {
         border-left: 1px solid lighten($border-and-box-shadow, 10%);
+
+        svg {
+          fill: $search-and-nav-links;
+        }
       }
     }
 
@@ -309,12 +313,14 @@ body {
       .navbar-nav {
         > li {
           > a:hover,
-          > a:focus {
+          > a:focus,
+          > button:hover {
             color: $theme-gray-900;
           }
 
           &.active > a,
-          &.active > a:hover {
+          &.active > a:hover,
+          &.active > button {
             color: $white-light;
           }
         }
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 45a52d99302..7d283dcfb71 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -33,6 +33,7 @@
 
     .close-icon {
       display: block;
+      margin: auto;
     }
   }
 
@@ -168,12 +169,6 @@
         color: currentColor;
         background-color: transparent;
       }
-
-      .more-icon,
-      .close-icon {
-        fill: $white-light;
-        margin: auto;
-      }
     }
 
     .navbar-nav {
diff --git a/changelogs/unreleased/gt-update-navigation-theme-colors.yml b/changelogs/unreleased/gt-update-navigation-theme-colors.yml
new file mode 100644
index 00000000000..749587a6343
--- /dev/null
+++ b/changelogs/unreleased/gt-update-navigation-theme-colors.yml
@@ -0,0 +1,5 @@
+---
+title: Update header navigation theme colors
+merge_request: 23734
+author: George Tsiolis
+type: fixed