aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-11 19:19:44 -0700
committerMark Otto <[email protected]>2013-08-11 19:19:44 -0700
commit85ec6e741d278623e079528959360b2dbded4794 (patch)
tree05674d53db24d30026e040b528bd52f38c6d196c /less
parentba8026e00f85f76e88a4005162612a7568a0a405 (diff)
downloadbootstrap-85ec6e741d278623e079528959360b2dbded4794.tar.xz
bootstrap-85ec6e741d278623e079528959360b2dbded4794.zip
Follow up commit: fix collapse clearing and navbar brand/nav spacing
Diffstat (limited to 'less')
-rw-r--r--less/navbar.less6
1 files changed, 6 insertions, 0 deletions
diff --git a/less/navbar.less b/less/navbar.less
index 0f4d5cd73..1549220c9 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -128,6 +128,7 @@
// Brand/project name
.navbar-brand {
float: left;
+ margin-right: 15px;
padding-top: @navbar-padding-vertical;
padding-bottom: @navbar-padding-vertical;
font-size: @font-size-large;
@@ -322,6 +323,11 @@
@media screen and (min-width: @grid-float-breakpoint) {
+ // Undo clearing to keep nav and brand horizontal
+ .nav-collapse {
+ clear: none;
+ }
+
.navbar-nav {
float: left;
// undo margin to make nav extend full height of navbar