From 2ba3b47dc697bdcb69b2100d664c51d69c453010 Mon Sep 17 00:00:00 2001
From: Aristeides Stathopoulos <aristath@gmail.com>
Date: Sat, 22 Jun 2013 14:34:17 +0300
Subject: [PATCH 1/4] Update navbar.less

navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
---
 less/navbar.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/less/navbar.less b/less/navbar.less
index 6246bd62c8..b744f5f707 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,8 +6,8 @@
 .navbar {
   position: relative;
   margin-bottom: 20px;
-  padding-left: 15px;
-  padding-right: 15px;
+  padding-left: floor(@grid-gutter-width / 2);  // ~15px
+  padding-right: floor(@grid-gutter-width / 2); // ~15px
   background-color: @navbar-bg;
   border-radius: @border-radius-base;
 
@@ -284,7 +284,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -15px;
+    margin-left: -5px;
     margin-right: 5px;
   }
   .navbar-nav {

From b51e1e0d8c632d391058f5094295d9c4124c3f28 Mon Sep 17 00:00:00 2001
From: Aristeides Stathopoulos <aristath@gmail.com>
Date: Sat, 22 Jun 2013 14:41:31 +0300
Subject: [PATCH 2/4] Update navbar.less

---
 less/navbar.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/less/navbar.less b/less/navbar.less
index b744f5f707..444281289c 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -96,7 +96,7 @@
   max-width: 200px;
   margin-left: auto;
   margin-right: auto;
-  padding: 15px;
+  padding: floor(@grid-gutter-width / 2);  // ~15px
   font-size: @font-size-large;
   font-weight: 500;
   line-height: @line-height-computed;
@@ -284,7 +284,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -5px;
+    margin-left: -(floor(@grid-gutter-width / 2));  // ~15px
     margin-right: 5px;
   }
   .navbar-nav {

From aad76f21f6eefb3afc19c7cefeb97f00df058a9f Mon Sep 17 00:00:00 2001
From: Aristeides Stathopoulos <aristath@gmail.com>
Date: Sat, 22 Jun 2013 18:44:04 +0300
Subject: [PATCH 3/4] Update navbar.less

---
 less/navbar.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/less/navbar.less b/less/navbar.less
index 444281289c..b8283601d6 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -6,8 +6,8 @@
 .navbar {
   position: relative;
   margin-bottom: 20px;
-  padding-left: floor(@grid-gutter-width / 2);  // ~15px
-  padding-right: floor(@grid-gutter-width / 2); // ~15px
+  padding-left: @navbar-padding;
+  padding-right: @navbar-padding;
   background-color: @navbar-bg;
   border-radius: @border-radius-base;
 
@@ -96,7 +96,7 @@
   max-width: 200px;
   margin-left: auto;
   margin-right: auto;
-  padding: floor(@grid-gutter-width / 2);  // ~15px
+  padding: @navbar-padding;
   font-size: @font-size-large;
   font-weight: 500;
   line-height: @line-height-computed;
@@ -284,7 +284,7 @@
 
   .navbar-brand {
     float: left;
-    margin-left: -(floor(@grid-gutter-width / 2));  // ~15px
+    margin-left: -(@navbar-padding);
     margin-right: 5px;
   }
   .navbar-nav {

From 72183d9a452fa43ac8d994374713c7a585d1744c Mon Sep 17 00:00:00 2001
From: Aristeides Stathopoulos <aristath@gmail.com>
Date: Sat, 22 Jun 2013 18:45:25 +0300
Subject: [PATCH 4/4] Update variables.less

---
 less/variables.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/less/variables.less b/less/variables.less
index f918461264..4fd0d492cf 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -178,6 +178,7 @@
 @navbar-height:                    50px;
 @navbar-color:                     #777;
 @navbar-bg:                        #eee;
+@navbar-padding:                   floor(@grid-gutter-width / 2);  // ~15px
 
 // Navbar links
 @navbar-link-color:                #777;