Merge branch 'master' into rtl_via_css_flip

Gruntfile.js

@@ -62,7 +62,7 @@ module.exports = function (grunt) {
 
     jscs: {
       options: {
-        config: 'js/.jscs.json',
+        config: 'js/.jscsrc'
       },
       grunt: {
         src: ['Gruntfile.js', 'grunt/*.js']
@@ -84,10 +84,18 @@ module.exports = function (grunt) {
       },
       src: [
         'dist/css/bootstrap.css',
-        'dist/css/bootstrap-theme.css',
-        'docs/assets/css/docs.css',
+        'dist/css/bootstrap-theme.css'
+      ],
+      examples: [
         'docs/examples/**/*.css'
-      ]
+      ],
+      docs: {
+        options: {
+          'ids': false,
+          'overqualified-elements': false
+        },
+        src: ['docs/assets/css/docs.css']
+      }
     },
 
     concat: {
@@ -237,6 +245,11 @@ module.exports = function (grunt) {
         cwd: 'docs/examples/',
         src: ['**/*.css'],
         dest: 'docs/examples/'
+      },
+      docs: {
+        files: {
+          'docs/assets/css/docs.css': 'docs/assets/css/docs.css'
+        }
       }
     },
 
@@ -389,7 +402,7 @@ module.exports = function (grunt) {
   grunt.registerTask('dist-js', ['concat', 'uglify']);
 
   // CSS distribution task.
-  grunt.registerTask('dist-css', ['less', 'cssmin', 'csscomb', 'usebanner']);
+  grunt.registerTask('dist-css', ['less', 'csscomb', 'cssmin', 'usebanner']);
 
   // Docs distribution task.
   grunt.registerTask('dist-docs', 'copy:docs');

_config.yml

@@ -11,7 +11,7 @@ destination:      ./_gh_pages
 host:             0.0.0.0
 port:             9001
 baseurl:          /
-url:              http://localhost:9001
+url:              http://getbootstrap.com
 encoding:         UTF-8
 
 exclude:

bower.json

 {
   "name": "bootstrap",
   "version": "3.1.1",
+  "keywords": [
+    "css",
+    "js",
+    "less",
+    "mobile-first",
+    "responsive",
+    "front-end",
+    "framework",
+    "web"
+  ],
   "main": [
     "./dist/css/bootstrap.css",
     "./dist/js/bootstrap.js",

composer.json

 {
   "name": "twbs/bootstrap",
-  "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.",
-  "keywords": ["bootstrap", "css"],
+  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
+  "keywords": [
+    "css",
+    "js",
+    "less",
+    "mobile-first",
+    "responsive",
+    "front-end",
+    "framework",
+    "web"
+  ],
   "homepage": "http://getbootstrap.com",
   "authors": [
     {

dist/css/bootstrap.css

@@ -2366,6 +2366,12 @@ input[type="button"].btn-block {
 .collapse.in {
   display: block;
 }
+tr.collapse.in {
+  display: table-row;
+}
+tbody.collapse.in {
+  display: table-row-group;
+}
 .collapsing {
   position: relative;
   height: 0;

docs/_includes/customizer-variables.html

@@ -1126,7 +1126,7 @@
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@modal-inner-padding">@modal-inner-padding</label>
-    <input id="input-@modal-inner-padding" type="text" value="20px" data-var="@modal-inner-padding" class="form-control"/>
+    <input id="input-@modal-inner-padding" type="text" value="15px" data-var="@modal-inner-padding" class="form-control"/>
     <p class="help-block">Padding applied to the modal body</p>
   </div>
   <div class="bs-customizer-input">

docs/examples/cover/cover.css

@@ -84,6 +84,7 @@ body {
 .masthead-nav > li > a:hover,
 .masthead-nav > li > a:focus {
   background-color: transparent;
+  border-bottom-color: #a9a9a9;
   border-bottom-color: rgba(255,255,255,.25);
 }
 .masthead-nav > .active > a,

docs/examples/sticky-footer-navbar/index.html

@@ -71,7 +71,7 @@
       <p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
     </div>
 
-    <div id="footer">
+    <div class="footer">
       <div class="container">
         <p class="text-muted">Place sticky footer content here.</p>
       </div>

docs/examples/sticky-footer-navbar/sticky-footer-navbar.css

@@ -8,7 +8,7 @@ body {
   /* Margin bottom by footer height */
   margin-bottom: 60px;
 }
-#footer {
+.footer {
   position: absolute;
   bottom: 0;
   width: 100%;
@@ -29,7 +29,7 @@ body > .container {
   margin: 20px 0;
 }
 
-#footer > .container {
+.footer > .container {
   padding-right: 15px;
   padding-left: 15px;
 }

docs/examples/sticky-footer/index.html

@@ -37,7 +37,7 @@
       <p>Use <a href="../sticky-footer-navbar">the sticky footer with a fixed navbar</a> if need be, too.</p>
     </div>
 
-    <div id="footer">
+    <div class="footer">
       <div class="container">
         <p class="text-muted">Place sticky footer content here.</p>
       </div>

docs/examples/sticky-footer/sticky-footer.css

@@ -8,7 +8,7 @@ body {
   /* Margin bottom by footer height */
   margin-bottom: 60px;
 }
-#footer {
+.footer {
   position: absolute;
   bottom: 0;
   width: 100%;

docs/javascript.html

@@ -65,7 +65,7 @@ $.fn.bootstrapBtn = bootstrapButton            // give $().bootstrapBtn the Boot
 {% endhighlight %}
 
   <h3 id="js-events">Events</h3>
-  <p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
+  <p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is triggered on the completion of an action.</p>
   <p>As of 3.0.0, all Bootstrap events are namespaced.</p>
   <p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p>
 {% highlight js %}

docs/migration.html

@@ -428,6 +428,7 @@ lead: "Guidance on how to upgrade from Bootstrap v2.x to v3.x with emphasis on m
     <li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>
     <li>Modal markup has changed significantly. The <code>.modal-header</code>, <code>.modal-body</code>, and <code>.modal-footer</code> sections are now wrapped in <code>.modal-content</code> and <code>.modal-dialog</code> for better mobile styling and behavior. Also, you should no longer apply <code>.hide</code> to <code>.modal</code> in your markup.</li>
     <li>As of v3.1.0, the HTML loaded by the <code>remote</code> modal option is now injected into the <code>.modal-content</code> (from v3.0.0 to v3.0.3, into the <code>.modal</code>) instead of into the <code>.modal-body</code>. This allows you to also easily vary the header and footer of the modal, not just the modal body.</li>
+    <li>The checkbox and radio features of the button.js plugin now both use <code>data-toggle="buttons"</code> instead of <code>data-toggle="buttons-checkbox"</code> or <code>data-toggle="buttons-radio"</code> in their markup.</li>
     <li>JavaScript events are namespaced. For example, to handle the modal "show" event, use <code>'show.bs.modal'</code>. For tabs "shown" use <code>'shown.bs.tab'</code>, etc.</li>
   </ul>
   <p>For more information on upgrading to v3.0, and code snippets from the community, see <a href="http://bootply.com/">Bootply</a>.</p>

docs/robots.txt

+---
+layout: nil
+---
+
+# www.robotstxt.org/
+
+# Allow crawling of all content
+User-agent: *
+Disallow:
+Sitemap: {{ site.url }}/sitemap.xml

docs/sitemap.xml

+---
+layout: nil
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>{{ site.url }}/</loc>
+    <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+    <changefreq>daily</changefreq>
+    <priority>1.0</priority>
+  </url>
+  {% for page in site.html_pages %}
+  {% if page.layout != "home" %}
+  <url>
+    <loc>{{ site.url }}{{ page.url }}</loc>
+    <lastmod>{{ site.time | date_to_xmlschema }}</lastmod>
+    <changefreq>weekly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  {% endif %}
+  {% endfor %}
+</urlset>

less/component-animations.less

@@ -5,7 +5,7 @@
 // Heads up!
 //
 // We don't use the `.opacity()` mixin here since it causes a bug with text
-// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
+// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
 
 .fade {
   opacity: 0;
@@ -17,10 +17,12 @@
 
 .collapse {
   display: none;
-  &.in {
-    display: block;
-  }
+
+  &.in      { display: block; }
+  tr&.in    { display: table-row; }
+  tbody&.in { display: table-row-group; }
 }
+
 .collapsing {
   position: relative;
   height: 0;

less/mixins.less

@@ -243,6 +243,10 @@
   -webkit-animation-direction: @direction;
           animation-direction: @direction;
 }
+.animation-fill-mode(@fill-mode) {
+  -webkit-animation-fill-mode: @fill-mode;
+          animation-fill-mode: @fill-mode;
+}
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
@@ -372,7 +376,8 @@
 
 // Retina images
 //
-// Short retina mixin for setting background-image and -size
+// Short retina mixin for setting background-image and -size. Note that the
+// spelling of `min--moz-device-pixel-ratio` is intentional.
 
 .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
   background-image: url("@{file-1x}");

package.json

 {
   "name": "bootstrap",
-  "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
+  "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
   "version": "3.1.1",
   "keywords": [
-    "bootstrap",
-    "css"
+    "css",
+    "less",
+    "mobile-first",
+    "responsive",
+    "front-end",
+    "framework",
+    "web"
   ],
   "homepage": "http://getbootstrap.com",
   "author": "Twitter, Inc.",
@@ -26,29 +31,29 @@
   },
   "devDependencies": {
     "btoa": "~1.1.1",
-    "canonical-json": "~0.0.3",
+    "canonical-json": "~0.0.4",
     "grunt": "~0.4.2",
-    "grunt-banner": "~0.2.0",
+    "grunt-banner": "~0.2.1",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "~0.7.0",
+    "grunt-contrib-connect": "~0.7.1",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-csslint": "~0.2.0",
-    "grunt-contrib-cssmin": "~0.8.0",
+    "grunt-contrib-cssmin": "~0.9.0",
     "grunt-contrib-jade": "~0.10.0",
     "grunt-contrib-jshint": "~0.8.0",
-    "grunt-contrib-less": "~0.9.0",
+    "grunt-contrib-less": "~0.10.0",
     "grunt-contrib-qunit": "~0.4.0",
-    "grunt-contrib-uglify": "~0.3.0",
+    "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-csscomb": "~2.0.1",
     "grunt-exec": "~0.4.5",
     "grunt-html-validation": "~0.1.13",
     "grunt-jekyll": "~0.4.1",
-    "grunt-jscs-checker": "~0.3.0",
-    "grunt-saucelabs": "~5.0.0",
+    "grunt-jscs-checker": "~0.4.0",
+    "grunt-saucelabs": "~5.0.1",
     "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.3.0",
+    "load-grunt-tasks": "~0.4.0",
     "markdown": "~0.5.0",
     "css-flip": "~0.3.0"
   },

test-infra/requirements.txt

-boto==2.20.0
+boto==2.25.0

test-infra/s3_cache.py

@@ -87,7 +87,7 @@ if __name__ == '__main__':
     mode, friendly_name, dependencies_file, directory = argv
 
     conn = S3Connection()
-    bucket = conn.lookup(BUCKET_NAME, validate=False)
+    bucket = conn.lookup(BUCKET_NAME)
     if bucket is None:
         raise SystemExit("Could not access bucket!")