root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav

This commit is contained in:
Mark Otto 2013-08-15 00:07:23 -07:00
parent 7f4e05fcce
commit 1b6a5bbca2
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/bootstrap.css vendored
View File

@ -3155,7 +3155,8 @@ button.close {
.navbar-collapse { .navbar-collapse {
max-height: 340px; max-height: 340px;
padding: 5px 15px; padding-right: 15px;
padding-left: 15px;
overflow-x: visible; overflow-x: visible;
overflow-y: auto; overflow-y: auto;
border-top: 1px solid #e6e6e6; border-top: 1px solid #e6e6e6;
@ -3186,7 +3187,8 @@ button.close {
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-collapse { .navbar-collapse {
width: auto; width: auto;
padding: 0; padding-right: 0;
padding-left: 0;
border-top: 0; border-top: 0;
box-shadow: none; box-shadow: none;
} }
@ -3284,6 +3286,8 @@ button.close {
} }
.navbar-nav { .navbar-nav {
padding-top: 7.5px;
padding-bottom: 7.5px;
margin-right: -15px; margin-right: -15px;
margin-left: -15px; margin-left: -15px;
} }
@ -3356,6 +3360,8 @@ button.close {
@media (min-width: 768px) { @media (min-width: 768px) {
.navbar-nav { .navbar-nav {
float: left; float: left;
padding-top: 0;
padding-bottom: 0;
margin: 0; margin: 0;
} }
.navbar-nav > li { .navbar-nav > li {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
less/navbar.less
View File

@ -51,7 +51,8 @@
// content for the user's viewport. // content for the user's viewport.
.navbar-collapse { .navbar-collapse {
padding: 5px @navbar-padding-horizontal; padding-right: @navbar-padding-horizontal;
padding-left: @navbar-padding-horizontal;
border-top: 1px solid darken(@navbar-bg, 7%); border-top: 1px solid darken(@navbar-bg, 7%);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
// Clear floated elements and prevent collapsing of padding // Clear floated elements and prevent collapsing of padding
@ -66,7 +67,8 @@
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
width: auto; width: auto;
padding: 0; padding-right: 0;
padding-left: 0;
border-top: 0; border-top: 0;
box-shadow: none; box-shadow: none;
@ -181,6 +183,8 @@
// the nav the full height of the horizontal nav (above 768px). // the nav the full height of the horizontal nav (above 768px).
.navbar-nav { .navbar-nav {
padding-top: (@navbar-padding-vertical / 2);
padding-bottom: (@navbar-padding-vertical / 2);
margin-left: -@navbar-padding-horizontal; margin-left: -@navbar-padding-horizontal;
margin-right: -@navbar-padding-horizontal; margin-right: -@navbar-padding-horizontal;
@ -259,6 +263,8 @@
@media (min-width: @grid-float-breakpoint) { @media (min-width: @grid-float-breakpoint) {
float: left; float: left;
margin: 0; margin: 0;
padding-top: 0;
padding-bottom: 0;
> li { > li {
float: left; float: left;