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

Conflicts:
	js/tests/unit/bootstrap-collapse.js

.editorconfig

+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab

.gitignore

@@ -13,6 +13,7 @@ _gh_pages
 *.vi
 *~
 *.sass-cache
+*.ruby-version
 
 # OS or Editor folders
 .DS_Store

.travis.yml

 language: node_js
 node_js:
-  - 0.6
+  - 0.6
\ No newline at end of file

CHANGELOG.md

@@ -357,4 +357,4 @@ Complete rewrite of the library. For full details, head to the upgrading doc at
 - Bug fixes
 
 ## v1.0.0
-- **Initial release**
+- **Initial release**
\ No newline at end of file

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Looking to contribute something to Bootstrap? **Here's how you can help.**
 We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
 
 1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
-2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test cases](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
+2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
 3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
 4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
 

LICENSE

@@ -173,4 +173,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
\ No newline at end of file

Makefile

@@ -88,8 +88,6 @@ bootstrap/css/*.css: less/*.less
 	mkdir -p bootstrap/css
 	recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
 	recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
-	recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
-	recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
 
 #
 # FONTS

README.md

-<a href="http://getbootstrap.com">
-  <img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
-</a>
-
 # [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
 
 Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
@@ -16,7 +12,7 @@ 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://twitter.github.com/bower): `bower install bootstrap`.
+* Install with Twitter's [Bower](http://github.com/bower/bower): `bower install bootstrap`.
 
 Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more.
 
@@ -55,14 +51,17 @@ $ npm install
 
 When completed, you'll be able to run the various make commands provided:
 
-#### build - `make` or `make bootstrap`
-`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. `make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
+#### Build - `make`
+`make` runs the Recess compiler to rebuild the `/less` files and compile the docs. **Requires recess and uglify-js.**
+
+#### Compile CSS, JS, and fonts - `make bootstrap`
+`make bootstrap` creates the `/bootstrap` directory with compiled files. **Requires recess and uglify-js.**
 
-#### test - `make test`
+#### Tests - `make test`
 Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.**
 
-#### watch - `make watch`
-This is a convenience method for watching just Less files and automatically building them whenever you save. **Requires the Watchr gem.**
+#### 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`.
 
@@ -72,6 +71,8 @@ Should you encounter problems with installing dependencies or running the makefi
 
 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).
 
+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).
+
 
 
 ## Community

component.json

@@ -5,4 +5,4 @@
   "dependencies": {
     "jquery": "~1.8.0"
   }
-}
+}
\ No newline at end of file

docs/_includes/colophon.html

 <!-- Footer
 ================================================== -->
 <footer class="bs-docs-footer">
-  <div class="container">
+  <div class="bs-docs-container">
 
     <div class="bs-docs-social">
       <ul class="bs-docs-social-buttons">
@@ -32,4 +32,4 @@
       <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li>
     </ul>
   </div>
-</footer>
+</footer>
\ No newline at end of file

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

@@ -35,4 +35,4 @@
     var s = document.getElementsByTagName('script')[0];
     s.parentNode.insertBefore(t, s);
   })();
-</script>
+</script>
\ No newline at end of file

docs/_includes/header.html

@@ -14,7 +14,7 @@
 <!-- Bootstrap core CSS -->
 <link href="/assets/css/bootstrap.css" rel="stylesheet">
 
-{% if page.layout == "default" %}
+{% if page.layout != "example" %}
 <!-- Documentation extras -->
 <link href="/assets/css/docs.css" rel="stylesheet">
 <link href="/assets/css/pygments-manni.css" rel="stylesheet">

docs/_includes/navbar.html

 <!-- Navbar
 ================================================== -->
-<div class="navbar navbar-fixed-top bs-docs-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="/">Bootstrap</a>
+    <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="/">Home</a>
+<!--         <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">Getting started</a>
+ -->        <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">CSS</a>
+          <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">Components</a>
+          <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">JavaScript</a>
+          <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">Customize</a>
+          <a href="/customize" data-toggle="tooltip" data-placement="right" title="Customize"><span class="glyphicon glyphicon-cog"></span></a>
         </li>
       </ul>
     </div>

docs/_layouts/default.html

@@ -5,10 +5,10 @@
     {% include header.html %}
     <!-- Place anything custom after this. -->
   </head>
-  <body class="bs-docs-body" data-spy="scroll" data-target=".bs-docs-sidebar">
+  <body class="bs-docs-docs" data-spy="scroll" data-target=".bs-docs-sidebar">
 
-    <!-- Main navbar for all docs pages. -->
-    {% include navbar.html %}
+    <!-- Docs nav -->
+    {% include docs-nav.html %}
 
     <!-- Page content of course! -->
     {{ content }}

docs/_layouts/example.html

@@ -14,4 +14,4 @@
     {% include footer.html %}
 
   </body>
-</html>
+</html>
\ No newline at end of file

docs/_layouts/home.html

+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <!-- Meta, title, CSS, favicons, etc. -->
+    {% include header.html %}
+    <!-- Place anything custom after this. -->
+  </head>
+  <body class="bs-docs-home">
+
+    <!-- Page content of course! -->
+    {{ content }}
+
+    <!-- JS and analytics only. -->
+    {% include footer.html %}
+
+  </body>
+</html>

docs/assets/js/README.md

@@ -103,4 +103,4 @@ examples:
 
     data-toggle="button"
     data-toggle="buttons-checkbox"
-    data-toggle="buttons-radio"
+    data-toggle="buttons-radio"
\ No newline at end of file

docs/assets/js/application.js

@@ -13,14 +13,18 @@
       e.preventDefault()
     })
 
-    // side bar
+    // 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-sidenav').affix({
-        offset: {
-          top: function () { return $window.width() <= 980 ? 290 : 210 }
-        , bottom: 270
-        }
-      })
+      $('.bs-docs-top').affix()
     }, 100)
 
     // make code pretty
@@ -49,6 +53,11 @@
     $('.tooltip-test').tooltip()
     $('.popover-test').popover()
 
+    $('.bs-docs-navbar').tooltip({
+      selector: "a[data-toggle=tooltip]",
+      container: ".bs-docs-navbar .nav"
+    })
+
     // popover demo
     $("a[data-toggle=popover]")
       .popover()

docs/assets/js/bootstrap-affix.js

@@ -114,4 +114,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-alert.js

@@ -96,4 +96,4 @@
 
   $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-button.js

@@ -102,4 +102,4 @@
     $btn.button('toggle')
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-carousel.js

@@ -204,4 +204,4 @@
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-collapse.js

@@ -164,4 +164,4 @@
     $(target).collapse(option)
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-scrollspy.js

@@ -97,7 +97,7 @@
         this.activeTarget = target
 
         $(this.selector)
-          .parent('.active')
+          .parents('.active')
           .removeClass('active')
 
         selector = this.selector
@@ -105,7 +105,7 @@
           + this.selector + '[href="' + target + '"]'
 
         active = $(selector)
-          .parent('li')
+          .parents('li')
           .addClass('active')
 
         if (active.parent('.dropdown-menu').length)  {
@@ -159,4 +159,4 @@
     })
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-tab.js

@@ -141,4 +141,4 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap-transition.js

@@ -57,4 +57,4 @@
 
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/bootstrap.js

@@ -57,7 +57,8 @@
 
   })
 
-}(window.jQuery);/* ==========================================================
+}(window.jQuery);
+/* ==========================================================
  * bootstrap-alert.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
@@ -155,7 +156,8 @@
 
   $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);/* ============================================================
+}(window.jQuery);
+/* ============================================================
  * bootstrap-button.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
@@ -259,7 +261,8 @@
     $btn.button('toggle')
   })
 
-}(window.jQuery);/* ==========================================================
+}(window.jQuery);
+/* ==========================================================
  * bootstrap-carousel.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
@@ -465,7 +468,8 @@
     e.preventDefault()
   })
 
-}(window.jQuery);/* =============================================================
+}(window.jQuery);
+/* =============================================================
  * bootstrap-collapse.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
@@ -631,7 +635,8 @@
     $(target).collapse(option)
   })
 
-}(window.jQuery);/* ============================================================
+}(window.jQuery);
+/* ============================================================
  * bootstrap-dropdown.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
@@ -1621,7 +1626,7 @@
         this.activeTarget = target
 
         $(this.selector)
-          .parent('.active')
+          .parents('.active')
           .removeClass('active')
 
         selector = this.selector
@@ -1629,7 +1634,7 @@
           + this.selector + '[href="' + target + '"]'
 
         active = $(selector)
-          .parent('li')
+          .parents('li')
           .addClass('active')
 
         if (active.parent('.dropdown-menu').length)  {
@@ -1683,7 +1688,8 @@
     })
   })
 
-}(window.jQuery);/* ========================================================
+}(window.jQuery);
+/* ========================================================
  * bootstrap-tab.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
@@ -1826,7 +1832,8 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);/* =============================================================
+}(window.jQuery);
+/* =============================================================
  * bootstrap-typeahead.js v3.0.0
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
@@ -2277,4 +2284,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

docs/assets/js/holder/holder.js

@@ -398,4 +398,4 @@ if ( typeof define === "function" && define.amd ) {
 	define( "Holder", [], function () { return app; } );
 }
 
-})(Holder, window);
+})(Holder, window);
\ No newline at end of file

docs/assets/js/respond/respond.min.js

@@ -3,4 +3,4 @@
 window.matchMedia=window.matchMedia||function(a){"use strict";var c,d=a.documentElement,e=d.firstElementChild||d.firstChild,f=a.createElement("body"),g=a.createElement("div");return g.id="mq-test-1",g.style.cssText="position:absolute;top:-100em",f.style.background="none",f.appendChild(g),function(a){return g.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',d.insertBefore(f,e),c=42===g.offsetWidth,d.removeChild(f),{matches:c,media:a}}}(document);
 
 /*! Respond.js v1.1.0: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
-(function(a){"use strict";function x(){u(!0)}var b={};a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,b.mediaQueriesSupported;var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var a=m.shift();v(a.href,function(b){p(b,a.href,a.media),h[a.href]=!0,setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(a){var b="clientWidth",h=d[b],k="CSS1Compat"===c.compatMode&&h||c.body[b]||h,m={},n=l[l.length-1],o=(new Date).getTime();if(a&&q&&i>o-q)return clearTimeout(r),r=setTimeout(u,i),void 0;q=o;for(var p in e)if(e.hasOwnProperty(p)){var v=e[p],w=v.minw,x=v.maxw,y=null===w,z=null===x,A="em";w&&(w=parseFloat(w)*(w.indexOf(A)>-1?t||s():1)),x&&(x=parseFloat(x)*(x.indexOf(A)>-1?t||s():1)),v.hasquery&&(y&&z||!(y||k>=w)||!(z||x>=k))||(m[v.media]||(m[v.media]=[]),m[v.media].push(f[v.rules]))}for(var B in g)g.hasOwnProperty(B)&&g[B]&&g[B].parentNode===j&&j.removeChild(g[B]);for(var C in m)if(m.hasOwnProperty(C)){var D=c.createElement("style"),E=m[C].join("\n");D.type="text/css",D.media=C,j.insertBefore(D,n.nextSibling),D.styleSheet?D.styleSheet.cssText=E:D.appendChild(c.createTextNode(E)),g.push(D)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)})(this);
+(function(a){"use strict";function x(){u(!0)}var b={};a.respond=b,b.update=function(){},b.mediaQueriesSupported=a.matchMedia&&a.matchMedia("only all").matches,b.mediaQueriesSupported;var q,r,t,c=a.document,d=c.documentElement,e=[],f=[],g=[],h={},i=30,j=c.getElementsByTagName("head")[0]||d,k=c.getElementsByTagName("base")[0],l=j.getElementsByTagName("link"),m=[],n=function(){for(var b=0;l.length>b;b++){var c=l[b],d=c.href,e=c.media,f=c.rel&&"stylesheet"===c.rel.toLowerCase();d&&f&&!h[d]&&(c.styleSheet&&c.styleSheet.rawCssText?(p(c.styleSheet.rawCssText,d,e),h[d]=!0):(!/^([a-zA-Z:]*\/\/)/.test(d)&&!k||d.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&m.push({href:d,media:e}))}o()},o=function(){if(m.length){var a=m.shift();v(a.href,function(b){p(b,a.href,a.media),h[a.href]=!0,setTimeout(function(){o()},0)})}},p=function(a,b,c){var d=a.match(/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi),g=d&&d.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+b+"$2$3")},i=!g&&c;b.length&&(b+="/"),i&&(g=1);for(var j=0;g>j;j++){var k,l,m,n;i?(k=c,f.push(h(a))):(k=d[j].match(/@media *([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1,f.push(RegExp.$2&&h(RegExp.$2))),m=k.split(","),n=m.length;for(var o=0;n>o;o++)l=m[o],e.push({media:l.split("(")[0].match(/(only\s+)?([a-zA-Z]+)\s?/)&&RegExp.$2||"all",rules:f.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(/\(min\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(/\(max\-width:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},s=function(){var a,b=c.createElement("div"),e=c.body,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",e||(e=f=c.createElement("body"),e.style.background="none"),e.appendChild(b),d.insertBefore(e,d.firstChild),a=b.offsetWidth,f?d.removeChild(e):e.removeChild(b),a=t=parseFloat(a)},u=function(a){var b="clientWidth",h=d[b],k="CSS1Compat"===c.compatMode&&h||c.body[b]||h,m={},n=l[l.length-1],o=(new Date).getTime();if(a&&q&&i>o-q)return clearTimeout(r),r=setTimeout(u,i),void 0;q=o;for(var p in e)if(e.hasOwnProperty(p)){var v=e[p],w=v.minw,x=v.maxw,y=null===w,z=null===x,A="em";w&&(w=parseFloat(w)*(w.indexOf(A)>-1?t||s():1)),x&&(x=parseFloat(x)*(x.indexOf(A)>-1?t||s():1)),v.hasquery&&(y&&z||!(y||k>=w)||!(z||x>=k))||(m[v.media]||(m[v.media]=[]),m[v.media].push(f[v.rules]))}for(var B in g)g.hasOwnProperty(B)&&g[B]&&g[B].parentNode===j&&j.removeChild(g[B]);for(var C in m)if(m.hasOwnProperty(C)){var D=c.createElement("style"),E=m[C].join("\n");D.type="text/css",D.media=C,j.insertBefore(D,n.nextSibling),D.styleSheet?D.styleSheet.cssText=E:D.appendChild(c.createTextNode(E)),g.push(D)}},v=function(a,b){var c=w();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},w=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}();n(),b.update=n,a.addEventListener?a.addEventListener("resize",x,!1):a.attachEvent&&a.attachEvent("onresize",x)})(this);
\ No newline at end of file

docs/examples/grid.html

+---
+layout: example
+title: Grid template
+---
+
+<!-- Custom styles for this template -->
+<style>
+
+  .container {
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+
+  .row {
+    margin-bottom: 20px;
+    margin-left: -15px;
+    margin-right: -15px;
+  }
+  [class*="col-lg-"] {
+    padding-top: 15px;
+    padding-bottom: 15px;
+    background-color: #f5f5f5;
+    border: 1px solid #e5e5e5;
+  }
+</style>
+
+
+<div class="container">
+
+  <h2>Bootstrap grids</h2>
+  <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+
+  <h4>Three equal columns</h4>
+  <div class="row">
+    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Three unequal columns</h4>
+  <div class="row">
+    <div class="col col-lg-3">.col .col-lg-3</div>
+    <div class="col col-lg-6">.col .col-lg-6</div>
+    <div class="col col-lg-3">.col .col-lg-3</div>
+  </div>
+
+  <h4>Two columns</h4>
+  <div class="row">
+    <div class="col col-lg-8">.col .col-lg-8</div>
+    <div class="col col-lg-4">.col .col-lg-4</div>
+  </div>
+
+  <h4>Full width, single column</h4>
+  <p class="text-muted">No grid classes are necessary for full-width elements.</p>
+
+</div> <!-- /container -->

docs/examples/jumbotron-narrow.html

@@ -94,7 +94,7 @@ title: Narrow page template
       <li><a href="#">About</a></li>
       <li><a href="#">Contact</a></li>
     </ul>
-    <h3 class="muted">Project name</h3>
+    <h3 class="text-muted">Project name</h3>
   </div>
 
   <div class="jumbotron">
@@ -104,7 +104,7 @@ title: Narrow page template
   </div>
 
   <div class="row marketing">
-    <div class="col-span-6">
+    <div class="col col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 
@@ -115,7 +115,7 @@ title: Narrow page template
       <p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
     </div>
 
-    <div class="col-span-6">
+    <div class="col col-lg-6">
       <h4>Subheading</h4>
       <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
 

docs/examples/jumbotron.html

@@ -46,7 +46,7 @@ title: Jumbotron template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>
@@ -85,17 +85,17 @@ title: Jumbotron template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col-span-4">
+      <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>
       </div>
-      <div class="col-span-4">
+      <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>
      </div>
-      <div class="col-span-4">
+      <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>

docs/examples/justified-nav.html

@@ -42,7 +42,7 @@ title: Justified nav template
     border-radius: 5px;
     border: 1px solid #ccc;
   }
-  .nav-justified li a {
+  .nav-justified > li > a {
     padding-top: 15px;
     padding-bottom: 15px;
     color: #777;
@@ -60,17 +60,17 @@ title: Justified nav template
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
     background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
   }
-  .nav-justified .active a {
+  .nav-justified > .active > a {
     background-color: #ddd;
     background-image: none;
     box-shadow: inset 0 3px 7px rgba(0,0,0,.15);
   }
-  .nav-justified li:first-child a {
+  .nav-justified > li:first-child > a {
     border-left: 0;
     border-top-left-radius: 5px;
     border-bottom-left-radius: 5px;
   }
-  .nav-justified li:last-child a {
+  .nav-justified > li:last-child > a {
     border-right: 0;
     border-top-right-radius: 5px;
     border-bottom-right-radius: 5px;
@@ -86,7 +86,6 @@ title: Justified nav template
       padding-left: 0;
       padding-right: 0;
     }
-    /* Make the nav on the same line */
   }
 
 </style>
@@ -96,8 +95,8 @@ title: Justified nav template
 <div class="container">
 
   <div class="masthead">
-    <h3 class="muted">Project name</h3>
-    <ul class="nav nav-justified">
+    <h3 class="text-muted">Project name</h3>
+    <ul class="nav navbar-nav nav-justified">
       <li class="active"><a href="#">Home</a></li>
       <li><a href="#">Projects</a></li>
       <li><a href="#">Services</a></li>
@@ -119,17 +118,17 @@ title: Justified nav template
 
     <!-- Example row of columns -->
     <div class="row">
-      <div class="col-span-4">
+      <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>
       </div>
-      <div class="col-span-4">
+      <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>
      </div>
-      <div class="col-span-4">
+      <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>

docs/examples/navbar-fixed-top.html

@@ -27,7 +27,7 @@ title: Fixed navbar template
         </a>
         <a class="navbar-brand" href="#">Project name</a>
         <div class="nav-collapse collapse">
-          <ul class="nav">
+          <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
             <li><a href="#contact">Contact</a></li>
@@ -44,7 +44,7 @@ title: Fixed navbar template
               </ul>
             </li>
           </ul>
-          <ul class="nav pull-right">
+          <ul class="nav navbar-nav pull-right">
             <li><a href="/examples/navbar/">Default</a></li>
             <li><a href="/examples/navbar-static-top/">Static top</a></li>
             <li class="active"><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
@@ -60,7 +60,7 @@ title: Fixed navbar template
         <h1>Navbar example</h1>
         <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
         <p>
-          <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+          <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
         </p>
       </div>
 

docs/examples/navbar-static-top.html

@@ -23,7 +23,7 @@ title: Static navbar template
     </a>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>
@@ -40,11 +40,11 @@ title: Static navbar template
           </ul>
         </li>
       </ul>
-    <ul class="nav pull-right">
-      <li><a href="/examples/navbar/">Default</a></li>
-      <li class="active"><a href="/examples/navbar-static-top/">Static top</a></li>
-      <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
-    </ul>
+      <ul class="nav navbar-nav pull-right">
+        <li><a href="/examples/navbar/">Default</a></li>
+        <li class="active"><a href="/examples/navbar-static-top/">Static top</a></li>
+        <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
+      </ul>
     </div><!--/.nav-collapse -->
   </div>
 </div>
@@ -57,7 +57,7 @@ title: Static navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 

docs/examples/navbar.html

@@ -29,7 +29,7 @@ title: Navbar template
       </a>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <ul class="nav navbar-nav">
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#about">About</a></li>
           <li><a href="#contact">Contact</a></li>
@@ -46,7 +46,7 @@ title: Navbar template
             </ul>
           </li>
         </ul>
-        <ul class="nav pull-right">
+        <ul class="nav navbar-nav pull-right">
           <li class="active"><a href="/examples/navbar/">Default</a></li>
           <li><a href="/examples/navbar-static-top/">Static top</a></li>
           <li><a href="/examples/navbar-fixed-top/">Fixed top</a></li>
@@ -60,7 +60,7 @@ title: Navbar template
     <h1>Navbar example</h1>
     <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
     <p>
-      <a class="btn btn-large btn-primary" href="../../components/#navbar">View navbar docs &raquo;</a>
+      <a class="btn btn-large btn-primary" href="../../docs/#navbar">View navbar docs &raquo;</a>
     </p>
   </div>
 

docs/examples/signin.html

@@ -13,8 +13,8 @@ title: Sign in form template
   }
 
   .form-signin {
-    max-width: 300px;
-    padding: 30px;
+    max-width: 330px;
+    padding: 15px;
     margin: 0 auto;
   }
   .form-signin .form-signin-heading,

docs/examples/starter-template.html

@@ -24,7 +24,7 @@ title: Starter template
     </button>
     <a class="navbar-brand" href="#">Project name</a>
     <div class="nav-collapse collapse">
-      <ul class="nav">
+      <ul class="nav navbar-nav">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="#contact">Contact</a></li>

docs/examples/sticky-footer-navbar.html

@@ -22,14 +22,13 @@ title: Sticky footer with navbar template
     height: 100%;
     /* Negative indent footer by its height */
     margin: 0 auto -60px;
+    /* Pad bottom by footer height */
+    padding: 0 0 60px;
   }
 
   /* Set the fixed height of the footer here */
-  #push,
   #footer {
     height: 60px;
-  }
-  #footer {
     background-color: #f5f5f5;
   }
 
@@ -50,7 +49,7 @@ title: Sticky footer with navbar template
   /* Not required for template or sticky footer method. */
 
   #wrap > .container {
-    padding-top: 60px;
+    padding: 60px 15px 0;
   }
   .container .credit {
     margin: 20px 0;
@@ -77,7 +76,7 @@ title: Sticky footer with navbar template
       </button>
       <a class="navbar-brand" href="#">Project name</a>
       <div class="nav-collapse collapse">
-        <ul class="nav">
+        <ul class="nav navbar-nav">
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#about">About</a></li>
           <li><a href="#contact">Contact</a></li>
@@ -104,14 +103,12 @@ title: Sticky footer with navbar template
       <h1>Sticky footer with fixed navbar</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within <code>#wrap</code> with <code>padding-top: 60px;</code> on the <code>.container</code>.</p>
-    <p>Back to <a href="./sticky-footer.html">the default sticky footer</a> minus the navbar.</p>
+    <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
   </div>
-
-  <div id="push"></div>
 </div>
 
 <div id="footer">
   <div class="container">
-    <p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+    <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
   </div>
 </div>

docs/examples/sticky-footer.html

@@ -22,14 +22,13 @@ title: Sticky footer template
     height: 100%;
     /* Negative indent footer by its height */
     margin: 0 auto -60px;
+    /* Pad bottom by footer height */
+    padding: 0 0 60px;
   }
 
   /* Set the fixed height of the footer here */
-  #push,
   #footer {
     height: 60px;
-  }
-  #footer {
     background-color: #f5f5f5;
   }
 
@@ -50,6 +49,7 @@ title: Sticky footer template
   .container {
     width: auto;
     max-width: 680px;
+    padding: 0 15px;
   }
   .container .credit {
     margin: 20px 0;
@@ -68,14 +68,12 @@ title: Sticky footer template
       <h1>Sticky footer</h1>
     </div>
     <p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
-    <p>Use <a href="./sticky-footer-navbar.html">the sticky footer with a fixed navbar</a> if need be, too.</p>
+    <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
   </div>
-
-  <div id="push"></div>
 </div>
 
 <div id="footer">
   <div class="container">
-    <p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
+    <p class="text-muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
   </div>
 </div>

docs/index.html

 ---
-layout: default
+layout: home
 title: Bootstrap
 ---
 
 <div class="bs-docs-jumbotron masthead">
   <div class="container">
+
     <h1>Bootstrap</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
     <p>
       <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
+      <a href="./docs/" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Docs', 'View docs']);">View docs</a>
     </p>
+
+    <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>
+
     <ul class="masthead-links">
+      <li>
+        <a href="./customize/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);">Customize</a>
+      </li>
       <li>
         <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
       </li>
       <li>
-        <a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+        <a href="./docs/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+      </li>
+      <li>
+        <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
       </li>
       <li>Version 3.0.0</li>
     </ul>
-  </div>
-</div>
-
-<div class="container">
-
-  <div class="bs-docs-marketing">
-
-    <h1>Introducing Bootstrap.</h1>
-    <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
-
-    <div class="row">
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-twitter-github.png">
-        <h2>By nerds, for nerds.</h2>
-        <p>Built at Twitter by <a href="http://twitter.com/mdo">@mdo</a> and <a href="http://twitter.com/fat">@fat</a>, Bootstrap utilizes <a href="http://lesscss.org">LESS CSS</a>, is compiled via <a href="http://nodejs.org">Node</a>, and is managed through <a href="http://github.com">GitHub</a> to help nerds do awesome stuff on the web.</p>
-      </div>
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-responsive-illustrations.png">
-        <h2>Made for everyone.</h2>
-        <p>Bootstrap 3 has been rebuilt from the ground up to push the Web forward. It looks and behaves great on the latest smartphones, tablets, and desktops (including support for IE8+).</p>
-      </div>
-      <div class="col-span-4">
-        <img class="marketing-img" src="assets/img/bs-docs-bootstrap-features.png">
-        <h2>Packed with features.</h2>
-        <p>A 12-column responsive <a href="./css/#grid-system">grid</a>, dozens of components, <a href="./javascript/">JavaScript plugins</a>, typography, form controls, and even a <a href="./customize/">web-based Customizer</a> to make Bootstrap your own.</p>
-      </div>
-    </div>
-
-    <h1>Built with Bootstrap.</h1>
-    <p class="marketing-byline">For more sites built with Bootstrap, <a href="http://expo.getbootstrap.com">visit the Expo</a> or <a href="./getting-started/#examples">browse the examples</a>.</p>
-    <div class="row bs-docs-gallery">
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://delicious.com" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/delicious.jpg" alt="Delicious">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="https://yourkarma.com" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/karma.jpg" alt="Karma">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://soundready.fm/" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/soundready.jpg" alt="SoundReady">
-        </a>
-      </div>
-      <div class="col-span-3">
-        <a class="thumbnail" href="http://kippt.com/" target="_blank">
-          <img src="http://expo.getbootstrap.com/screenshots/kippt.jpg" alt="Kippt">
-        </a>
-      </div>
-    </div>
 
   </div>
-
 </div>

js/.jshintrc

@@ -9,4 +9,4 @@
     "boss"     : true,
     "expr"     : true,
     "asi"      : true
-}
+}
\ No newline at end of file

js/bootstrap-affix.js

@@ -114,4 +114,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-alert.js

@@ -96,4 +96,4 @@
 
   $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-button.js

@@ -102,4 +102,4 @@
     $btn.button('toggle')
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-carousel.js

@@ -204,4 +204,4 @@
     e.preventDefault()
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-collapse.js

@@ -170,4 +170,4 @@
     $(target).collapse(option)
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-scrollspy.js

@@ -97,7 +97,7 @@
         this.activeTarget = target
 
         $(this.selector)
-          .parent('.active')
+          .parents('.active')
           .removeClass('active')
 
         selector = this.selector
@@ -105,7 +105,7 @@
           + this.selector + '[href="' + target + '"]'
 
         active = $(selector)
-          .parent('li')
+          .parents('li')
           .addClass('active')
 
         if (active.parent('.dropdown-menu').length)  {
@@ -159,4 +159,4 @@
     })
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-tab.js

@@ -141,4 +141,4 @@
     $(this).tab('show')
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/bootstrap-transition.js

@@ -57,4 +57,4 @@
 
   })
 
-}(window.jQuery);
+}(window.jQuery);
\ No newline at end of file

js/tests/index.html

@@ -53,4 +53,4 @@
     <div id="qunit-fixture"></div>
   </div>
 </body>
-</html>
+</html>
\ No newline at end of file

js/tests/phantom.js

@@ -60,4 +60,4 @@ page.open(phantom.args[0], function(status){
       phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0)
     })
   }
-})
+})
\ No newline at end of file

js/tests/server.js

@@ -11,4 +11,4 @@ var connect = require('connect')
 
 http.createServer(app).listen(3000);
 
-fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
+fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
\ No newline at end of file

js/tests/unit/bootstrap-affix.js

@@ -22,4 +22,4 @@ $(function () {
         ok(!$affix.hasClass('affix'), 'affix class was not added')
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-alert.js

@@ -59,4 +59,4 @@ $(function () {
           .alert('close')
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-button.js

@@ -99,4 +99,4 @@ $(function () {
         ok(btn2.hasClass('active'), 'btn2 has active class')
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-carousel.js

@@ -78,4 +78,4 @@ $(function () {
         ok($('#myCarousel').data('carousel').options.interval == 1814, "attributes should be read only on intitialization");
         $('#myCarousel').remove();
       })
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-dropdown.js

@@ -148,4 +148,4 @@ $(function () {
         $("#qunit-fixture").html("")
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-modal.js

@@ -134,4 +134,4 @@ $(function () {
           })
           .modal("show")
       })
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-phantom.js

@@ -18,4 +18,4 @@ QUnit.done = function (opts) {
   console.log("\n================================================")
   console.log("Tests completed in " + opts.runtime + " milliseconds")
   console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
-}
+}
\ No newline at end of file

js/tests/unit/bootstrap-popover.js

@@ -110,4 +110,4 @@ $(function () {
         ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-scrollspy.js

@@ -34,4 +34,4 @@ $(function () {
         ok($topbar.find('.active', true))
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-tab.js

@@ -83,4 +83,4 @@ $(function () {
           }).tab('show')
       })
 
-})
+})
\ No newline at end of file

js/tests/unit/bootstrap-transition.js

@@ -10,4 +10,4 @@ $(function () {
         ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
       })
 
-})
+})
\ No newline at end of file

js/tests/vendor/qunit.css

@@ -229,4 +229,4 @@
 
 #qunit-fixture {
   display:none;
-}
+}
\ No newline at end of file

js/tests/vendor/qunit.js

@@ -1507,4 +1507,4 @@ QUnit.diff = (function() {
 	};
 })();
 
-})(this);
+})(this);
\ No newline at end of file

less/alerts.less

@@ -9,10 +9,10 @@
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: @line-height-base;
-  color: @state-warning-text;
-  background-color: @state-warning-background;
-  border: 1px solid @state-warning-border;
-  border-radius: @border-radius-base;
+  color: @alert-text;
+  background-color: @alert-bg;
+  border: 1px solid @alert-border;
+  border-radius: @alert-border-radius;
 
   // Headings for larger alerts
   h4 {
@@ -22,63 +22,61 @@
   }
   // Match the hr to the border of the alert
   hr {
-    border-top-color: darken(@state-warning-border, 5%);
+    border-top-color: darken(@alert-border, 5%);
   }
   // Inherit color for immediate links and bolden them some
   > a,
   > p > a {
     font-weight: 500;
-    color: darken(@state-warning-text, 10%);
+    color: darken(@alert-text, 10%);
   }
-}
 
-// Adjust close link position
-.close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: @line-height-base;
-  color: inherit;
+  // Adjust close link position
+  .close {
+    position: relative;
+    top: -2px;
+    right: -21px;
+    color: inherit;
+  }
 }
 
 // Alternate styles
 // -------------------------
 
 .alert-success {
-  background-color: @state-success-background;
-  border-color: @state-success-border;
-  color: @state-success-text;
+  background-color: @alert-success-bg;
+  border-color: @alert-success-border;
+  color: @alert-success-text;
   hr {
-    border-top-color: darken(@state-success-border, 5%);
+    border-top-color: darken(@alert-success-border, 5%);
   }
   > a,
   > p > a {
-    color: darken(@state-success-text, 10%);
+    color: darken(@alert-success-text, 10%);
   }
 }
-.alert-danger,
-.alert-error {
-  background-color: @state-error-background;
-  border-color: @state-error-border;
-  color: @state-error-text;
+.alert-danger {
+  background-color: @alert-danger-bg;
+  border-color: @alert-danger-border;
+  color: @alert-danger-text;
   hr {
-    border-top-color: darken(@state-error-border, 5%);
+    border-top-color: darken(@alert-danger-border, 5%);
   }
   > a,
   > p > a {
-    color: darken(@state-error-text, 10%);
+    color: darken(@alert-danger-text, 10%);
   }
 }
 .alert-info {
-  background-color: @state-info-background;
-  border-color: @state-info-border;
-  color: @state-info-text;
+  background-color: @alert-info-bg;
+  border-color: @alert-info-border;
+  color: @alert-info-text;
   hr {
-    border-top-color: darken(@state-info-border, 5%);
+    border-top-color: darken(@alert-info-border, 5%);
   }
   > a,
   > p > a {
-    color: darken(@state-info-text, 10%);
+    color: darken(@alert-info-text, 10%);
   }
 }
 

less/badges.less

@@ -8,14 +8,14 @@
   display: inline-block;
   min-width: 10px;
   padding: 3px 7px;
-  font-size: 12px;
+  font-size: @font-size-small;
   font-weight: bold;
   color: #fff;
   line-height: 1;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: @grayLight;
+  background-color: @gray-light;
   border-radius: 10px;
 
   // Empty labels/badges collapse
@@ -48,7 +48,7 @@ a.badge {
 }
 
 // Account for counters in navs
-.nav-list > .active > a > .badge,
+a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
   color: @link-color;
   background-color: #fff;