diff options
| author | Mark Otto <[email protected]> | 2013-10-20 21:16:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 21:16:37 -0700 |
| commit | 98378d2d88fc92f6c0f3a1db2a861409074c010a (patch) | |
| tree | e5998e84934fd7144516b4132772b8cea2dba47b /less | |
| parent | 5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb (diff) | |
| parent | 76baacf2c94bec03273639ef0ed966dad87cf37a (diff) | |
| download | bootstrap-98378d2d88fc92f6c0f3a1db2a861409074c010a.tar.xz bootstrap-98378d2d88fc92f6c0f3a1db2a861409074c010a.zip | |
Merge pull request #11188 from twbs/navbar_zindex_auto
Fixes #10433: Navbar z-index refactor
Diffstat (limited to 'less')
| -rw-r--r-- | less/navbar.less | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/less/navbar.less b/less/navbar.less index cc3e1f213..577e20ed5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -10,7 +10,6 @@ .navbar { position: relative; - z-index: @zindex-navbar; min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) margin-bottom: @navbar-margin-bottom; border: 1px solid transparent; @@ -116,7 +115,9 @@ // Static top (unfixed, but 100% wide) navbar .navbar-static-top { + z-index: @zindex-navbar; border-width: 0 0 1px; + @media (min-width: @grid-float-breakpoint) { border-radius: 0; } @@ -128,6 +129,7 @@ position: fixed; right: 0; left: 0; + z-index: @zindex-navbar-fixed; // Undo the rounded corners @media (min-width: @grid-float-breakpoint) { @@ -135,7 +137,6 @@ } } .navbar-fixed-top { - z-index: @zindex-navbar-fixed; top: 0; border-width: 0 0 1px; } @@ -153,6 +154,7 @@ padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; line-height: @line-height-computed; + &:hover, &:focus { text-decoration: none; |