mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-28 15:50:01 +02:00
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
This commit is contained in:
24
dist/css/bootstrap.css
vendored
24
dist/css/bootstrap.css
vendored
@@ -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;
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user