Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
	Makefile
	docs/_site/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.min.js
	docs/customize.html
	docs/docs.html

8 files changed, 298 insertions, 257 deletions

diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html
index 5018113b4..fa7958ef8 100644
--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
@@ -1,35 +1,16 @@
 <!-- Footer
 ================================================== -->
-<footer class="bs-docs-footer">
-  <div class="bs-docs-container">
+<footer class="bs-footer">
+  {% include social-buttons.html %}
 
-    <div class="bs-docs-social">
-      <ul class="bs-docs-social-buttons">
-        <li>
-          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
-        </li>
-        <li>
-          <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
-        </li>
-        <li class="follow-btn">
-          <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
-        </li>
-        <li class="tweet-btn">
-          <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
-        </li>
-      </ul>
-    </div>
-
-
-    <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
-    <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-    <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-    <ul class="footer-links">
-      <li><a href="http://blog.getbootstrap.com">Blog</a></li>
-      <li class="muted">&middot;</li>
-      <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
-      <li class="muted">&middot;</li>
-      <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
-    </ul>
-  </div>
+  <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
+  <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+  <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+  <ul class="footer-links">
+    <li><a href="http://blog.getbootstrap.com">Blog</a></li>
+    <li class="muted">&middot;</li>
+    <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
+    <li class="muted">&middot;</li>
+    <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
+  </ul>
 </footer>
diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html
deleted file mode 100644
index 2c001a3f4..000000000
--- a/docs/_includes/docs-nav.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<div class="bs-docs-sidebar">
-  <ul class="nav bs-docs-sidenav">
-    <h3 class="bs-docs-sidenav-heading"><a href="/">Bootstrap</a></h3>
-
-    <li><a href="#welcome">Welcome!</a></li>
-    <li><a href="#getting-started">Getting started</a></li>
-    <li><a href="#whats-included">What's included</a></li>
-    <li><a href="#examples">Templates and examples</a></li>
-    <li><a href="#customizing">Customizing Bootstrap</a></li>
-
-    <!-- CSS -->
-    <li><a class="nav-header" href="#css">CSS</a></li>
-    <li><a href="#css-overview">Overview</a></li>
-    <li>
-      <a href="#grid">Grid system</a>
-      <ul class="nav">
-        <li><a href="#grid-example">Example usage</a></li>
-        <li><a href="#grid-offsetting">Offset columns</a></li>
-        <li><a href="#grid-nesting">Nested columns</a></li>
-        <li><a href="#grid-column-ordering">Column ordering</a></li>
-        <li><a href="#grid-small">Small device grid</a></li>
-        <li><a href="#grid-less">LESS mixins and variables</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#type">Typography</a>
-      <ul class="nav">
-        <li><a href="#type-headings">Headings</a></li>
-        <li><a href="#type-body-copy">Body copy</a></li>
-        <li><a href="#type-emphasis">Emphasis</a></li>
-        <li><a href="#type-abbreviations">Abbreviations</a></li>
-        <li><a href="#type-addresses">Addresses</a></li>
-        <li><a href="#type-blockquotes">Blockquotes</a></li>
-        <li><a href="#type-lists">Lists</a></li>
-        <li><a href="#type-"></a></li>
-      </ul>
-    </li>
-    <li><a href="#code">Code</a></li>
-    <li>
-      <a href="#tables">Tables</a>
-      <ul class="nav">
-        <li><a href="#tables-example">Basic example</a></li>
-        <li><a href="#tables-striped">Zebra striping</a></li>
-        <li><a href="#tables-bordered">Bordered tables</a></li>
-        <li><a href="#tables-hover-rows">Hover rows</a></li>
-        <li><a href="#tables-condensed">Condensed tables</a></li>
-        <li><a href="#tables-row-classes">Contextual row classes</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#forms">Forms</a>
-      <ul class="nav">
-        <li><a href="#forms-example">Basic example</a></li>
-        <li><a href="#forms-inline">Inline variation</a></li>
-        <li><a href="#forms-horizontal">Horizontal variation</a></li>
-        <li><a href="#forms-controls">Supported controls</a></li>
-        <li><a href="#forms-control-states">Control states</a></li>
-        <li><a href="#forms-input-groups">Input groups</a></li>
-        <li><a href="#forms-control-sizes">Control sizing</a></li>
-        <li><a href="#forms-actions">Form actions</a></li>
-        <li><a href="#forms-help-text">Help text</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#buttons">Buttons</a>
-      <ul class="nav">
-        <li><a href="#buttons-options">Button options</a></li>
-        <li><a href="#buttons-sizes">Sizes</a></li>
-        <li><a href="#buttons-disabled">Disabled</a></li>
-        <li><a href="#buttons-tags">Button tags</a></li>
-      </ul>
-    </li>
-    <li><a href="#images">Images</a></li>
-    <li><a href="#helper-classes">Helper classes</a></li>
-    <li><a href="#responsive-utilities">Responsive utilities</a></li>
-
-    <!-- Components -->
-    <li><a class="nav-header" href="#components">Components</a></li>
-    <li><a href="#icons">Glyphicons</a></li>
-    <li>
-      <a href="#dropdowns">Dropdowns</a>
-      <ul class="nav">
-        <li><a href="#dropdowns-example">Example</a></li>
-        <li><a href="#dropdowns-alignment">Alignment options</a></li>
-        <li><a href="#dropdowns-disabled">Disabled menu items</a></li>
-        <li><a href="#dropdowns-submenus">Submenus</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#btn-groups">Button groups</a>
-      <ul class="nav">
-        <li><a href="#btn-groups-single">Basic button group</a></li>
-        <li><a href="#btn-groups-toolbar">Button toolbar</a></li>
-        <li><a href="#btn-groups-vertical">Vertical variation</a></li>
-        <li><a href="#btn-groups-justified">Justified link buttons</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#btn-dropdowns">Button dropdowns</a>
-      <ul class="nav">
-        <li><a href="#btn-dropdowns-single">Single button dropdown</a></li>
-        <li><a href="#btn-dropdowns-split">Split button dropdown</a></li>
-        <li><a href="#btn-dropdowns-sizes">Button sizes</a></li>
-        <li><a href="#btn-dropdowns-dropup">Dropup variation</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#nav">Navs</a>
-      <ul class="nav">
-        <li><a href="#nav-tabs">Tabs nav</a></li>
-        <li><a href="#nav-pills">Pills nav</a></li>
-        <li><a href="#nav-justified">Justified nav</a></li>
-        <li><a href="#nav-disabled-links">Disabled links</a></li>
-        <li><a href="#nav-alignment">Alignment options</a></li>
-        <li><a href="#nav-dropdowns">Using dropdowns</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#navbar">Navbar</a>
-      <ul class="nav">
-        <li><a href="#navbar-basic">Basic navbar</a></li>
-        <li><a href="#navbar-nav">Nav links</a></li>
-        <li><a href="#navbar-forms">Forms in navbars</a></li>
-        <li><a href="#navbar-buttons">Buttons in navbars</a></li>
-        <li><a href="#navbar-text">Text in navbars</a></li>
-        <li><a href="#navbar-links">Links in navbars</a></li>
-        <li><a href="#navbar-component-alignment">Component alignment</a></li>
-        <li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
-        <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
-        <li><a href="#navbar-static-top">Static top navbar</a></li>
-        <li><a href="#navbar-responsive">Responsive navbar</a></li>
-      </ul>
-    </li>
-    <li><a href="#breadcrumbs">Breadcrumbs</a></li>
-    <li>
-      <a href="#pagination">Pagination</a>
-      <ul class="nav">
-        <li><a href="#pagination-default">Default pagination</a></li>
-        <li><a href="#pagination-pager">Pager</a></li>
-      </ul>
-    </li>
-    <li><a href="#labels">Labels</a></li>
-    <li><a href="#badges">Badges</a></li>
-    <li>
-      <a href="#type-components">Typography</a>
-      <ul class="nav">
-        <li><a href="#type-components-jumbotron">Jumbotron</a></li>
-        <li><a href="#type-components-page-header">Page header</a></li>
-      </ul>
-    </li>
-    <li><a href="#thumbnails">Thumbnails</a></li>
-    <li>
-      <a href="#alerts">Alerts</a>
-      <ul class="nav">
-        <li><a href="#alerts-default">Default alert</a></li>
-        <li><a href="#alerts-block">Block alerts</a></li>
-        <li><a href="#alerts-alternatives">Contextual alternatives</a></li>
-      </ul>
-    </li>
-    <li>
-      <a href="#progress">Progress bars</a>
-      <ul class="nav">
-        <li><a href="#progress-basic">Basic progress bar</a></li>
-        <li><a href="#progress-alternatives">Contextual alternatives</a></li>
-        <li><a href="#progress-striped">Striped</a></li>
-        <li><a href="#progress-animated">Animated</a></li>
-        <li><a href="#progress-stacked">Stacked</a></li>
-      </ul>
-    </li>
-    <li><a href="#media">Media object</a></li>
-    <li>
-      <a href="#list-group">List group</a>
-      <ul class="nav">
-        <li><a href="#list-group-basic">Basic list group</a></li>
-        <li><a href="#list-group-chevrons">Chevrons</a></li>
-        <li><a href="#list-group-badges">Badges</a></li>
-        <li><a href="#list-group-badges-chevrons">Badges and chevrons</a></li>
-        <li><a href="#list-group-linked">Linked items</a></li>
-        <li><a href="#list-group-custom-content">Custom content</a></li>
-        <!-- <li><a href="#list-group-pic">Leading picture</a></li> -->
-      </ul>
-    </li>
-    <li>
-      <a href="#panels">Panels</a>
-      <ul class="nav">
-        <li><a href="#panels-basic">Basic panel</a></li>
-        <li><a href="#panels-heading">Panel with heading</a></li>
-        <li><a href="#panels-alternatives">Contextual alternatives</a></li>
-        <li><a href="#panels-list-group">With list groups</a>
-      </ul>
-    </li>
-    <li><a href="#wells">Wells</a></li>
-
-    <!-- JavaScript -->
-    <li><a class="nav-header" href="#js">JavaScript</a></li>
-    <li>
-      <a href="#js-overview">Overview</a>
-      <ul class="nav">
-        <li><a href="#js-individual-compiled">Individual or compiled</a></li>
-        <li><a href="#js-data-attributes">Data attributes</a></li>
-        <li><a href="#js-programmatic-api">Programmatic API</a></li>
-        <li><a href="#js-noconflict">No Conflict</a></li>
-        <li><a href="#js-events">Evens</a></li>
-      </ul>
-    </li>
-    <li><a href="#transitions">Transitions</a></li>
-    <li>
-      <a href="#modals">Modal</a>
-      <ul class="nav">
-        <li><a href="#modals-examples">Examples</a></li>
-        <li><a href="#modals-usage">Usage</a></li>
-      </ul>
-    </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="#js-alerts">Alert</a></li>
-    <li><a href="#js-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>
diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html
new file mode 100644
index 000000000..8c7728bc8
--- /dev/null
+++ b/docs/_includes/nav-components.html
@@ -0,0 +1,121 @@
+<li>
+  <a href="#icons">Glyphicons</a>
+  <ul class="nav">
+    <li><a href="#icons-list">Icon list</a></li>
+    <li><a href="#icons-how-to">How to use</a></li>
+    <li><a href="#icons-examples">Examples</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#dropdowns">Dropdowns</a>
+  <ul class="nav">
+    <li><a href="#dropdowns-example">Example</a></li>
+    <li><a href="#dropdowns-alignment">Alignment options</a></li>
+    <li><a href="#dropdowns-disabled">Disabled menu items</a></li>
+    <li><a href="#dropdowns-submenus">Submenus</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#btn-groups">Button groups</a>
+  <ul class="nav">
+    <li><a href="#btn-groups-single">Basic button group</a></li>
+    <li><a href="#btn-groups-toolbar">Button toolbar</a></li>
+    <li><a href="#btn-groups-vertical">Vertical variation</a></li>
+    <li><a href="#btn-groups-justified">Justified link buttons</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#btn-dropdowns">Button dropdowns</a>
+  <ul class="nav">
+    <li><a href="#btn-dropdowns-single">Single button dropdown</a></li>
+    <li><a href="#btn-dropdowns-split">Split button dropdown</a></li>
+    <li><a href="#btn-dropdowns-sizes">Button sizes</a></li>
+    <li><a href="#btn-dropdowns-dropup">Dropup variation</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#nav">Navs</a>
+  <ul class="nav">
+    <li><a href="#nav-tabs">Tabs nav</a></li>
+    <li><a href="#nav-pills">Pills nav</a></li>
+    <li><a href="#nav-justified">Justified nav</a></li>
+    <li><a href="#nav-disabled-links">Disabled links</a></li>
+    <li><a href="#nav-alignment">Alignment options</a></li>
+    <li><a href="#nav-dropdowns">Using dropdowns</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#navbar">Navbar</a>
+  <ul class="nav">
+    <li><a href="#navbar-basic">Basic navbar</a></li>
+    <li><a href="#navbar-nav">Nav links</a></li>
+    <li><a href="#navbar-forms">Forms in navbars</a></li>
+    <li><a href="#navbar-buttons">Buttons in navbars</a></li>
+    <li><a href="#navbar-text">Text in navbars</a></li>
+    <li><a href="#navbar-links">Links in navbars</a></li>
+    <li><a href="#navbar-component-alignment">Component alignment</a></li>
+    <li><a href="#navbar-fixed-top">Fixed top navbar</a></li>
+    <li><a href="#navbar-fixed-bottom">Fixed bottom navbar</a></li>
+    <li><a href="#navbar-static-top">Static top navbar</a></li>
+    <li><a href="#navbar-responsive">Responsive navbar</a></li>
+  </ul>
+</li>
+<li><a href="#breadcrumbs">Breadcrumbs</a></li>
+<li>
+  <a href="#pagination">Pagination</a>
+  <ul class="nav">
+    <li><a href="#pagination-default">Default pagination</a></li>
+    <li><a href="#pagination-pager">Pager</a></li>
+  </ul>
+</li>
+<li><a href="#labels">Labels</a></li>
+<li><a href="#badges">Badges</a></li>
+<li>
+  <a href="#type-components">Typography</a>
+  <ul class="nav">
+    <li><a href="#type-components-jumbotron">Jumbotron</a></li>
+    <li><a href="#type-components-page-header">Page header</a></li>
+  </ul>
+</li>
+<li><a href="#thumbnails">Thumbnails</a></li>
+<li>
+  <a href="#alerts">Alerts</a>
+  <ul class="nav">
+    <li><a href="#alerts-default">Default alert</a></li>
+    <li><a href="#alerts-block">Block alerts</a></li>
+    <li><a href="#alerts-alternatives">Contextual alternatives</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#progress">Progress bars</a>
+  <ul class="nav">
+    <li><a href="#progress-basic">Basic progress bar</a></li>
+    <li><a href="#progress-alternatives">Contextual alternatives</a></li>
+    <li><a href="#progress-striped">Striped</a></li>
+    <li><a href="#progress-animated">Animated</a></li>
+    <li><a href="#progress-stacked">Stacked</a></li>
+  </ul>
+</li>
+<li><a href="#media">Media object</a></li>
+<li>
+  <a href="#list-group">List group</a>
+  <ul class="nav">
+    <li><a href="#list-group-basic">Basic list group</a></li>
+    <li><a href="#list-group-chevrons">Chevrons</a></li>
+    <li><a href="#list-group-badges">Badges</a></li>
+    <li><a href="#list-group-badges-chevrons">Badges and chevrons</a></li>
+    <li><a href="#list-group-linked">Linked items</a></li>
+    <li><a href="#list-group-custom-content">Custom content</a></li>
+    <!-- <li><a href="#list-group-pic">Leading picture</a></li> -->
+  </ul>
+</li>
+<li>
+  <a href="#panels">Panels</a>
+  <ul class="nav">
+    <li><a href="#panels-basic">Basic panel</a></li>
+    <li><a href="#panels-heading">Panel with heading</a></li>
+    <li><a href="#panels-alternatives">Contextual alternatives</a></li>
+    <li><a href="#panels-list-group">With list groups</a>
+  </ul>
+</li>
+<li><a href="#wells">Wells</a></li>
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
new file mode 100644
index 000000000..f1596f7ef
--- /dev/null
+++ b/docs/_includes/nav-css.html
@@ -0,0 +1,72 @@
+<li>
+  <a href="#overview">Overview</a>
+  <ul class="nav">
+    <li><a href="#overview-doctype">HTML5 doctype</a></li>
+    <li><a href="#overview-mobile">Mobile first</a></li>
+    <li><a href="#overview-responsive-images">Responsive images</a></li>
+    <li><a href="#overview-type-links">Type and links</a></li>
+    <li><a href="#overview-normalize">Normalize</a></li>
+    <li><a href="#overview-container">Container</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#grid">Grid system</a>
+  <ul class="nav">
+    <li><a href="#grid-example">Example usage</a></li>
+    <li><a href="#grid-offsetting">Offset columns</a></li>
+    <li><a href="#grid-nesting">Nested columns</a></li>
+    <li><a href="#grid-column-ordering">Column ordering</a></li>
+    <li><a href="#grid-small">Small device grid</a></li>
+    <li><a href="#grid-less">LESS mixins and variables</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#type">Typography</a>
+  <ul class="nav">
+    <li><a href="#type-headings">Headings</a></li>
+    <li><a href="#type-body-copy">Body copy</a></li>
+    <li><a href="#type-emphasis">Emphasis</a></li>
+    <li><a href="#type-abbreviations">Abbreviations</a></li>
+    <li><a href="#type-addresses">Addresses</a></li>
+    <li><a href="#type-blockquotes">Blockquotes</a></li>
+    <li><a href="#type-lists">Lists</a></li>
+  </ul>
+</li>
+<li><a href="#code">Code</a></li>
+<li>
+  <a href="#tables">Tables</a>
+  <ul class="nav">
+    <li><a href="#tables-example">Basic example</a></li>
+    <li><a href="#tables-striped">Zebra striping</a></li>
+    <li><a href="#tables-bordered">Bordered tables</a></li>
+    <li><a href="#tables-hover-rows">Hover rows</a></li>
+    <li><a href="#tables-condensed">Condensed tables</a></li>
+    <li><a href="#tables-row-classes">Contextual row classes</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#forms">Forms</a>
+  <ul class="nav">
+    <li><a href="#forms-example">Basic example</a></li>
+    <li><a href="#forms-inline">Inline variation</a></li>
+    <li><a href="#forms-horizontal">Horizontal variation</a></li>
+    <li><a href="#forms-controls">Supported controls</a></li>
+    <li><a href="#forms-control-states">Control states</a></li>
+    <li><a href="#forms-input-groups">Input groups</a></li>
+    <li><a href="#forms-control-sizes">Control sizing</a></li>
+    <li><a href="#forms-actions">Form actions</a></li>
+    <li><a href="#forms-help-text">Help text</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#buttons">Buttons</a>
+  <ul class="nav">
+    <li><a href="#buttons-options">Button options</a></li>
+    <li><a href="#buttons-sizes">Sizes</a></li>
+    <li><a href="#buttons-disabled">Disabled</a></li>
+    <li><a href="#buttons-tags">Button tags</a></li>
+  </ul>
+</li>
+<li><a href="#images">Images</a></li>
+<li><a href="#helper-classes">Helper classes</a></li>
+<li><a href="#responsive-utilities">Responsive utilities</a></li>
diff --git a/docs/_includes/nav-getting-started.html b/docs/_includes/nav-getting-started.html
new file mode 100644
index 000000000..fd6f8c98b
--- /dev/null
+++ b/docs/_includes/nav-getting-started.html
@@ -0,0 +1,20 @@
+<li>
+  <a href="#download">Download Bootstrap</a>
+  <ul class="nav">
+    <li><a href="#download-options">Download options</a></li>
+    <li><a href="#download-cdn">Bootstrap CDN</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#whats-included">What's included</a>
+</li>
+<li>
+  <a href="#examples">Templates and examples</a>
+  <ul class="nav">
+    <li><a href="#examples-template">HTML template</a></li>
+    <li><a href="#examples-list">List of examples</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#customizing">Customizing Bootstrap</a>
+</li>
\ No newline at end of file
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html
new file mode 100644
index 000000000..9422b27fb
--- /dev/null
+++ b/docs/_includes/nav-javascript.html
@@ -0,0 +1,28 @@
+<li>
+  <a href="#js-overview">Overview</a>
+  <ul class="nav">
+    <li><a href="#js-individual-compiled">Individual or compiled</a></li>
+    <li><a href="#js-data-attributes">Data attributes</a></li>
+    <li><a href="#js-programmatic-api">Programmatic API</a></li>
+    <li><a href="#js-noconflict">No Conflict</a></li>
+    <li><a href="#js-events">Events</a></li>
+  </ul>
+</li>
+<li><a href="#transitions">Transitions</a></li>
+<li>
+  <a href="#modals">Modal</a>
+  <ul class="nav">
+    <li><a href="#modals-examples">Examples</a></li>
+    <li><a href="#modals-usage">Usage</a></li>
+  </ul>
+</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="#js-alerts">Alert</a></li>
+<li><a href="#js-buttons">Button</a></li>
+<li><a href="#collapse">Collapse</a></li>
+<li><a href="#carousel">Carousel</a></li>
+<li><a href="#affix">Affix</a></li>
diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html
new file mode 100644
index 000000000..fceeb7a86
--- /dev/null
+++ b/docs/_includes/nav-main.html
@@ -0,0 +1,29 @@
+<div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav">
+  <div class="container">
+    <a href="/" class="navbar-brand">Bootstrap</a>
+    <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <div class="nav-collapse collapse bs-navbar-collapse">
+      <ul class="nav navbar-nav">
+        <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
+          <a href="/getting-started">Getting started</a>
+        </li>
+        <li{% if page.slug == "css" %} class="active"{% endif %}>
+          <a href="/css">CSS</a>
+        </li>
+        <li{% if page.slug == "components" %} class="active"{% endif %}>
+          <a href="/components">Components</a>
+        </li>
+        <li{% if page.slug == "js" %} class="active"{% endif %}>
+          <a href="/javascript">JavaScript</a>
+        </li>
+        <li{% if page.slug == "customize" %} class="active"{% endif %}>
+          <a href="/customize">Customize</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html
new file mode 100644
index 000000000..5cef71a19
--- /dev/null
+++ b/docs/_includes/social-buttons.html
@@ -0,0 +1,16 @@
+<div class="bs-social">
+  <ul class="bs-social-buttons">
+    <li>
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
+    </li>
+    <li>
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe>
+    </li>
+    <li class="follow-btn">
+      <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a>
+    </li>
+    <li class="tweet-btn">
+      <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
+    </li>
+  </ul>
+</div>