Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less

Gruntfile.js

@@ -176,7 +176,7 @@ module.exports = function (grunt) {
           'Android >= 4',
           'Chrome >= 20',
           'Firefox >= 24', // Firefox 24 is the latest ESR
-          'Explorer >= 8',
+          'Explorer >= 9',
           'iOS >= 6',
           'Opera >= 12',
           'Safari >= 6'
@@ -199,6 +199,20 @@ module.exports = function (grunt) {
       }
     },
 
+    lesslint: {
+      src: [
+        'less/bootstrap.less'
+      ],
+      options: {
+        csslint: {
+          csslintrc: 'less/.csslintrc'
+        },
+        imports: {
+          imports: 'less/*.less'
+        }
+      }
+    },
+
     csslint: {
       options: {
         csslintrc: 'less/.csslintrc'
@@ -397,7 +411,7 @@ module.exports = function (grunt) {
   var testSubtasks = [];
   // Skip core tests if running a different subset of the test suite
   if (runSubset('core')) {
-    testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit']);
+    testSubtasks = testSubtasks.concat(['lesslint', 'dist-css', 'jshint', 'jscs', 'qunit']);
   }
   // Skip HTML validation if running a different subset of the test suite
   if (runSubset('validate-html') &&
@@ -433,7 +447,8 @@ module.exports = function (grunt) {
   grunt.registerTask('build', ['clean', 'less-compile', 'autoprefixer:core', 'autoprefixer:docs', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs', 'concat', 'uglify:bootstrap', 'dist-docs']);
 
   // Default task.
-  grunt.registerTask('default', ['test', 'dist']);
+  // grunt.registerTask('default', ['test', 'dist']);
+  grunt.registerTask('default', ['dist']);
 
   // Version numbering task.
   // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z

docs/_includes/customize-nav.html

@@ -1,5 +1,6 @@
 
 <!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
+<li><a href="#import">Import</a></li>
 <li><a href="#less">Less components</a></li>
 <li><a href="#plugins">jQuery plugins</a></li>
 <li><a href="#less-variables">Less variables</a>

docs/browser-bugs.md

@@ -36,6 +36,12 @@ We publicly list browser bugs that are impacting us here, in the hopes of expedi
         <td><a href="{{ site.bug.firefox }}975632">Mozilla bug #975632</a></td>
         <td><a href="{{ site.bug.github }}10690">#10690</a></td>
       </tr>
+      <tr>
+        <td>Firefox</td>
+        <td>Java applets that are descendants of elements with forced hardware acceleration using <code>translate3d(0,0,0)</code> are invisible on Windows</td>
+        <td><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1048279">Mozilla bug #1048279</a></td>
+        <td><a href="https://github.com/twbs/bootstrap/issues/14124">#14124</a></td>
+      </tr>
       <tr>
         <td>Chrome</td>
         <td>Weird button behavior with some number <code>&lt;input&gt;</code>s</td>

docs/dist/css/bootstrap.css

@@ -2511,6 +2511,7 @@ fieldset[disabled] .btn-danger.active {
 }
 .btn-link,
 .btn-link:active,
+.btn-link.active,
 .btn-link[disabled],
 fieldset[disabled] .btn-link {
   background-color: transparent;
@@ -4902,9 +4903,9 @@ button.close {
 }
 @media all and (transform-3d), (-webkit-transform-3d) {
   .carousel-inner > .item {
-    -webkit-transition: -webkit-transform(.6s ease-in-out);
+    -webkit-transition: -webkit-transform .6s ease-in-out;
-         -o-transition:      -o-transform(.6s ease-in-out);
+         -o-transition:      -o-transform .6s ease-in-out;
-            transition:         transform(.6s ease-in-out);
+            transition:         transform .6s ease-in-out;
 
     -webkit-backface-visibility: hidden;
             backface-visibility: hidden;

docs/javascript/overview.md

@@ -56,6 +56,13 @@ $('#myModal').modal('show')                // initializes and invokes show immed
 
 Each plugin also exposes its raw constructor on a `Constructor` property: `$.fn.popover.Constructor`. If you'd like to get a particular plugin instance, retrieve it directly from an element: `$('[rel="popover"]').data('popover')`.
 
+#### Default settings
+You can change the default settings for a plugin by modifying the plugin's `Constructor.DEFAULTS` object:
+
+{% highlight js %}
+$.fn.modal.Constructor.DEFAULTS.keyboard = false // changes default for the modal plugin's `keyboard` option to false
+{% endhighlight %}
+
 ### No conflict
 
 Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call `.noConflict` on the plugin you wish to revert the value of.

less/.csslintrc

@@ -3,6 +3,7 @@
   "box-sizing": false,
   "box-model": false,
   "compatible-vendor-prefixes": false,
+  "fallback-colors": false,
   "floats": false,
   "font-sizes": false,
   "gradients": false,

less/buttons.less

@@ -88,6 +88,7 @@
 
   &,
   &:active,
+  &.active,
   &[disabled],
   fieldset[disabled] & {
     background-color: transparent;

less/carousel.less

@@ -27,7 +27,7 @@
 
     // WebKit CSS3 transforms for supported devices
     @media all and (transform-3d), (-webkit-transform-3d) {
-      transition: transform(0.6s ease-in-out);
+      transition: transform .6s ease-in-out;
       backface-visibility: hidden;
       perspective: 1000;
 

package.json

@@ -52,6 +52,7 @@
     "grunt-html-validation": "~0.1.18",
     "grunt-jekyll": "~0.4.2",
     "grunt-jscs": "~0.6.1",
+    "grunt-lesslint": "~0.17.0",
     "grunt-saucelabs": "~8.2.0",
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~0.6.0",