diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:43:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:43:03 -0700 |
| commit | 6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b (patch) | |
| tree | 5b3377b4b90ed6cabdcecc9e1915c792b9d97e7e /dist/css/bootstrap.css | |
| parent | d8fab5aa6e828567feaa4cb3a171255e29f42165 (diff) | |
| parent | 98378d2d88fc92f6c0f3a1db2a861409074c010a (diff) | |
| download | bootstrap-6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b.tar.xz bootstrap-6ecb5d6cf372ab4f7391503e0fb2e754a57d8d3b.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 4 |
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; } |