diff options
| author | Mark Otto <[email protected]> | 2013-08-13 15:19:59 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-13 15:19:59 -0700 |
| commit | fa330f308aace22886fee3dbacbcbd4f8adb0fe6 (patch) | |
| tree | 1fc9ae613e1077d48e98a841e5bcf95e805ef0fc /dist/css/bootstrap.css | |
| parent | 8d2948c0d6d5b9f753e917aa36fe43549e696e97 (diff) | |
| download | bootstrap-fa330f308aace22886fee3dbacbcbd4f8adb0fe6.tar.xz bootstrap-fa330f308aace22886fee3dbacbcbd4f8adb0fe6.zip | |
Overhaul navbar alignment (.pull-) utilities (fixes #9440)
Now navbars have their own float utility classes, mixin-ed versions of
`.pull-left` and `.pull-right`.
* Removed chained `.navbar-nav.pull-right`
* Added `.navbar-left` and `.navbar-right` as mixins of the default
float utilities, but only above the `@grid-float-breakpoint` to match
the new navbar behavior
* Updated components docs to match the new changeas
* Added callout about component alignment here to explain the new
classes
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4b32229bc..4a2806e45 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3309,10 +3309,6 @@ button.close { background-color: transparent; } -.navbar-nav.pull-right { - width: 100%; -} - @media (max-width: 767px) { .navbar-nav .open .dropdown-menu { position: static; @@ -3351,11 +3347,21 @@ button.close { } } +@media (min-width: 768px) { + .navbar-left { + float: left !important; + } + .navbar-right { + float: right !important; + } +} + .navbar-form { - width: 100%; padding: 10px 15px; margin-top: 8px; + margin-right: -15px; margin-bottom: 8px; + margin-left: -15px; border-top: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; } @@ -3394,6 +3400,8 @@ button.close { width: auto; padding-top: 0; padding-bottom: 0; + margin-right: 0; + margin-left: 0; border: 0; } } @@ -3525,6 +3533,9 @@ button.close { } @media (max-width: 767px) { + .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { + border-color: #080808; + } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { color: #999999; } @@ -3560,9 +3571,6 @@ button.close { padding-top: 15px; padding-bottom: 15px; } - .navbar-nav.pull-right { - width: auto; - } .navbar-toggle { position: relative; top: auto; |
