aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-16 16:20:29 -0800
committerMark Otto <[email protected]>2013-01-16 16:20:29 -0800
commit6b193dc22d544d55100c6c0eb237a30b8eaf184b (patch)
treebace945aa66a34ce9ce2705dfb65e82b95318dc1 /less
parent9ba14cfb7c0daa75453fd226d09198ffec142b1b (diff)
downloadbootstrap-6b193dc22d544d55100c6c0eb237a30b8eaf184b.tar.xz
bootstrap-6b193dc22d544d55100c6c0eb237a30b8eaf184b.zip
More navbar tweaks, including making fixed navbars work in the docs by adding padding to body
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less12
1 files changed, 7 insertions, 5 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 4353e2a94..7e4b56935 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -16,7 +16,7 @@
.navbar .brand {
display: inline-block;
- padding: ((@navbar-height - @line-height-base) / 2) 15px;
+ padding: 7px 15px;
font-size: 18px;
font-weight: bold;
line-height: @line-height-base;
@@ -58,9 +58,6 @@
.nav {
margin-top: 15px; // space out from .navbar .brand and .btn-navbar
}
- .nav > li {
- float: left;
- }
.nav > li > a {
padding-top: (@navbar-height - @line-height-base) / 2;
padding-bottom: (@navbar-height - @line-height-base) / 2;
@@ -79,7 +76,7 @@
background-color: @navbar-link-bg-active;
}
}
-@media screen and (min-width: 992px) {
+@media screen and (min-width: 768px) {
.navbar {
padding-top: 0;
@@ -87,12 +84,17 @@
}
.navbar .brand {
float: left;
+ padding-top: (@navbar-height - @line-height-base) / 2;
+ padding-bottom: (@navbar-height - @line-height-base) / 2;
margin-left: -15px;
}
.navbar .nav {
.clear_float();
margin-top: 0; // undo top margin to make nav extend full height of navbar
}
+ .navbar .nav > li {
+ float: left;
+ }
// Required to make the collapsing navbar work on regular desktops
.navbar .btn-navbar {