Merge branch 'master' into docs_derp

Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html

1 files changed, 130 insertions, 0 deletions

diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
new file mode 100644
index 000000000..970f5731d
--- /dev/null
+++ b/docs/_includes/nav-css.html
@@ -0,0 +1,130 @@
+<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">Typography and links</a></li>
+    <li><a href="#overview-normalize">Normalize</a></li>
+    <li><a href="#overview-container">Containers</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#grid">Grid system</a>
+  <ul class="nav">
+    <li><a href="#grid-intro">Introduction</a></li>
+    <li><a href="#grid-media-queries">Media queries</a></li>
+    <li><a href="#grid-options">Grid options</a></li>
+    <li><a href="#grid-example-basic">Ex: Stacked-to-horizontal</a></li>
+    <li><a href="#grid-example-fluid">Ex: Fluid container</a></li>
+    <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li>
+    <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li>
+    <li><a href="#grid-responsive-resets">Responsive column resets</a></li>
+    <li><a href="#grid-offsetting">Offsetting columns</a></li>
+    <li><a href="#grid-nesting">Nesting columns</a></li>
+    <li><a href="#grid-column-ordering">Column ordering</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>
+  <ul class="nav">
+    <li><a href="#code-inline">Inline code</a></li>
+    <li><a href="#code-user-input">User input</a></li>
+    <li><a href="#code-block">Blocks of code</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#tables">Tables</a>
+  <ul class="nav">
+    <li><a href="#tables-example">Basic example</a></li>
+    <li><a href="#tables-striped">Striped rows</a></li>
+    <li><a href="#tables-bordered">Bordered table</a></li>
+    <li><a href="#tables-hover-rows">Hover rows</a></li>
+    <li><a href="#tables-condensed">Condensed table</a></li>
+    <li><a href="#tables-contextual-classes">Contextual classes</a></li>
+    <li><a href="#tables-responsive">Responsive tables</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 form</a></li>
+    <li><a href="#forms-horizontal">Horizontal form</a></li>
+    <li><a href="#forms-controls">Supported controls</a></li>
+    <li><a href="#forms-controls-static">Static control</a></li>
+    <li><a href="#forms-control-focus">Focus state</a></li>
+    <li><a href="#forms-control-disabled">Disabled state</a></li>
+    <li><a href="#forms-control-validation">Validation states</a></li>
+    <li><a href="#forms-control-sizes">Control sizing</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">Options</a></li>
+    <li><a href="#buttons-sizes">Sizes</a></li>
+    <li><a href="#buttons-active">Active state</a></li>
+    <li><a href="#buttons-disabled">Disabled state</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>
+  <ul class="nav">
+    <li><a href="#helper-classes-colors">Contextual colors</a></li>
+    <li><a href="#helper-classes-backgrounds">Contextual backgrounds</a></li>
+    <li><a href="#helper-classes-close">Close icon</a></li>
+    <li><a href="#helper-classes-carets">Carets</a></li>
+    <li><a href="#helper-classes-floats">Quick floats</a></li>
+    <li><a href="#helper-classes-center">Center content blocks</a></li>
+    <li><a href="#helper-classes-clearfix">Clearfix</a></li>
+    <li><a href="#helper-classes-show-hide">Showing and hiding content</a></li>
+    <li><a href="#helper-classes-screen-readers">Screen reader content</a></li>
+    <li><a href="#helper-classes-image-replacement">Image replacement</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#responsive-utilities">Responsive utilities</a>
+  <ul class="nav">
+    <li><a href="#responsive-utilities-classes">Available classes</a></li>
+    <li><a href="#responsive-utilities-print">Print classes</a></li>
+    <li><a href="#responsive-utilities-tests">Test cases</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#less">Using Less</a>
+  <ul class="nav">
+    <li><a href="#less-bootstrap">Compiling Bootstrap</a></li>
+    <li><a href="#less-variables">Variables</a></li>
+    <li><a href="#less-mixins-vendor">Vendor mixins</a></li>
+    <li><a href="#less-mixins-utility">Utility mixins</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#sass">Using Sass</a>
+  <ul class="nav">
+    <li><a href="#sass-contents">What's included</a></li>
+    <li><a href="#sass-installation-rails">Rails install</a></li>
+    <li><a href="#sass-installation-compass">Compass install</a></li>
+    <li><a href="#sass-installation-sass-only">Sass install</a></li>
+    <li><a href="#sass-usage">Usage</a></li>
+  </ul>
+</li>