Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip

Conflicts:
	js/bootstrap-collapse.js

.gitignore

 # Ignore compiled docs
 _gh_pages
+_site
 
 # Numerous always-ignore extensions
 *.diff

CHANGELOG.md

@@ -196,7 +196,7 @@ Running makefile now require JSHint and Recess.
 
 - Add jshint support
 - Add travis-ci support w/ headless phantom integration
-- Replace UA sniffing in bootstrap-transitions.js
+- Replace UA sniffing in transitions.js
 - Add MSTransitionEnd event to transition plugin
 - Fix pause method in carousel (shouldn't restart when hovering over controls)
 - Fix crazy opera bug #1776

CONTRIBUTING.md

@@ -23,12 +23,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
 
 
 
-## Notes on the repo
-
-As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and built via `make` before each commit and release. This was done to enable internationalization (translation) in a future release by uploading our strings to the [Twitter Translation Center](http://translate.twttr.com/). Any edits to the docs should be first done in the Mustache files and then recompiled into the HTML.
-
-
-
 ## Pull requests
 
 - Try to submit pull requests against the latest `*-wip` branch for easier merging
@@ -40,16 +34,16 @@ As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and bui
 
 
 
-## Coding standards: HTML
+## Coding standards
+
+### HTML
 
 - Two spaces for indentation, never tabs
 - Double quotes only, never single quotes
 - Always use proper indentation
 - Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
 
-
-
-## Coding standards: CSS
+### CSS
 
 - Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
 - Multiple-line approach (one property and value per line)
@@ -58,9 +52,7 @@ As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and bui
 - For multiple, comma-separated selectors, place each selector on it's own line
 - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
 
-
-
-## Coding standards: JS
+### JS
 
 - No semicolons
 - Comma first

Makefile

@@ -23,11 +23,10 @@ build:
 	@echo "               ${CHECK}"
 	@printf "Prepping documentation assets..."
 	@cp fonts/* docs/assets/fonts/
-	@cp js/*.js docs/assets/js/
 	@cp js/tests/vendor/jquery.js docs/assets/js/
 	@echo "            ${CHECK}"
 	@printf "Compiling and minifying JavaScript..."
-	@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
+	@cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > docs/assets/js/bootstrap.js
 	@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
 	@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
 	@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@@ -72,14 +71,14 @@ bootstrap-js: bootstrap/js/*.js
 
 bootstrap/js/*.js: js/*.js
 	mkdir -p bootstrap/js
-	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
+	cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > bootstrap/js/bootstrap.js
 	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
 	echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
 	cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
 	rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
 
 #
-# CSS COMPLILE
+# CSS COMPILE
 #
 
 bootstrap-css: bootstrap/css/*.css
@@ -100,18 +99,6 @@ bootstrap/fonts/*: fonts/*
 	cp fonts/* bootstrap/fonts/
 
 
-#
-# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O  )
-#
-
-gh-pages: bootstrap docs
-	rm -f docs/assets/bootstrap.zip
-	zip -r docs/assets/bootstrap.zip bootstrap
-	rm -r bootstrap
-	rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
-	node docs/build production
-	cp -r docs/* ../bootstrap-gh-pages
-
 #
 # WATCH LESS FILES
 #
@@ -120,5 +107,11 @@ watch:
 	echo "Watching less files..."; \
 	watchr -e "watch('less/.*\.less') { system 'make' }"
 
+#
+# BUILD AND START SERVER
+#
+
+run: build
+	jekyll build && jekyll server
 
 .PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js

README.md

@@ -12,44 +12,49 @@ Three quick start options are available:
 
 * [Download the latest release](https://github.com/twitter/bootstrap/zipball/master).
 * Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
-* Install with Twitter's [Bower](http://github.com/bower/bower): `bower install bootstrap`.
+* Install with [Bower](http://bower.io): `bower install bootstrap`.
 
-Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more.
+Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
 
 
-## Bootstrap elsewhere
 
-Beyond getting started with the Bootstrap core, there are ways to use Bootstrap in other tools and services:
+## Bugs and feature requests
 
-* [Roots WordPress theme](https://github.com/retlehs/roots) - A WordPress starter theme based on HTML5 Boilerplate & Bootstrap from Twitter.
+Have a bug or a feature request? [Please open a new issue](https://github.com/twitter/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
 
-Have suggestions? Let us know with a [new issue](https://github.com/twitter/bootstrap/issues).
 
 
+## Documentation
 
-## Bugs and feature requests
+Bootstrap's documentation, included in this repo in the `/docs` directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). The docs maybe also be run locally.
 
-Have a bug or a feature request? [Please open a new issue](https://github.com/twitter/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
+### Running documentation locally
 
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation).
+2. From the `/bootstrap` directory, run `jekyll serve` in the command line.
+3. Open [http://getbootstrap.dev:9001](http://getbootstrap.dev:9001) in your browser, and voilà.
 
+Learn more about using Jekyll by reading their [documentation](http://jekyllrb.com/docs/home/).
 
-## Documentation
+### Documentation for previous releases
 
-Bootstrap's docs are built using [Jekyll](http://jekyllrb.com) and hosted on GitHub Pages at [http://getbootstrap.com](http://getbootstrap.com). To view our docs locally, you'll need to [install Jekyll](https://github.com/mojombo/jekyll/wiki/install) to run a local server.
+Documentation for v2.3.2 has been made available for the time being at [http://getbootstrap.com/2.3.2/docs](http://getbootstrap.com/2.3.2/docs) while folks transition to Bootstrap 3.
 
-Documentation for [previous versions](https://github.com/twitter/bootstrap/tags) is also available via tags.
+For previous releases, documentation is available for [download via Git tags](https://github.com/twitter/bootstrap/tags).
 
 
 
 ## Compiling CSS and JavaScript
 
-Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, be sure to install [the necessary local dependencies](package.json):
+Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, install [the necessary local dependencies](package.json):
 
 ```
 $ npm install
 ```
 
-When completed, you'll be able to run the various make commands provided:
+When completed, you'll be able to run the various make commands provided.
+
+### Available makefile commands
 
 #### Build - `make`
 `make` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
@@ -63,15 +68,19 @@ Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/p
 #### Watch - `make watch`
 This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the watchr gem.**
 
-Should you encounter problems with installing dependencies or running the makefile commands, uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
+### Troubleshooting dependencies
+
+Should you encounter problems with installing dependencies or running makefile commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
 
 
 
 ## Contributing
 
-Please submit all pull requests against *-wip branches. If your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
+Please read through our guidelines for contributing to Bootstrap. Included are directions for opening issues, coding standards, and notes on development. 
+
+More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
 
-Editor preferences are also available in the [editor config](.editorconfig) for easy application in common text editors. Read more and download plugins at [http://editorconfig.com](http://editorconfig.com).
+Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.com](http://editorconfig.com).
 
 
 

_config.yml

@@ -8,5 +8,5 @@ permalink:    pretty
 # Server
 source:       ./docs
 destination:  ./_gh_pages
-url:          http://bootstrap.dev:9001
-server_port:  9001
+port:         9001
+url:          http://getbootstrap.dev:9001

docs/_includes/colophon.html

 <!-- 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>

docs/_includes/docs-nav.html

-<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>

docs/_includes/footer.html

@@ -2,19 +2,7 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="/assets/js/jquery.js"></script>
-<script src="/assets/js/bootstrap-transition.js"></script>
-<script src="/assets/js/bootstrap-alert.js"></script>
-<script src="/assets/js/bootstrap-modal.js"></script>
-<script src="/assets/js/bootstrap-dropdown.js"></script>
-<script src="/assets/js/bootstrap-scrollspy.js"></script>
-<script src="/assets/js/bootstrap-tab.js"></script>
-<script src="/assets/js/bootstrap-tooltip.js"></script>
-<script src="/assets/js/bootstrap-popover.js"></script>
-<script src="/assets/js/bootstrap-button.js"></script>
-<script src="/assets/js/bootstrap-collapse.js"></script>
-<script src="/assets/js/bootstrap-carousel.js"></script>
-<script src="/assets/js/bootstrap-typeahead.js"></script>
-<script src="/assets/js/bootstrap-affix.js"></script>
+<script src="/assets/js/bootstrap.js"></script>
 
 <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
 <script src="/assets/js/holder/holder.js"></script>

docs/_includes/nav-components.html

+<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>
+    <li><a href="#alerts-links">Links in alerts</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>

docs/_includes/nav-css.html

+<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-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>

docs/_includes/nav-customize.html

+<li>
+  <a href="#less">LESS components</a>
+</li>
+<li>
+  <a href="#plugins">jQuery plugins</a>
+</li>
+<li>
+  <a href="#variables">LESS variables</a>
+  <ul class="nav">
+    <li><a href="#variables-basics">Basics</a></li>
+    <li><a href="#variables-buttons">Buttons</a></li>
+    <li><a href="#variables-form-states">Form states</a></li>
+    <li><a href="#variables-alerts">Alerts</a></li>
+    <li><a href="#variables-navbar">Navbar</a></li>
+    <li><a href="#variables-tables">Tables</a></li>
+    <li><a href="#variables-forms">Forms</a></li>
+    <li><a href="#variables-dropdowns">Dropdowns</a></li>
+    <li><a href="#variables-panels-wells">Panels and wells</a></li>
+    <li><a href="#variables-jumbotron">Jumbotron</a></li>
+    <li><a href="#variables-modals">Modals</a></li>
+    <li><a href="#variables-list-group">List group</a></li>
+    <li><a href="#variables-thumbnails">Thumbnails</a></li>
+    <li><a href="#variables-progress">Progress bars</a></li>
+    <li><a href="#variables-pagination">Pagination</a></li>
+    <li><a href="#variables-labels">Labels</a></li>
+    <li><a href="#variables-tooltips-popovers">Tooltips and popovers</a></li>
+    <li><a href="#variables-other">Other</a></li>
+  </ul>
+</li>
+<li>
+  <a href="#download">Download</a>
+</li>
\ No newline at end of file

docs/_includes/nav-getting-started.html

+<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

docs/_includes/nav-javascript.html

+<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>

docs/_includes/nav-main.html

+<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>

docs/_includes/navbar.html

-<!-- Navbar
-================================================== -->
-<div class="navbar navbar-inverse navbar-fixed-left bs-docs-navbar">
-  <div class="container">
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-    <a class="navbar-brand" href="/">B</a>
-    <div class="nav-collapse collapse">
-      <ul class="nav">
-<!--         <li {% if page.title == "Bootstrap" %}class="active"{% endif %}>
-          <a href="/"><span class="glyphicon glyphicon-home"></span></a>
-        </li>
- -->        <li {% if page.title == "Getting started" %}class="active"{% endif %}>
-          <a href="/getting-started" data-toggle="tooltip" data-placement="right" title="Getting started"><span class="glyphicon glyphicon-list"></span></a>
-        </li>
-        <li {% if page.title == "CSS" %}class="active"{% endif %}>
-          <a href="/css" data-toggle="tooltip" data-placement="right" title="CSS"><span class="glyphicon glyphicon-tint"></span></a>
-        </li>
-        <li {% if page.title == "Components" %}class="active"{% endif %}>
-          <a href="/components" data-toggle="tooltip" data-placement="right" title="Components"><span class="glyphicon glyphicon-fire"></span></a>
-        </li>
-        <li {% if page.title == "JavaScript plugins" %}class="active"{% endif %}>
-          <a href="/javascript" data-toggle="tooltip" data-placement="right" title="JavaScript plugins"><span class="glyphicon glyphicon-dashboard"></span></a>
-        </li>
-        <li {% if page.title == "Customize and download" %}class="active"{% endif %}>
-          <a href="/customize" data-toggle="tooltip" data-placement="right" title="Customize"><span class="glyphicon glyphicon-cog"></span></a>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>

docs/_includes/social-buttons.html

+<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>

docs/_layouts/default.html

@@ -5,13 +5,49 @@
     {% include header.html %}
     <!-- Place anything custom after this. -->
   </head>
-  <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar">
+  <body data-spy="scroll" data-target=".bs-sidebar">
 
-    <!-- Docs nav -->
-    {% include docs-nav.html %}
+    <!-- Docs master nav -->
+    {% include nav-main.html %}
 
-    <!-- Page content of course! -->
-    {{ content }}
+    <!-- Docs page layout -->
+    <div class="bs-header">
+      <div class="container">
+        <h1>{{ page.title }}</h1>
+        <p>{{ page.lead }}</p>
+      </div>
+    </div>
+
+    <div class="container bs-docs-container">
+      <div class="row">
+        <div class="col col-lg-3">
+          <div class="bs-sidebar">
+            <ul class="nav bs-sidenav">
+              {% if page.slug == "getting-started" %}
+                 {% include nav-getting-started.html %}
+              {% elsif page.slug == "css" %}
+                 {% include nav-css.html %}
+              {% elsif page.slug == "components" %}
+                 {% include nav-components.html %}
+              {% elsif page.slug == "js" %}
+                 {% include nav-javascript.html %}
+              {% elsif page.slug == "customize" %}
+                 {% include nav-customize.html %}
+              {% endif %}
+            </ul>
+          </div>
+        </div>
+        <div class="col col-lg-9">
+          {{ content }}
+        </div>
+      </div>
+
+      <!-- Quick back to top -->
+      <a href="#" class="bs-top">
+        Back to top
+      </a>
+
+    </div>
 
     <!-- Main docs footer (social buttons, copyright, etc). -->
     {% include colophon.html %}

docs/_layouts/home.html

@@ -7,6 +7,9 @@
   </head>
   <body class="bs-docs-home">
 
+    <!-- Docs master nav -->
+    {% include nav-main.html %}
+
     <!-- Page content of course! -->
     {{ content }}