Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #10433: Navbar z-index refactor #11188

Merged
merged 3 commits into from
Oct 21, 2013
Merged

Fixes #10433: Navbar z-index refactor #11188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e486bb4
Fixes #10433: Navbar z-index refactor
mdo Oct 21, 2013
c71f895
Fix up padding on default navbar example
mdo Oct 21, 2013
76baacf
Remove default z-index on navbar and only set on static and fixed var…
mdo Oct 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fixes #10433: Navbar z-index refactor 
* 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)
  • Loading branch information
@mdo
mdo committed Oct 21, 2013
commit e486bb4f39e79dd55b3c68af134a4624b2fa4c08
3 changes: 2 additions & 1 deletion dist/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4294,6 +4294,7 @@ textarea.input-group-sm > .input-group-btn > .btn {

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

@media (min-width: 768px) {
Expand All @@ -4424,7 +4426,6 @@ textarea.input-group-sm > .input-group-btn > .btn {

.navbar-fixed-top {
top: 0;
z-index: 1030;
border-width: 0 0 1px;
}

Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions examples/theme/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ <h1>Navbars</h1>
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</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>
</div><!--/.nav-collapse -->
</div>
Expand All @@ -179,6 +191,18 @@ <h1>Navbars</h1>
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</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>
</div><!--/.nav-collapse -->
</div>
Expand Down
4 changes: 3 additions & 1 deletion less/navbar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
.clearfix();

@media (min-width: @grid-float-breakpoint) {
z-index: auto;
border-radius: @navbar-border-radius;
}
}
Expand Down Expand Up @@ -128,14 +129,14 @@
position: fixed;
right: 0;
left: 0;
z-index: @zindex-navbar-fixed;

// Undo the rounded corners
@media (min-width: @grid-float-breakpoint) {
border-radius: 0;
}
}
.navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0;
border-width: 0 0 1px;
}
Expand All @@ -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;
Expand Down