rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Fixes #10433: Navbar z-index refactor

Browse Source 
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
This commit is contained in:
Mark Otto 2013-10-20 20:30:16 -07:00
parent 5aa4c5cb0c
commit e486bb4f39
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/css/bootstrap.css vendored
View File

@ -4294,6 +4294,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar { .navbar {
z-index: auto;
border-radius: 4px; border-radius: 4px;
} }
} }
@ -4413,6 +4414,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: 1030;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
@ -4424,7 +4426,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;
z-index: 1030;
border-width: 0 0 1px; border-width: 0 0 1px;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
examples/theme/index.html
View File

@ -159,6 +159,18 @@
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> <li><a href="#contact">Contact</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
@ -179,6 +191,18 @@
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li> <li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li> <li><a href="#contact">Contact</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="dropdown-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>

4
less/navbar.less
View File

@ -19,6 +19,7 @@
.clearfix(); .clearfix();
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
z-index: auto;
border-radius: @navbar-border-radius; border-radius: @navbar-border-radius;
} }
} }
@ -128,6 +129,7 @@
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: @zindex-navbar-fixed;
// Undo the rounded corners // Undo the rounded corners
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
@ -135,7 +137,6 @@
} }
} }
.navbar-fixed-top { .navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0; top: 0;
border-width: 0 0 1px; border-width: 0 0 1px;
} }
@ -153,6 +154,7 @@
padding: @navbar-padding-vertical @navbar-padding-horizontal; padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
line-height: @line-height-computed; line-height: @line-height-computed;
&:hover, &:hover,
&:focus { &:focus {
text-decoration: none; text-decoration: none;