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

docs/assets/js/README.md

-## 2.0 BOOTSTRAP JS PHILOSOPHY
-These are the high-level design rules which guide the development of Bootstrap's plugin apis.
-
----
-
-### DATA-ATTRIBUTE API
-
-We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript.
-
-We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
-
-    $('body').off('.data-api')
-
-To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:
-
-    $('body').off('.alert.data-api')
-
----
-
-### PROGRAMMATIC API
-
-We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
-
-All public APIs should be single, chainable methods, and return the collection acted upon.
-
-    $(".btn.danger").button("toggle").addClass("fat")
-
-All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
-
-    $("#myModal").modal() // initialized with defaults
-    $("#myModal").modal({ keyboard: false }) // initialized with now keyboard
-    $("#myModal").modal('show') // initializes and invokes show immediately afterqwe2
-
----
-
-### OPTIONS
-
-Options should be sparse and add universal value. We should pick the right defaults.
-
-All plugins should have a default object which can be modified to effect all instance's default options. The defaults object should be available via `$.fn.plugin.defaults`.
-
-    $.fn.modal.defaults = { … }
-
-An options definition should take the following form:
-
-    *noun*: *adjective* - describes or modifies a quality of an instance
-
-examples:
-
-    backdrop: true
-    keyboard: false
-    placement: 'top'
-
----
-
-### EVENTS
-
-All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action.
-
-    show | shown
-    hide | hidden
-
----
-
-### CONSTRUCTORS
-
-Each plugin should expose it's raw constructor on a `Constructor` property -- accessed in the following way:
-
-
-    $.fn.popover.Constructor
-
----
-
-### DATA ACCESSOR
-
-Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
-
-    $('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
-
----
-
-### DATA ATTRIBUTES
-
-Data attributes should take the following form:
-
-- data-{{verb}}={{plugin}} - defines main interaction
-- data-target || href^=# - defined on "control" element (if element controls an element other than self)
-- data-{{noun}} - defines class instance options
-
-examples:
-
-    // control other targets
-    data-toggle="modal" data-target="#foo"
-    data-toggle="collapse" data-target="#foo" data-parent="#bar"
-
-    // defined on element they control
-    data-spy="scroll"
-
-    data-dismiss="modal"
-    data-dismiss="alert"
-
-    data-toggle="dropdown"
-
-    data-toggle="button"
-    data-toggle="buttons-checkbox"
-    data-toggle="buttons-radio"

docs/assets/js/application.js

@@ -14,28 +14,18 @@
     })
 
     // back to top
-    // setTimeout(function () {
-    //   $('.bs-docs-sidenav').affix({
-    //     offset: {
-    //       top: function () { return $window.width() <= 980 ? 290 : 210 }
-    //     , bottom: 270
-    //     }
-    //   })
-    // }, 100)
-
     setTimeout(function () {
-      $('.bs-docs-top').affix()
+      $('.bs-sidebar').affix({
+        offset: {
+          top: function () { return $window.width() <= 980 ? 290 : 210 }
+        , bottom: 270
+        }
+      })
     }, 100)
 
-    // make code pretty
-    window.prettyPrint && prettyPrint()
-
-    // add-ons
-    $('.add-on :checkbox').on('click', function () {
-      var $this = $(this)
-        , method = $this.attr('checked') ? 'addClass' : 'removeClass'
-      $(this).parents('.add-on')[method]('active')
-    })
+    setTimeout(function () {
+      $('.bs-top').affix()
+    }, 100)
 
     // add tipsies to grid for scaffolding
     if ($('#grid-system').length) {
@@ -79,22 +69,22 @@
     $('.bs-docs-carousel-example').carousel()
 
     // javascript build logic
-    var inputsComponent = $("#components.download input")
-      , inputsPlugin = $("#plugins.download input")
-      , inputsVariables = $("#variables.download input")
+    var inputsComponent = $("#less input")
+      , inputsPlugin = $("#plugins input")
+      , inputsVariables = $("#variables input")
 
     // toggle all plugin checkboxes
-    $('#components.download .toggle-all').on('click', function (e) {
+    $('#components .toggle').on('click', function (e) {
       e.preventDefault()
-      inputsComponent.attr('checked', !inputsComponent.is(':checked'))
+      inputsComponent.prop('checked', !inputsComponent.is(':checked'))
     })
 
-    $('#plugins.download .toggle-all').on('click', function (e) {
+    $('#plugins .toggle').on('click', function (e) {
       e.preventDefault()
-      inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
+      inputsPlugin.prop('checked', !inputsPlugin.is(':checked'))
     })
 
-    $('#variables.download .toggle-all').on('click', function (e) {
+    $('#variables .toggle').on('click', function (e) {
       e.preventDefault()
       inputsVariables.val('')
     })
@@ -102,16 +92,16 @@
     // request built javascript
     $('.download-btn .btn').on('click', function () {
 
-      var css = $("#components.download input:checked")
+      var css = $("#components input:checked")
             .map(function () { return this.value })
             .toArray()
-        , js = $("#plugins.download input:checked")
+        , js = $("#plugins input:checked")
             .map(function () { return this.value })
             .toArray()
         , vars = {}
         , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
 
-    $("#variables.download input")
+    $("#variables input")
       .each(function () {
         $(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
       })

docs/assets/js/bootstrap-affix.js

-/* ==========================================================
- * bootstrap-affix.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
-    this.checkPosition()
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
-
-    if (this.affixed === affix) return
-
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
-
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
-  }
-
-
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-  $.fn.affix.defaults = {
-    offset: 0
-  }
-
-
- /* AFFIX NO CONFLICT
-  * ================= */
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
- /* AFFIX DATA-API
-  * ============== */
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-        , data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
-
-      $spy.affix(data)
-    })
-  })
-
-
-}(window.jQuery);

docs/assets/js/bootstrap-carousel.js

-/* ==========================================================
- * bootstrap-carousel.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
-
-  var Carousel = function (element, options) {
-    this.$element = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options = options
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.prototype = {
-
-    cycle: function (e) {
-      if (!e) this.paused = false
-      if (this.interval) clearInterval(this.interval);
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
-
-  , getActiveIndex: function () {
-      this.$active = this.$element.find('.item.active')
-      this.$items = this.$active.parent().children()
-      return this.$items.index(this.$active)
-    }
-
-  , to: function (pos) {
-      var activeIndex = this.getActiveIndex()
-        , that = this
-
-      if (pos > (this.$items.length - 1) || pos < 0) return
-
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
-
-      if (activeIndex == pos) {
-        return this.pause().cycle()
-      }
-
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
-
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
-
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
-
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
-    }
-
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      , direction: direction
-      })
-
-      if ($next.hasClass('active')) return
-
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        this.$element.one('slid', function () {
-          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-          $nextIndicator && $nextIndicator.addClass('active')
-        })
-      }
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
-    }
-
-  }
-
-
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
- /* CAROUSEL NO CONFLICT
-  * ==================== */
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-      , slideIndex
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('carousel').pause().to(slideIndex).cycle()
-    }
-
-    e.preventDefault()
-  })
-
-}(window.jQuery);

docs/assets/js/bootstrap-modal.js

-/* =========================================================
- * bootstrap-modal.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
-
-        this.$element.trigger(e)
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
-
-          that.$element.show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
-
-          that.enforceFocus()
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
-
-        })
-      }
-
-    , hide: function (e) {
-        e && e.preventDefault()
-
-        var that = this
-
-        e = $.Event('hide')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.modal')
-
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
-
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
-
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
-        }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
-
-    , hideModal: function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-          that.removeBackdrop()
-          that.$element.trigger('hidden')
-        })
-      }
-
-    , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-      }
-
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
-
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
-
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
-
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-          this.$backdrop.addClass('in')
-
-          if (!callback) return
-
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
-
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (callback) {
-          callback()
-        }
-      }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.modal
-
-  $.fn.modal = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL NO CONFLICT
-  * ================= */
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
-      })
-    })
-
-    var $body = $(document.body)
-      .on('shown', '.modal', function () { $body.addClass('modal-open') })
-      .on('hidden', '.modal', function () { $body.removeClass('modal-open') })
-
-}(window.jQuery);

docs/assets/js/bootstrap-transition.js

-/* ===================================================
- * bootstrap-transition.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
-
-      var transitionEnd = (function () {
-
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-
-      }())
-
-      return transitionEnd && {
-        end: transitionEnd
-      }
-
-    })()
-
-  })
-
-}(window.jQuery);

docs/assets/js/bootstrap-typeahead.js

-/* =============================================================
- * bootstrap-typeahead.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function($){
-
-  "use strict"; // jshint ;_;
-
-
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.source = this.options.source
-    this.$menu = $(this.options.menu)
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.position(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu
-        .insertAfter(this.$element)
-        .css({
-          top: pos.top + pos.height
-        , left: pos.left
-        })
-        .show()
-
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('focus',    $.proxy(this.focus, this))
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , focus: function (e) {
-      this.focused = true
-    }
-
-  , blur: function (e) {
-      this.focused = false
-      if (!this.mousedover && this.shown) this.hide()
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-      this.$element.focus()
-    }
-
-  , mouseenter: function (e) {
-      this.mousedover = true
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  , mouseleave: function (e) {
-      this.mousedover = false
-      if (!this.focused && this.shown) this.hide()
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  var old = $.fn.typeahead
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD NO CONFLICT
-  * =================== */
-
-  $.fn.typeahead.noConflict = function () {
-    $.fn.typeahead = old
-    return this
-  }
-
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);

docs/examples/carousel.html

@@ -327,19 +327,19 @@ body {
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
+      <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
     </div><!-- /.col-lg-4 -->
     <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
+      <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
     </div><!-- /.col-lg-4 -->
     <div class="col col-lg-4">
       <img class="img-circle" data-src="holder.js/140x140">
       <h2>Heading</h2>
       <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
+      <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
     </div><!-- /.col-lg-4 -->
   </div><!-- /.row -->
 

docs/examples/grid.html

@@ -11,10 +11,15 @@ title: Grid template
     padding-right: 15px;
   }
 
+  h4 {
+    margin-top: 25px;
+  }
   .row {
     margin-bottom: 20px;
-    margin-left: -15px;
-    margin-right: -15px;
+  }
+  .row .row {
+    margin-top: 10px;
+    margin-bottom: 0;
   }
   [class*="col-lg-"] {
     padding-top: 15px;
@@ -51,6 +56,19 @@ title: Grid template
   </div>
 
   <h4>Full width, single column</h4>
-  <p class="text-muted">No grid classes are necessary for full-width elements.</p>
+  <p class="text-warning">No grid classes are necessary for full-width elements.</p>
+
+  <h4>Two columns with two nested columns</h4>
+  <div class="row">
+    <div class="col col-lg-8">
+      .col .col-lg-8
+      <div class="row">
+        <div class="col col-lg-6">.col .col-lg-6</div>
+        <div class="col col-lg-6">.col .col-lg-6</div>
+      </div>
+    </div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
 
 </div> <!-- /container -->

docs/examples/jumbotron.html

@@ -63,7 +63,7 @@ title: Jumbotron template
           </ul>
         </li>
       </ul>
-      <form class="navbar-form pull-right">
+      <form class="navbar-form form-inline pull-right">
         <input type="text" placeholder="Email">
         <input type="password" placeholder="Password">
         <button type="submit" class="btn">Sign in</button>
@@ -88,17 +88,17 @@ title: Jumbotron template
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
      </div>
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
     </div>
 

docs/examples/justified-nav.html

@@ -121,17 +121,17 @@ title: Justified nav template
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
      </div>
       <div class="col col-lg-4">
         <h2>Heading</h2>
         <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
-        <p><a class="btn" href="#">View details &raquo;</a></p>
+        <p><a class="btn btn-default" href="#">View details &raquo;</a></p>
       </div>
     </div>
 

js/.jshintrc

 {
-    "validthis": true,
-    "laxcomma" : true,
-    "laxbreak" : true,
-    "browser"  : true,
-    "eqnull"   : true,
-    "debug"    : true,
-    "devel"    : true,
-    "boss"     : true,
-    "expr"     : true,
-    "asi"      : true
-}
+  "validthis": true,
+  "laxcomma" : true,
+  "laxbreak" : true,
+  "browser"  : true,
+  "eqnull"   : true,
+  "debug"    : true,
+  "devel"    : true,
+  "boss"     : true,
+  "expr"     : true,
+  "asi"      : true
+}
\ No newline at end of file

js/tests/unit/bootstrap-button.js → js/tests/unit/button.js

 $(function () {
 
-    module("bootstrap-buttons")
+    module("button")
 
       test("should provide no conflict", function () {
         var button = $.fn.button.noConflict()