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)
---
 dist/css/bootstrap.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 71768f9a9..25e99925e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4294,6 +4294,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 
 @media (min-width: 768px) {
   .navbar {
+    z-index: auto;
     border-radius: 4px;
   }
 }
@@ -4413,6 +4414,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: fixed;
   right: 0;
   left: 0;
+  z-index: 1030;
 }
 
 @media (min-width: 768px) {
@@ -4424,7 +4426,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
 
 .navbar-fixed-top {
   top: 0;
-  z-index: 1030;
   border-width: 0 0 1px;
 }
 
-- 
cgit v1.2.3


From 76baacf2c94bec03273639ef0ed966dad87cf37a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 20 Oct 2013 21:12:09 -0700
Subject: Remove default z-index on navbar and only set on static and fixed
 variants

---
 dist/css/bootstrap.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 25e99925e..b92a87a54 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4266,7 +4266,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
 
 .navbar {
   position: relative;
-  z-index: 1000;
   min-height: 50px;
   margin-bottom: 20px;
   border: 1px solid transparent;
@@ -4294,7 +4293,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
 
 @media (min-width: 768px) {
   .navbar {
-    z-index: auto;
     border-radius: 4px;
   }
 }
@@ -4400,6 +4398,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 
 .navbar-static-top {
+  z-index: 1000;
   border-width: 0 0 1px;
 }
 
-- 
cgit v1.2.3