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

6 files changed, 109 insertions, 74 deletions

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 40bbbfba5..0f0537ede 100644
--- 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 579fd08a6..4fc982e5b 100644
--- 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 3d5d70c1c..c83905363 100644
--- 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 52ed45a49..cc1ecf1cb 100644
--- 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 578a037f6..b08efd86c 100644
--- 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 dd96cec37..3eda645ca 100644
--- 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>