diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/stylesheets/framework/header.scss | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/stylesheets/framework/header.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 1004383cfd3..f44123fc2ed 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -1,5 +1,3 @@ -$top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important; - .navbar-gitlab { padding: 0 16px; z-index: $header-zindex; @@ -54,7 +52,7 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important white-space: nowrap; img { - height: 28px; + height: 24px; + .logo-text { margin-left: 8px; @@ -460,7 +458,6 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important vertical-align: text-top; } - a.upgrade-plan-link gl-emoji, a.ci-minutes-emoji gl-emoji, a.trial-link gl-emoji { font-size: $gl-font-size; @@ -574,7 +571,7 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important } .frequent-items-list-item-container > a:hover { - background-color: $top-nav-hover-bg; + background-color: $nav-active-bg; } } @@ -589,11 +586,9 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important } .top-nav-menu-item { - color: var(--indigo-900, $theme-indigo-900) !important; - &.active, &:hover { - background-color: $top-nav-hover-bg; + background-color: $nav-active-bg; } .gl-icon { @@ -603,7 +598,6 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important .top-nav-responsive { @include gl-display-none; - color: var(--indigo-900, $theme-indigo-900); } .top-nav-responsive-open { |