From 223e0321504050d4642c3db2673be0cc7f4df569 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 16:39:18 -0700
Subject: Fix #9174: pad bottom of navbar collapsed content and clear floated
 contents

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

(limited to 'less')

diff --git a/less/navbar.less b/less/navbar.less
index 2efc3545b..805800cf6 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -82,14 +82,18 @@
 }
 .navbar-fixed-top {
   top: 0;
-  .nav-collapse {
-  }
 }
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0; // override .navbar defaults
 }
 
+.nav-collapse {
+  // Space out collapsed contents within the mobile navbar
+  padding-bottom: @navbar-padding-vertical;
+  // Clear floated elements and prevent collapsing of padding
+  .clearfix();
+}
 
 // Scrollable navbar navigation
 //
@@ -353,6 +357,7 @@
   .nav-collapse.collapse {
     display: block !important;
     height: auto !important;
+    padding-bottom: 0; // Override default setting
     overflow: visible !important;
   }
 
-- 
cgit v1.2.3


From c3ac95333d3c8746e8877ff02cafc41c4a692414 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 17:28:02 -0700
Subject: Fixes #8749: prevent navbar nav from overlapping navbar toggle

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

(limited to 'less')

diff --git a/less/navbar.less b/less/navbar.less
index 805800cf6..c2872e64a 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -20,8 +20,6 @@
 // -------------------------
 
 .navbar-nav {
-  // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
-  margin-top: 10px;
   margin-bottom: 15px;
 
   > li > a {
@@ -93,8 +91,16 @@
   padding-bottom: @navbar-padding-vertical;
   // Clear floated elements and prevent collapsing of padding
   .clearfix();
+
+  // When there is no `.navbar-brand` present (which normally sits between the
+  // navbar brand and toggle), prevent the nav from overlapping the toggle.
+  .navbar-toggle + & {
+    width: 100%;
+    margin-top: @navbar-height;
+  }
 }
 
+
 // Scrollable navbar navigation
 //
 // Sometimes you might have too many links in your fixed navbar and you need to
-- 
cgit v1.2.3