diff options
author | Phil Hughes <me@iamphill.com> | 2018-12-13 13:28:10 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-12-13 13:28:10 +0000 |
commit | 3b14a44c3f9554b8aafeb1153ff3cf9358abad72 (patch) | |
tree | 12a3d123488835e52a14136e5279483c14bdcf9e | |
parent | 8ff205b5ad897b434b268e988872d2c860164424 (diff) | |
parent | 599272d061836ce4688a944ad171f87591c71b53 (diff) | |
download | gitlab-ce-3b14a44c3f9554b8aafeb1153ff3cf9358abad72.tar.gz |
Merge branch 'gt-update-navigation-theme-colors' into 'master'
Update header navigation theme colors
Closes #49658
See merge request gitlab-org/gitlab-ce!23734
-rw-r--r-- | app/assets/stylesheets/framework/gitlab_theme.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 7 | ||||
-rw-r--r-- | changelogs/unreleased/gt-update-navigation-theme-colors.yml | 5 |
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 |