mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-27 07:14:36 +02:00
Rework navbar padding and margins for right aligned last-child elements
This slight reworking of the navbar spacing was brought about by a problem noted in #11530: use of `.navbar-form.navbar-right` leaves an extra 15px of space on the right. Here’s what’s new: * Removed the `padding` on `.navbar-collapse` within static top, fixed top, and fixed bottom navbars. Meaning, it’s still there for the default navbar. This was the root cause of the extra 15px padding for navbar forms. * As part of this, I also replaced the existing negative margin overrides for last-child elements with more contextual ones within their sub-components. Overall not too different, but should be more effective now and easier to work with now. For example of new changes, see http://jsbin.com/odeSiSo/1/.
This commit is contained in:
22
dist/css/bootstrap.css
vendored
22
dist/css/bootstrap.css
vendored
@@ -4426,14 +4426,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
.navbar-collapse.in {
|
||||
overflow-y: auto;
|
||||
}
|
||||
.navbar-collapse .navbar-nav.navbar-left:first-child {
|
||||
margin-left: -15px;
|
||||
}
|
||||
.navbar-collapse .navbar-nav.navbar-right:last-child {
|
||||
margin-right: -15px;
|
||||
}
|
||||
.navbar-collapse .navbar-text:last-child {
|
||||
margin-right: 0;
|
||||
.navbar-fixed-top .navbar-collapse,
|
||||
.navbar-static-top .navbar-collapse,
|
||||
.navbar-fixed-bottom .navbar-collapse {
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4581,6 +4578,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
}
|
||||
.navbar-nav.navbar-right:last-child {
|
||||
margin-right: -15px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
@@ -4647,6 +4647,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.navbar-form.navbar-right:last-child {
|
||||
margin-right: -15px;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-nav > li > .dropdown-menu {
|
||||
@@ -4692,6 +4695,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
margin-right: 15px;
|
||||
margin-left: 15px;
|
||||
}
|
||||
.navbar-text.navbar-right:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.navbar-default {
|
||||
|
Reference in New Issue
Block a user