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

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index ca0cb81d66c631e658598861dd80c5a6aae11859..ec23b0fe01d8cf19d264501fef36c927a82e9114 100644 (file)
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -1004,4 +1004,31 @@
     height: auto !important;
     overflow: visible !important;
   }
+  .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;
+  }
 }

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8bb7b5d92a30a3baca75857eb5a73c96d48fdf74..e760daae8dbf06a95ebaf25ed8f8989968d530d6 100644 (file)
--- 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 {

diff --git a/docs/base-css.html b/docs/base-css.html
index df2407f8b67963a7c51669d2f5df6380743f3aac..4136399340300a9a33fe2f7047e57282d488b320 100644 (file)
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,15 +80,17 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#typography">Typography</a></li>
-      <li><a href="#code">Code</a></li>
-      <li><a href="#tables">Tables</a></li>
-      <li><a href="#forms">Forms</a></li>
-      <li><a href="#buttons">Buttons</a></li>
-      <li><a href="#icons">Icons by Glyphicons</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#typography">Typography</a></li>
+        <li><a href="#code">Code</a></li>
+        <li><a href="#tables">Tables</a></li>
+        <li><a href="#forms">Forms</a></li>
+        <li><a href="#buttons">Buttons</a></li>
+        <li><a href="#icons">Icons by Glyphicons</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/components.html b/docs/components.html
index 413a867b117494616b8df3bc6f6b796dd8d33d0c..74dda4dc809f161ba17bf3b2ea34d2f5a9e4db9b 100644 (file)
--- a/docs/components.html
+++ b/docs/components.html
@@ -80,33 +80,35 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#dropdowns">Dropdowns</a></li>
-      <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="#buttonGroups">Button groups</a></li>
-          <li><a href="#buttonDropdowns">Button dropdowns</a></li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Nav <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="#navs">Nav, tabs, pills</a></li>
-          <li><a href="#navbar">Navbar</a></li>
-          <li><a href="#breadcrumbs">Breadcrumbs</a></li>
-          <li><a href="#pagination">Pagination</a></li>
-        </ul>
-      </li>
-      <li><a href="#labels">Labels</a></li>
-      <li><a href="#badges">Badges</a></li>
-      <li><a href="#typography">Typography</a></li>
-      <li><a href="#thumbnails">Thumbnails</a></li>
-      <li><a href="#alerts">Alerts</a></li>
-      <li><a href="#progress">Progress bars</a></li>
-      <li><a href="#misc">Misc</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#dropdowns">Dropdowns</a></li>
+        <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="#buttonGroups">Button groups</a></li>
+            <li><a href="#buttonDropdowns">Button dropdowns</a></li>
+          </ul>
+        </li>
+        <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">Nav <b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="#navs">Nav, tabs, pills</a></li>
+            <li><a href="#navbar">Navbar</a></li>
+            <li><a href="#breadcrumbs">Breadcrumbs</a></li>
+            <li><a href="#pagination">Pagination</a></li>
+          </ul>
+        </li>
+        <li><a href="#labels">Labels</a></li>
+        <li><a href="#badges">Badges</a></li>
+        <li><a href="#typography">Typography</a></li>
+        <li><a href="#thumbnails">Thumbnails</a></li>
+        <li><a href="#alerts">Alerts</a></li>
+        <li><a href="#progress">Progress bars</a></li>
+        <li><a href="#misc">Misc</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/download.html b/docs/download.html
index db76ef796aee287612292e631dcb1542c0f2c7f4..865e84143f7693a13fbefad0ef3eae55ed3e86e8 100644 (file)
--- a/docs/download.html
+++ b/docs/download.html
@@ -80,13 +80,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Customize and download</h1>
   <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#components">1. Choose components</a></li>
-      <li><a href="#plugins">2. Select jQuery plugins</a></li>
-      <li><a href="#variables">3. Customize variables</a></li>
-      <li><a href="#download">4. Download</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#components">1. Choose components</a></li>
+        <li><a href="#plugins">2. Select jQuery plugins</a></li>
+        <li><a href="#variables">3. Customize variables</a></li>
+        <li><a href="#download">4. Download</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/javascript.html b/docs/javascript.html
index 7ad28533a199b0fe655b3248ba28969f1e4e11db..8f07b58d81c185c35b21a5f8cd06aba938105b0a 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -80,21 +80,24 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Javascript for Bootstrap</h1>
   <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#transitions">Transitions</a></li>
-      <li><a href="#modals">Modal</a></li>
-      <li><a href="#dropdowns">Dropdown</a></li>
-      <li><a href="#scrollspy">Scrollspy</a></li>
-      <li><a href="#tabs">Tab</a></li>
-      <li><a href="#tooltips">Tooltip</a></li>
-      <li><a href="#popovers">Popover</a></li>
-      <li><a href="#alerts">Alert</a></li>
-      <li><a href="#buttons">Button</a></li>
-      <li><a href="#collapse">Collapse</a></li>
-      <li><a href="#carousel">Carousel</a></li>
-      <li><a href="#typeahead">Typeahead</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#transitions">Transitions</a></li>
+        <li><a href="#modals">Modal</a></li>
+        <li><a href="#dropdowns">Dropdown</a></li>
+        <li><a href="#scrollspy">Scrollspy</a></li>
+        <li><a href="#tabs">Tab</a></li>
+        <li><a href="#tooltips">Tooltip</a></li>
+        <li><a href="#popovers">Popover</a></li>
+        <li><a href="#alerts">Alert</a></li>
+        <li><a href="#buttons">Button</a></li>
+        <li><a href="#collapse">Collapse</a></li>
+        <li><a href="#carousel">Carousel</a></li>
+        <li><a href="#typeahead">Typeahead</a></li>
+        <li><a href="#affix">Affix</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 
@@ -1512,6 +1515,28 @@ $('.carousel').carousel({
 </section>
 
 
+
+<!-- Affix
+================================================== -->
+<section id="affix">
+  <div class="page-header">
+    <h1>
+      Affix
+      <small>Make an element stick in place</small>
+    </h1>
+  </div>
+
+  <h2>...</h2>
+  <p>...</p>
+  <div class="bs-docs-example">
+
+  </div>
+<pre class="prettyprint linenums">
+...
+</pre>
+</section>
+
+
      <!-- Footer
       ================================================== -->
       <footer class="footer">

diff --git a/docs/less.html b/docs/less.html
index c2d8963a07ba7a8b76c71c2ff494d93d28bcc298..559b4bbe1636bda8d2463b288a804dc2187ffcd9 100644 (file)
--- a/docs/less.html
+++ b/docs/less.html
@@ -80,13 +80,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Using LESS with Bootstrap</h1>
   <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#builtWith">Built with Less</a></li>
-      <li><a href="#variables">Variables</a></li>
-      <li><a href="#mixins">Mixins</a></li>
-      <li><a href="#compiling">Compiling Bootstrap</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#builtWith">Built with Less</a></li>
+        <li><a href="#variables">Variables</a></li>
+        <li><a href="#mixins">Mixins</a></li>
+        <li><a href="#compiling">Compiling Bootstrap</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index c957a90da834960fe6802344e082937aae30eb09..2cf9d5da13551dc5c6f27f421d89ea3b1ff564cb 100644 (file)
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -80,15 +80,17 @@
 <header class="jumbotron subhead" id="overview">
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#global">Global styles</a></li>
-      <li><a href="#gridSystem">Grid system</a></li>
-      <li><a href="#fluidGridSystem">Fluid grid system</a></li>
-      <li><a href="#gridCustomization">Customizing</a></li>
-      <li><a href="#layouts">Layouts</a></li>
-      <li><a href="#responsive">Responsive design</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#global">Global styles</a></li>
+        <li><a href="#gridSystem">Grid system</a></li>
+        <li><a href="#fluidGridSystem">Fluid grid system</a></li>
+        <li><a href="#gridCustomization">Customizing</a></li>
+        <li><a href="#layouts">Layouts</a></li>
+        <li><a href="#responsive">Responsive design</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 40bbbfba55bdab511fa3c8feff8ad63ab9c7ea71..0f0537ede1dddff2242b9c0fe0632314fe235902 100644 (file)
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -3,15 +3,17 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Base CSS{{/i}}</h1>
   <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
-      <li><a href="#code">{{_i}}Code{{/i}}</a></li>
-      <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
-      <li><a href="#forms">{{_i}}Forms{{/i}}</a></li>
-      <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li>
-      <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
+        <li><a href="#code">{{_i}}Code{{/i}}</a></li>
+        <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
+        <li><a href="#forms">{{_i}}Forms{{/i}}</a></li>
+        <li><a href="#buttons">{{_i}}Buttons{{/i}}</a></li>
+        <li><a href="#icons">{{_i}}Icons by Glyphicons{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 579fd08a68764d9841e3b49dbc2735d125bb11c8..4fc982e5bab3ebb1fb0134aa16174d2dfd69d372 100644 (file)
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -3,33 +3,35 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Components{{/i}}</h1>
   <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li>
-      <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
-          <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Nav{{/i}} <b class="caret"></b></a>
-        <ul class="dropdown-menu">
-          <li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
-          <li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li>
-          <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
-          <li><a href="#pagination">{{_i}}Pagination{{/i}}</a></li>
-        </ul>
-      </li>
-      <li><a href="#labels">{{_i}}Labels{{/i}}</a></li>
-      <li><a href="#badges">{{_i}}Badges{{/i}}</a></li>
-      <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
-      <li><a href="#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
-      <li><a href="#alerts">{{_i}}Alerts{{/i}}</a></li>
-      <li><a href="#progress">{{_i}}Progress bars{{/i}}</a></li>
-      <li><a href="#misc">{{_i}}Misc{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#dropdowns">{{_i}}Dropdowns{{/i}}</a></li>
+        <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="#buttonGroups">{{_i}}Button groups{{/i}}</a></li>
+            <li><a href="#buttonDropdowns">{{_i}}Button dropdowns{{/i}}</a></li>
+          </ul>
+        </li>
+        <li class="dropdown">
+          <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Nav{{/i}} <b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="#navs">{{_i}}Nav, tabs, pills{{/i}}</a></li>
+            <li><a href="#navbar">{{_i}}Navbar{{/i}}</a></li>
+            <li><a href="#breadcrumbs">{{_i}}Breadcrumbs{{/i}}</a></li>
+            <li><a href="#pagination">{{_i}}Pagination{{/i}}</a></li>
+          </ul>
+        </li>
+        <li><a href="#labels">{{_i}}Labels{{/i}}</a></li>
+        <li><a href="#badges">{{_i}}Badges{{/i}}</a></li>
+        <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
+        <li><a href="#thumbnails">{{_i}}Thumbnails{{/i}}</a></li>
+        <li><a href="#alerts">{{_i}}Alerts{{/i}}</a></li>
+        <li><a href="#progress">{{_i}}Progress bars{{/i}}</a></li>
+        <li><a href="#misc">{{_i}}Misc{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 3d5d70c1ca63f3bc0129b1cd3d95ec1efdc889d4..c839053634a1069b963c6126e143b66023ded936 100644 (file)
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -3,13 +3,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Customize and download{{/i}}</h1>
   <p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
-      <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
-      <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
-      <li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
+        <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
+        <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
+        <li><a href="#download">{{_i}}4. Download{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 52ed45a499671d99b5d90e1d6270dea88a44bdc9..cc1ecf1cbb638893d8c40514dbb6ffa91f24e570 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -3,21 +3,24 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li>
-      <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
-      <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
-      <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
-      <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
-      <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
-      <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
-      <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
-      <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
-      <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
-      <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
-      <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#transitions">{{_i}}Transitions{{/i}}</a></li>
+        <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
+        <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
+        <li><a href="#scrollspy">{{_i}}Scrollspy{{/i}}</a></li>
+        <li><a href="#tabs">{{_i}}Tab{{/i}}</a></li>
+        <li><a href="#tooltips">{{_i}}Tooltip{{/i}}</a></li>
+        <li><a href="#popovers">{{_i}}Popover{{/i}}</a></li>
+        <li><a href="#alerts">{{_i}}Alert{{/i}}</a></li>
+        <li><a href="#buttons">{{_i}}Button{{/i}}</a></li>
+        <li><a href="#collapse">{{_i}}Collapse{{/i}}</a></li>
+        <li><a href="#carousel">{{_i}}Carousel{{/i}}</a></li>
+        <li><a href="#typeahead">{{_i}}Typeahead{{/i}}</a></li>
+        <li><a href="#affix">{{_i}}Affix{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 
@@ -1435,3 +1438,25 @@ $('.carousel').carousel({
   <h4>.typeahead({{_i}}options{{/i}})</h4>
   <p>{{_i}}Initializes an input with a typeahead.{{/i}}</p>
 </section>
+
+
+
+<!-- Affix
+================================================== -->
+<section id="affix">
+  <div class="page-header">
+    <h1>
+      {{_i}}Affix{{/i}}
+      <small>{{_i}}Make an element stick in place{{/i}}</small>
+    </h1>
+  </div>
+
+  <h2>{{_i}}...{{/i}}</h2>
+  <p>{{_i}}...{{/i}}</p>
+  <div class="bs-docs-example">
+
+  </div>
+<pre class="prettyprint linenums">
+...
+</pre>
+</section>

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 578a037f644deec82bc8ac12db47b3c7204c7aa0..b08efd86c0c3a8df70afc15e4d892351305369a5 100644 (file)
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -3,13 +3,15 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Using LESS with Bootstrap{{/i}}</h1>
   <p class="lead">{{_i}}Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.{{/i}}</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
-      <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
-      <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
-      <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#builtWith">{{_i}}Built with Less{{/i}}</a></li>
+        <li><a href="#variables">{{_i}}Variables{{/i}}</a></li>
+        <li><a href="#mixins">{{_i}}Mixins{{/i}}</a></li>
+        <li><a href="#compiling">{{_i}}Compiling Bootstrap{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index dd96cec37a81298c7772c6798d393554d14f47ba..3eda645ca899597a1d55ab528bb865a78310340a 100644 (file)
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -3,15 +3,17 @@
 <header class="jumbotron subhead" id="overview">
   <h1>{{_i}}Scaffolding{{/i}}</h1>
   <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
-  <div class="subnav">
-    <ul class="nav">
-      <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
-      <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
-      <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
-      <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
-      <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
-      <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
-    </ul>
+  <div class="navbar navbar-subnav">
+    <div class="navbar-inner">
+      <ul class="nav">
+        <li><a href="#global">{{_i}}Global styles{{/i}}</a></li>
+        <li><a href="#gridSystem">{{_i}}Grid system{{/i}}</a></li>
+        <li><a href="#fluidGridSystem">{{_i}}Fluid grid system{{/i}}</a></li>
+        <li><a href="#gridCustomization">{{_i}}Customizing{{/i}}</a></li>
+        <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
+        <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
+      </ul>
+    </div>
   </div>
 </header>
 

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 0b82b8a0e2595353724ad291b31486ceee6c3a50..c43875a80430ef7bc2d9974ed3d8190e8b916bc4 100644 (file)
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -41,7 +41,6 @@
 // Components: Nav
 @import "navs.less";
 @import "navbar.less";
-@import "subnav.less";
 @import "breadcrumbs.less";
 @import "pagination.less";
 @import "pager.less";

diff --git a/less/navbar.less b/less/navbar.less
index 705169fe208934ad254af3f204d1e5aa5ef73c1c..3305f722a1af98a77da0a50af05035b33617d587 100644 (file)
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -362,3 +362,46 @@
     right: 13px;
   }
 }
+
+
+/* Subnav navbar
+-------------------------------------------------- */
+// In the future, we may make two options available for the navbar:
+// a default state, the lighter one, and the darker one as an option
+// to enable. This would prevent some overriding back to defaults.
+
+
+// Override the default .navbar
+.navbar-subnav {
+  height: 36px;
+}
+.navbar-subnav .navbar-inner {
+  min-height: 36px;
+  padding: 0;
+  #gradient > .vertical(#f9f9f9, #eeeeee);
+  .box-shadow(none);
+  border: 1px solid #e5e5e5;
+}
+
+// Change link colors back
+.navbar-subnav .nav > li > a {
+  color: @linkColor;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+}
+.navbar-subnav .nav > li > a:hover {
+  color: @linkColorHover;
+}
+
+// Dropdown carets
+.navbar-subnav .nav li.dropdown .dropdown-toggle .caret,
+.navbar-subnav .nav li.dropdown.open .caret {
+  border-top-color: @linkColor;
+  border-bottom-color: @linkColor;
+}
+
+// Open dropdown dropdown-toggle
+.navbar-subnav .nav .open > a {
+  color: @linkColorHover;
+}
+
+

diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 8d31db5310ab27e8c9f8007834af659d0ceaae40..92e651e0ba1b2669cb23dc5a0ad92ae1fc2583eb 100644 (file)
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -144,10 +144,41 @@
 // DEFAULT DESKTOP
 // ---------------
 
-// Required to make the collapsing navbar work on regular desktops
 @media (min-width: 980px) {
+
+  // Required to make the collapsing navbar work on regular desktops
   .nav-collapse.collapse {
     height: auto !important;
     overflow: visible !important;
   }
-}
\ No newline at end of file
+
+  // Fixed subnav on scroll, but only for 980px and up (sorry IE!)
+  .subnav-fixed {
+    position: fixed;
+    top: 40px;
+    left: 0;
+    right: 0;
+    z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
+    border-color: #d5d5d5;
+    border-width: 0 0 1px; /* drop the border on the fixed edges */
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+       -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+            box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
+  }
+  .subnav-fixed .nav {
+    max-width: 780px;
+    margin: 0 auto;
+    padding: 0 1px;
+  }
+  .subnav .nav > li:first-child > a,
+  .subnav .nav > li:first-child > a:hover {
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+  }
+
+}

diff --git a/less/subnav.less b/less/subnav.less
deleted file mode 100644 (file)
index 9d0e714..0000000
--- a/less/subnav.less
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Subnav
--------------------------------------------------- */
-
-
-/* Base
-------------------------- */
-.subnav {
-  width: 100%;
-  height: 36px;
-  #gradient > .vertical(#f5f5f5, #eeeeee);
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-
-/* Nav links
-------------------------- */
-.subnav .nav {
-  margin-bottom: 0; // remove default bottom margin of .nav
-}
-// Make list items appear inline
-.subnav .nav > li {
-  float: left;
-}
-.subnav .nav > li > a {
-  padding: 9px 12px;
-  line-height: 18px;
-  border-left: 1px solid #f5f5f5;
-  border-right: 1px solid #e5e5e5;
-}
-.subnav .nav > .active > a,
-.subnav .nav > .active > a:hover {
-  padding-left: 13px;
-  color: #777;
-  background-color: #e9e9e9;
-  border-right-color: #ddd;
-  border-left: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-     -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-          box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-}
-.subnav .nav > li:first-child > a,
-.subnav .nav > li:first-child > a:hover {
-  border-left: 0;
-  padding-left: 12px;
-  -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;
-}
-
-/* Reposition the dropdown carets */
-.subnav .nav .dropdown-toggle .caret {
-  margin-top: 7px;
-}
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #777;
-  border-bottom-color: #777;
-}
-
-/* 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;
-}
-
-
-/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
-@media (min-width: 980px) {
-  .subnav-fixed {
-    position: fixed;
-    top: 40px;
-    left: 0;
-    right: 0;
-    z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
-    border-color: #d5d5d5;
-    border-width: 0 0 1px; /* drop the border on the fixed edges */
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-       -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-            box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-    filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
-  }
-  .subnav-fixed .nav {
-    max-width: 780px;
-    margin: 0 auto;
-    padding: 0 1px;
-  }
-  .subnav .nav > li:first-child > a,
-  .subnav .nav > li:first-child > a:hover {
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-  }
-}