remove subnav file, instead add an optional class for .navbar

1 files changed, 29 insertions, 103 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8bb7b5d92..e760daae8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4172,122 +4172,48 @@ input[type="submit"].btn.btn-mini {
   left: auto;
 }
 
-/* Subnav
+/* Subnav navbar
 -------------------------------------------------- */
 
-/* Base
-------------------------- */
-
-.subnav {
-  width: 100%;
+.navbar-subnav {
   height: 36px;
-  background-color: #f2f2f2;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
-  background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#eeeeee));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
-  background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
-  background-image: linear-gradient(top, #f5f5f5, #eeeeee);
-  background-repeat: repeat-x;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffeeeeee', GradientType=0);
-}
-
-/* Nav links
-------------------------- */
-
-.subnav .nav {
-  margin-bottom: 0;
-}
-
-.subnav .nav > li {
-  float: left;
-}
-
-.subnav .nav > li > a {
-  padding: 9px 12px;
-  line-height: 18px;
-  border-right: 1px solid #e5e5e5;
-  border-left: 1px solid #f5f5f5;
-}
-
-.subnav .nav > .active > a,
-.subnav .nav > .active > a:hover {
-  padding-left: 13px;
-  color: #777;
-  background-color: #e9e9e9;
-  border-left: 0;
-  border-right-color: #ddd;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.05);
-}
-
-.subnav .nav > li:first-child > a,
-.subnav .nav > li:first-child > a:hover {
-  padding-left: 12px;
-  border-left: 0;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
 }
 
-.subnav .nav > li:last-child > a {
-  border-right: 0;
+.navbar-subnav .navbar-inner {
+  min-height: 36px;
+  padding: 0;
+  background-color: #f5f5f5;
+  background-image: -moz-linear-gradient(top, #f9f9f9, #eeeeee);
+  background-image: -ms-linear-gradient(top, #f9f9f9, #eeeeee);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#eeeeee));
+  background-image: -webkit-linear-gradient(top, #f9f9f9, #eeeeee);
+  background-image: -o-linear-gradient(top, #f9f9f9, #eeeeee);
+  background-image: linear-gradient(top, #f9f9f9, #eeeeee);
+  background-repeat: repeat-x;
+  border: 1px solid #e5e5e5;
+  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff9f9f9', endColorstr='#ffeeeeee', GradientType=0);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
 }
 
-/* Reposition the dropdown carets */
-
-.subnav .nav .dropdown-toggle .caret {
-  margin-top: 7px;
+.navbar-subnav .nav > li > a {
+  color: #0088cc;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #777;
-  border-bottom-color: #777;
+.navbar-subnav .nav > li > a:hover {
+  color: #005580;
 }
 
-/* Dropdown menus get matching border-radius */
-
-.subnav .dropdown-menu {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
+.navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
+.navbar-subnav .nav li.dropdown.open .caret {
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
 }
 
-/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
-
-@media (min-width: 980px) {
-  .subnav-fixed {
-    position: fixed;
-    top: 40px;
-    right: 0;
-    left: 0;
-    z-index: 1020;
-    border-color: #d5d5d5;
-    border-width: 0 0 1px;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-    -webkit-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
-       -moz-box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
-            box-shadow: inset 0 1px 0 #ffffff, 0 1px 5px rgba(0, 0, 0, 0.1);
-  }
-  .subnav-fixed .nav {
-    max-width: 780px;
-    padding: 0 1px;
-    margin: 0 auto;
-  }
-  .subnav .nav > li:first-child > a,
-  .subnav .nav > li:first-child > a:hover {
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-  }
+.navbar-subnav .nav .open > a {
+  color: #005580;
 }
 
 .breadcrumb {