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

---
 dist/css/bootstrap.css | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index bc7894a7a..34d92672b 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2869,6 +2869,30 @@ button.close {
   margin-bottom: 0;
 }
 
+.nav-collapse {
+  padding-bottom: 15px;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+  display: table;
+  content: " ";
+}
+
+.nav-collapse:after {
+  clear: both;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+  display: table;
+  content: " ";
+}
+
+.nav-collapse:after {
+  clear: both;
+}
+
 @media (max-width: 768px) {
   .nav-collapse-scrollable {
     max-height: 360px;
@@ -3103,6 +3127,7 @@ button.close {
   .nav-collapse.collapse {
     display: block !important;
     height: auto !important;
+    padding-bottom: 0;
     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

---
 dist/css/bootstrap.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 34d92672b..b3954d47d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2811,7 +2811,6 @@ button.close {
 }
 
 .navbar-nav {
-  margin-top: 10px;
   margin-bottom: 15px;
 }
 
@@ -2893,6 +2892,11 @@ button.close {
   clear: both;
 }
 
+.navbar-toggle + .nav-collapse {
+  width: 100%;
+  margin-top: 50px;
+}
+
 @media (max-width: 768px) {
   .nav-collapse-scrollable {
     max-height: 360px;
-- 
cgit v1.2.3