Merge branch 'master' into deprecate-screen-device-vars

Conflicts:
	less/variables.less

Gruntfile.js

@@ -9,9 +9,11 @@ module.exports = function(grunt) {
     // Metadata.
     pkg: grunt.file.readJSON('package.json'),
     banner: '/**\n' +
-              '* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
+              '* Bootstrap v<%= pkg.version %> by @fat and @mdo\n' +
               '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
-              '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
+              '* Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>.\n' +
+              '*\n' +
+              '* Designed and built with all the love in the world by @mdo and @fat.\n' +
               '*/\n',
     jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
 

README.md

@@ -1,4 +1,4 @@
-# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap)
+# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
 
 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).
 
@@ -65,13 +65,13 @@ When completed, you'll be able to run the various Grunt commands provided from t
 ### Available Grunt commands
 
 #### Build - `grunt`
-Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).**
+Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess] and [UglifyJS].**
 
 #### Only compile CSS and JavaScript - `grunt dist`
-`grunt dist` creates the `/dist` directory with compiled files. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).**
+`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess] and [UglifyJS].**
 
 #### Tests - `grunt test`
-Runs jshint and qunit tests headlessly in [phantomjs](https://github.com/ariya/phantomjs/) (used for CI). **Requires [phantomjs](https://github.com/ariya/phantomjs/).**
+Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).
 
 #### Watch - `grunt watch`
 This is a convenience method for watching just Less files and automatically building them whenever you save.
@@ -139,3 +139,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
 ## Copyright and license
 
 Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE).
+
+  [recess]:     http://twitter.github.io/recess/  "recess"
+  [uglifyjs]:   http://lisperator.net/uglifyjs/   "UglifyJS"
+

_config.yml

@@ -11,6 +11,7 @@ exclude:          [".editorconfig", ".gitignore", ".ruby-version", "bower.json",
 port:             9001
 
 # Custom vars
+current_version:  3.0.0
 repo:             https://github.com/twbs/bootstrap
 download:         https://github.com/twbs/bootstrap/archive/v3.0.0.zip
 download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip

_includes/nav-css.html

@@ -76,6 +76,13 @@
 </li>
 <li>
   <a href="#helper-classes">Helper classes</a>
+  <ul class="nav">
+    <li><a href="#helper-classes-close">Close icon</a></li>
+    <li><a href="#helper-classes-floats">Quick floats</a></li>
+    <li><a href="#helper-classes-clearfix">Clearfix</a></li>
+    <li><a href="#helper-classes-screen-readers">Screen reader content</a></li>
+    <li><a href="#helper-classes-image-replacement">Image replacement</a></li>
+  </ul>
 </li>
 <li>
   <a href="#responsive-utilities">Responsive utilities</a>

_layouts/default.html

@@ -58,6 +58,8 @@ <h1>{{ page.title }}</h1>
         <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>
         <ul class="footer-links">
+          <li>Currently v{{ site.current_version }}</li>
+          <li class="muted">&middot;</li>
           <li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
           <li class="muted">&middot;</li>
           <li><a href="{{ site.blog }}">Blog</a></li>

_layouts/home.html

@@ -19,7 +19,7 @@
 
       <ul class="bs-masthead-links">
         <li class="current-version">
-          Currently v3.0.0
+          Currently v{{ site.current_version }}
         </li>
         <li>
           <a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a>
@@ -36,6 +36,9 @@
         <li>
           <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>
         </li>
+        <li>
+          <a href="{{ site.blog }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Blog']);">Blog</a>
+        </li>
       </ul>
     </footer>
 

assets/css/docs.css

@@ -642,7 +642,7 @@ h1[id] {
 }
 
 /* Typography */
-.bs-example-type .table td:last-child {
+.bs-example-type .table .info {
   color: #999;
   vertical-align: middle;
 }

components.html

@@ -230,15 +230,15 @@ <h2 id="glyphicons-how-to-use">How to use</h2>
     <h2 id="glyphicons-examples">Examples</h2>
     <p>Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.</p>
     <div class="bs-example">
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group">
           <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></button>
           <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></button>
           <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></button>
           <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></button>
         </div>
       </div>
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button>
         <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button>
         <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button>
@@ -379,7 +379,7 @@ <h3 id="btn-groups-single">Basic example</h3>
     <h3 id="btn-groups-toolbar">Button toolbar</h3>
     <p>Combine sets of <code>&lt;div class="btn-group"&gt;</code> into a <code>&lt;div class="btn-toolbar"&gt;</code> for more complex components.</p>
     <div class="bs-example">
-      <div class="btn-toolbar" style="margin: 0;">
+      <div class="btn-toolbar" role="toolbar" style="margin: 0;">
         <div class="btn-group">
           <button type="button" class="btn btn-default">1</button>
           <button type="button" class="btn btn-default">2</button>
@@ -397,7 +397,7 @@ <h3 id="btn-groups-toolbar">Button toolbar</h3>
       </div>
     </div>
 {% highlight html %}
-<div class="btn-toolbar">
+<div class="btn-toolbar" role="toolbar">
   <div class="btn-group">...</div>
   <div class="btn-group">...</div>
   <div class="btn-group">...</div>
@@ -407,28 +407,28 @@ <h3 id="btn-groups-toolbar">Button toolbar</h3>
     <h3 id="btn-groups-sizing">Sizing</h3>
     <p>Instead of applying button sizing classes to every button in a group, just add <code>.btn-group-*</code> to the <code>.btn-group</code>.</p>
     <div class="bs-example">
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group btn-group-lg">
           <button type="button" class="btn btn-default">Left</button>
           <button type="button" class="btn btn-default">Middle</button>
           <button type="button" class="btn btn-default">Right</button>
         </div>
       </div>
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group">
           <button type="button" class="btn btn-default">Left</button>
           <button type="button" class="btn btn-default">Middle</button>
           <button type="button" class="btn btn-default">Right</button>
         </div>
       </div>
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group btn-group-sm">
           <button type="button" class="btn btn-default">Left</button>
           <button type="button" class="btn btn-default">Middle</button>
           <button type="button" class="btn btn-default">Right</button>
         </div>
       </div>
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group btn-group-xs">
           <button type="button" class="btn btn-default">Left</button>
           <button type="button" class="btn btn-default">Middle</button>
@@ -744,7 +744,7 @@ <h3 id="btn-dropdowns-split">Split button dropdowns</h3>
     <h3 id="btn-dropdowns-sizing">Sizing</h3>
     <p>Button dropdowns work with buttons of all sizes.</p>
     <div class="bs-example">
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group">
           <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
             Large button <span class="caret"></span>
@@ -758,7 +758,7 @@ <h3 id="btn-dropdowns-sizing">Sizing</h3>
           </ul>
         </div><!-- /btn-group -->
       </div><!-- /btn-toolbar -->
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group">
           <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
             Small button <span class="caret"></span>
@@ -772,7 +772,7 @@ <h3 id="btn-dropdowns-sizing">Sizing</h3>
           </ul>
         </div><!-- /btn-group -->
       </div><!-- /btn-toolbar -->
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group">
           <button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown">
             Extra small button <span class="caret"></span>
@@ -822,7 +822,7 @@ <h3 id="btn-dropdowns-sizing">Sizing</h3>
     <h3 id="btn-dropdowns-dropup">Dropup variation</h3>
     <p>Trigger dropdown menus above elements by adding <code>.dropup</code> to the parent.</p>
     <div class="bs-example">
-      <div class="btn-toolbar">
+      <div class="btn-toolbar" role="toolbar">
         <div class="btn-group dropup">
           <button type="button" class="btn btn-default">Dropup</button>
           <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
@@ -1163,7 +1163,7 @@ <h2 id="input-groups-buttons-segmented">Segmented buttons</h2>
 
 <div class="input-group">
   <input type="text" class="form-control">
-  <div class="input-group-btn btn-group">
+  <div class="input-group-btn">
     <!-- Button and dropdown menu -->
   </div>
 </div>