From: Mark Otto <otto@github.com>
Date: Thu, 18 Jul 2013 08:04:54 +0000 (-0700)
Subject: Fixes #8397: better navbar padding with grid gutter stuff
X-Git-Tag: v3.0.0-rc1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=181b27677492050adceaa52fe972115515759f07;p=thirdparty%2Fbootstrap.git

Fixes #8397: better navbar padding with grid gutter stuff
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8c895e9959..3c74388b69 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2848,7 +2848,7 @@ button.close {
 .navbar-brand {
   display: block;
   max-width: 200px;
-  padding: 15px;
+  padding: 15px 15px;
   margin-right: auto;
   margin-left: auto;
   font-size: 18px;
diff --git a/less/navbar.less b/less/navbar.less
index 7a6e80488f..1818490577 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,8 +6,8 @@
 .navbar {
   position: relative;
   margin-bottom: 20px;
-  padding-left: @navbar-padding;
-  padding-right: @navbar-padding;
+  padding-left: @navbar-padding-horizontal;
+  padding-right: @navbar-padding-horizontal;
   background-color: @navbar-bg;
   border-radius: @border-radius-base;
 
@@ -100,7 +100,7 @@
   max-width: 200px;
   margin-left: auto;
   margin-right: auto;
-  padding: @navbar-padding;
+  padding: @navbar-padding-vertical @navbar-padding-horizontal;
   font-size: @font-size-large;
   font-weight: 500;
   line-height: @line-height-computed;
@@ -298,7 +298,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -(@navbar-padding);
+    margin-left: -(@navbar-padding-horizontal);
     margin-right: 5px;
   }
   .navbar-nav {
diff --git a/less/variables.less b/less/variables.less
index daeccb4b79..b28d33091f 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -176,7 +176,8 @@
 @navbar-height:                    50px;
 @navbar-color:                     #777;
 @navbar-bg:                        #eee;
-@navbar-padding:                   floor(@grid-gutter-width / 2);  // ~15px
+@navbar-padding-horizontal:        floor(@grid-gutter-width / 2);  // ~15px
+@navbar-padding-vertical:          15px;
 
 // Navbar links
 @navbar-link-color:                #777;