From 9de788134fa40e37577a324c0d37377dc0369ec9 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 14 Aug 2013 21:32:23 -0700
Subject: refactor navbar file to better nest css and restore navbar-color to
 navbar text (fixes #9500)

---
 dist/css/bootstrap.css | 100 ++++++++++++++++++++++++-------------------------
 1 file changed, 48 insertions(+), 52 deletions(-)

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

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index fb34f1e95..d3aa21703 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3196,6 +3196,12 @@ button.close {
     border-top: 0;
     box-shadow: none;
   }
+  .navbar-collapse.collapse {
+    display: block !important;
+    height: auto !important;
+    padding-bottom: 0;
+    overflow: visible !important;
+  }
 }
 
 @media (min-width: 768px) {
@@ -3275,18 +3281,20 @@ button.close {
   margin-top: 4px;
 }
 
+@media (min-width: 768px) {
+  .navbar-toggle {
+    position: relative;
+    top: auto;
+    left: auto;
+    display: none;
+  }
+}
+
 .navbar-nav {
   margin-right: -15px;
   margin-left: -15px;
 }
 
-@media (min-width: 768px) {
-  .navbar-nav {
-    margin-right: 0;
-    margin-left: 0;
-  }
-}
-
 .navbar-nav > li > a {
   padding-top: 10px;
   padding-bottom: 10px;
@@ -3352,6 +3360,20 @@ button.close {
   }
 }
 
+@media (min-width: 768px) {
+  .navbar-nav {
+    float: left;
+    margin: 0;
+  }
+  .navbar-nav > li {
+    float: left;
+  }
+  .navbar-nav > li > a {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+}
+
 @media (min-width: 768px) {
   .navbar-left {
     float: left !important;
@@ -3457,6 +3479,25 @@ button.close {
   left: auto;
 }
 
+.navbar-btn {
+  margin-top: 8px;
+}
+
+.navbar-text {
+  float: left;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover {
+  color: #333333;
+}
+
 .navbar-inverse {
   background-color: #222222;
   border-color: #080808;
@@ -3567,51 +3608,6 @@ button.close {
   }
 }
 
-@media screen and (min-width: 768px) {
-  .navbar-nav {
-    float: left;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-  .navbar-nav > li {
-    float: left;
-  }
-  .navbar-nav > li > a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-  .navbar-toggle {
-    position: relative;
-    top: auto;
-    left: auto;
-    display: none;
-  }
-  .navbar-collapse.collapse {
-    display: block !important;
-    height: auto !important;
-    padding-bottom: 0;
-    overflow: visible !important;
-  }
-}
-
-.navbar-btn {
-  margin-top: 8px;
-}
-
-.navbar-text {
-  float: left;
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-
-.navbar-link {
-  color: #777777;
-}
-
-.navbar-link:hover {
-  color: #333333;
-}
-
 .navbar-inverse .navbar-link {
   color: #999999;
 }
-- 
cgit v1.2.3