diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-07 07:52:28 -0700 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-10-07 07:52:28 -0700 |
commit | b352462d01e3c51d09314c282e84afe075d6ad01 (patch) | |
tree | 3a1364cad40d83ebbafaa9e5dddca6b68d68031b /app/assets/stylesheets | |
parent | 9b27f62d86ff8d71710a7e6945414fe115494203 (diff) | |
download | gitlab-ce-b352462d01e3c51d09314c282e84afe075d6ad01.tar.gz |
Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuff
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 34 |
2 files changed, 18 insertions, 18 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 9dcf332eee2..5b950ae0ba0 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -749,7 +749,7 @@ margin-bottom: $dropdown-vertical-offset; } - li { + li:not(.dropdown-bold-header) { display: block; padding: 0 1px; diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 9b4bfae1144..22945e935ef 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -5,22 +5,6 @@ .navbar-gitlab { @include new-style-dropdown; - &.navbar-empty { - height: $header-height; - background: $white-light; - border-bottom: 1px solid $white-normal; - - .center-logo { - margin: 8px 0; - text-align: center; - - .tanuki-logo, - img { - height: 36px; - } - } - } - &.navbar-gitlab { padding: 0 16px; z-index: 1000; @@ -550,7 +534,7 @@ color: $gl-text-color; left: auto; - .current-user { + li.current-user { padding: 5px 18px; .user-name { @@ -570,3 +554,19 @@ .with-performance-bar .navbar-gitlab { top: $performance-bar-height; } + +.navbar-empty { + height: $header-height; + background: $white-light; + border-bottom: 1px solid $white-normal; + + .center-logo { + margin: 8px 0; + text-align: center; + + .tanuki-logo, + img { + height: 36px; + } + } +} |