From: Mark Otto <otto@github.com>
Date: Mon, 12 Aug 2013 01:32:52 +0000 (-0700)
Subject: addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar... 
X-Git-Tag: v3.0.0-rc.2~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2cfd3153bd181ebd05b347d04b3fff08fa1d890;p=thirdparty%2Fbootstrap.git

addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable
---

diff --git a/less/navbar.less b/less/navbar.less
index 60f5fd4f71..e474f35bd6 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,7 +6,7 @@
 .navbar {
   position: relative;
   min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
-  margin-bottom: 20px;
+  margin-bottom: @navbar-margin-bottom;
   padding-left: @navbar-padding-horizontal;
   padding-right: @navbar-padding-horizontal;
   background-color: @navbar-bg;
diff --git a/less/variables.less b/less/variables.less
index 89e01700eb..bf180aff63 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -232,6 +232,7 @@
 @navbar-height:                    50px;
 @navbar-color:                     #777;
 @navbar-bg:                        #eee;
+@navbar-margin-bottom:             @line-height-computed;
 @navbar-border-radius:             @border-radius-base;
 @navbar-padding-horizontal:        floor(@grid-gutter-width / 2);
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);