aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-20 21:16:37 -0700
committerMark Otto <[email protected]>2013-10-20 21:16:37 -0700
commit98378d2d88fc92f6c0f3a1db2a861409074c010a (patch)
treee5998e84934fd7144516b4132772b8cea2dba47b /dist/css/bootstrap.css
parent5aa4c5cb0c1b8bed3a4bb6b6a867f48b4a59f2fb (diff)
parent76baacf2c94bec03273639ef0ed966dad87cf37a (diff)
downloadbootstrap-98378d2d88fc92f6c0f3a1db2a861409074c010a.tar.xz
bootstrap-98378d2d88fc92f6c0f3a1db2a861409074c010a.zip
Merge pull request #11188 from twbs/navbar_zindex_auto
Fixes #10433: Navbar z-index refactor
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 71768f9a9..b92a87a54 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4266,7 +4266,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar {
position: relative;
- z-index: 1000;
min-height: 50px;
margin-bottom: 20px;
border: 1px solid transparent;
@@ -4399,6 +4398,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.navbar-static-top {
+ z-index: 1000;
border-width: 0 0 1px;
}
@@ -4413,6 +4413,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed;
right: 0;
left: 0;
+ z-index: 1030;
}
@media (min-width: 768px) {
@@ -4424,7 +4425,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top {
top: 0;
- z-index: 1030;
border-width: 0 0 1px;
}