Commit 360f0c53 authored by Mark Otto's avatar Mark Otto

Fix floats in navbar

parent 01b32f47
...@@ -3046,6 +3046,7 @@ button.close { ...@@ -3046,6 +3046,7 @@ button.close {
margin-left: -15px; margin-left: -15px;
} }
.navbar .nav { .navbar .nav {
float: left;
margin-top: 0; margin-top: 0;
} }
.navbar .nav:before, .navbar .nav:before,
...@@ -3056,6 +3057,9 @@ button.close { ...@@ -3056,6 +3057,9 @@ button.close {
.navbar .nav:after { .navbar .nav:after {
clear: both; clear: both;
} }
.navbar .nav.pull-right {
float: right;
}
.navbar .nav > li { .navbar .nav > li {
float: left; float: left;
} }
...@@ -3063,7 +3067,6 @@ button.close { ...@@ -3063,7 +3067,6 @@ button.close {
display: none; display: none;
} }
.nav-collapse.collapse { .nav-collapse.collapse {
float: left;
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
......
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
background-color: @navbar-link-bg-active; background-color: @navbar-link-bg-active;
} }
} }
@media screen and (min-width: 768px) {
@media screen and (min-width: 768px) {
.navbar { .navbar {
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
...@@ -89,8 +89,13 @@ ...@@ -89,8 +89,13 @@
margin-left: -15px; margin-left: -15px;
} }
.navbar .nav { .navbar .nav {
.clear_float(); float: left;
margin-top: 0; // undo top margin to make nav extend full height of navbar margin-top: 0; // undo top margin to make nav extend full height of navbar
.clear_float();
&.pull-right {
float: right;
}
} }
.navbar .nav > li { .navbar .nav > li {
float: left; float: left;
...@@ -101,11 +106,9 @@ ...@@ -101,11 +106,9 @@
display: none; display: none;
} }
.nav-collapse.collapse { .nav-collapse.collapse {
float: left;
height: auto !important; height: auto !important;
overflow: visible !important; overflow: visible !important;
} }
} }
// Inverse navbar // Inverse navbar
......
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