diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-24 09:14:02 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-24 09:14:02 +0000 |
commit | a1857b000be721f2f901f5adef0e0252251025ae (patch) | |
tree | 36a7de89667d8875bf0204fb006f2d92894b738a | |
parent | 6cbc69aa7eb9fc054b62ad6e20bda10f12228c18 (diff) | |
parent | c0061384464b731374267c4938e41412b2f2c45f (diff) | |
download | gitlab-ce-a1857b000be721f2f901f5adef0e0252251025ae.tar.gz |
Merge branch '32700-extra-nav-border' into 'master'
Only show extra nav border on layout nav
Closes #32700
See merge request !11657
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index ce8b27a1951..d8645afb7da 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -40,7 +40,17 @@ header { } &.with-horizontal-nav { - border-color: transparent; + border-bottom: 0; + + .navbar-border { + height: 1px; + position: absolute; + right: 0; + left: 0; + bottom: -1px; + background-color: $border-color; + opacity: 0; + } } .container-fluid { @@ -114,16 +124,6 @@ header { } } - .navbar-border { - height: 1px; - position: absolute; - right: 0; - left: 0; - bottom: 0; - background-color: $border-color; - opacity: 0; - } - .global-dropdown { position: absolute; left: -10px; |