Skip to content

B
bootstrap
Commit c13772d5 authored by Mark Otto's avatar Mark Otto
Browse files
Options

switch to margin on navbar-nav to avoid stacking negative space reported in #9705

parent 4d369921
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 13 deletions
dist/css/bootstrap.css
View file @ c13772d5
...@@ -3355,10 +3355,7 @@ button.close { ...@@ -3355,10 +3355,7 @@ button.close {
} }
.navbar-nav { .navbar-nav {
padding-top: 7.5px; margin: 7.5px -15px;
padding-bottom: 7.5px;
margin-right: -15px;
margin-left: -15px;
} }
.navbar-nav > li > a { .navbar-nav > li > a {
...@@ -3429,8 +3426,6 @@ button.close { ...@@ -3429,8 +3426,6 @@ 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 {
......
dist/css/bootstrap.min.css
View file @ c13772d5
This source diff could not be displayed because it is too large. You can view the blob instead.
less/navbar.less
View file @ c13772d5
...@@ -187,10 +187,7 @@ ...@@ -187,10 +187,7 @@
// 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); margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
padding-bottom: (@navbar-padding-vertical / 2);
margin-left: -@navbar-padding-horizontal;
margin-right: -@navbar-padding-horizontal;
> li > a { > li > a {
padding-top: 10px; padding-top: 10px;
...@@ -267,8 +264,6 @@ ...@@ -267,8 +264,6 @@
@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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment