From e486bb4f39e79dd55b3c68af134a4624b2fa4c08 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 20 Oct 2013 20:30:16 -0700
Subject: Fixes #10433: Navbar z-index refactor

* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
---
 examples/theme/index.html | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'examples')

diff --git a/examples/theme/index.html b/examples/theme/index.html
index a0bad8793..bfa8efdcb 100644
--- a/examples/theme/index.html
+++ b/examples/theme/index.html
@@ -159,6 +159,18 @@
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>
               <li><a href="#contact">Contact</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Action</a></li>
+                  <li><a href="#">Another action</a></li>
+                  <li><a href="#">Something else here</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">Nav header</li>
+                  <li><a href="#">Separated link</a></li>
+                  <li><a href="#">One more separated link</a></li>
+                </ul>
+              </li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
@@ -179,6 +191,18 @@
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>
               <li><a href="#contact">Contact</a></li>
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  <li><a href="#">Action</a></li>
+                  <li><a href="#">Another action</a></li>
+                  <li><a href="#">Something else here</a></li>
+                  <li class="divider"></li>
+                  <li class="dropdown-header">Nav header</li>
+                  <li><a href="#">Separated link</a></li>
+                  <li><a href="#">One more separated link</a></li>
+                </ul>
+              </li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>
-- 
cgit v1.2.3


From c71f89518f88d05e4a2f202264498ac85242fcbd Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 20 Oct 2013 21:11:51 -0700
Subject: Fix up padding on default navbar example

---
 examples/navbar/navbar.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/examples/navbar/navbar.css b/examples/navbar/navbar.css
index f593a6bfc..d2195240b 100644
--- a/examples/navbar/navbar.css
+++ b/examples/navbar/navbar.css
@@ -1,7 +1,8 @@
 body {
-padding: 30px;
+  padding-top: 20px;
+  padding-bottom: 20px;
 }
 
 .navbar {
-margin-bottom: 30px;
-}
\ No newline at end of file
+  margin-bottom: 20px;
+}
-- 
cgit v1.2.3