Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'jekyll', '~> 3.3.1'
+  gem 'jekyll', '~> 3.4.0'
-  gem 'jekyll-redirect-from', '~> 0.12.0'
+  gem 'jekyll-redirect-from', '~> 0.12.1'
-  gem 'jekyll-sitemap', '~> 0.12.0'
+  gem 'jekyll-sitemap', '~> 1.0.0'
-  gem 'scss_lint', '~> 0.51.0'
+  gem 'scss_lint', '~> 0.52.0'
 end

Gemfile.lock

@@ -4,9 +4,9 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     colorator (1.1.0)
-    ffi (1.9.14)
+    ffi (1.9.17)
     forwardable-extended (2.6.0)
-    jekyll (3.3.1)
+    jekyll (3.4.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -17,15 +17,15 @@ GEM
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.12.0)
+    jekyll-redirect-from (0.12.1)
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.0)
       sass (~> 3.4)
-    jekyll-sitemap (0.12.0)
+    jekyll-sitemap (1.0.0)
       jekyll (~> 3.3)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    kramdown (1.13.1)
+    kramdown (1.13.2)
     liquid (3.0.6)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -36,12 +36,12 @@ GEM
     public_suffix (2.0.5)
     rake (12.0.0)
     rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
+    rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.23)
-    scss_lint (0.51.0)
+    scss_lint (0.52.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
 
@@ -49,10 +49,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.3.1)
+  jekyll (~> 3.4.0)
-  jekyll-redirect-from (~> 0.12.0)
+  jekyll-redirect-from (~> 0.12.1)
-  jekyll-sitemap (~> 0.12.0)
+  jekyll-sitemap (~> 1.0.0)
-  scss_lint (~> 0.51.0)
+  scss_lint (~> 0.52.0)
 
 BUNDLED WITH
    1.13.6

js/tests/vendor/qunit.css

@@ -1,12 +1,12 @@
 /*!
- * QUnit 2.0.1
+ * QUnit 2.1.1
  * https://qunitjs.com/
  *
  * Copyright jQuery Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2016-07-23T19:39Z
+ * Date: 2017-01-06T01:52Z
  */
 
 /** Font Family and Sizes */
@@ -226,7 +226,8 @@
 #qunit-tests li.running,
 #qunit-tests li.pass,
 #qunit-tests li.fail,
-#qunit-tests li.skipped {
+#qunit-tests li.skipped,
+#qunit-tests li.aborted {
 	display: list-item;
 }
 
@@ -374,6 +375,9 @@
 
 #qunit-banner.qunit-fail                    { background-color: #EE5757; }
 
+
+/*** Aborted tests */
+#qunit-tests .aborted { color: #000; background-color: orange; }
 /*** Skipped tests */
 
 #qunit-tests .skipped {
@@ -393,16 +397,28 @@
 /** Result */
 
 #qunit-testresult {
-	padding: 0.5em 1em 0.5em 1em;
-
 	color: #2B81AF;
 	background-color: #D2E0E6;
 
 	border-bottom: 1px solid #FFF;
 }
+#qunit-testresult .clearfix {
+	height: 0;
+	clear: both;
+}
 #qunit-testresult .module-name {
 	font-weight: 700;
 }
+#qunit-testresult-display {
+	padding: 0.5em 1em 0.5em 1em;
+	width: 85%;
+	float:left;
+}
+#qunit-testresult-controls {
+	padding: 0.5em 1em 0.5em 1em;
+  width: 10%;
+	float:left;
+}
 
 /** Fixture */
 

package.json

@@ -18,8 +18,8 @@
   ],
   "scripts": {
     "change-version": "node grunt/change-version.js",
-    "clean-css": "cleancss --skip-advanced --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --skip-advanced --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
+    "clean-css": "cleancss --level 1 --source-map --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --source-map --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --source-map --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css",
-    "clean-css-docs": "cleancss --skip-advanced --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
+    "clean-css-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
     "eslint": "eslint --ignore-path .eslintignore js && eslint --config js/tests/.eslintrc.json --env node grunt Gruntfile.js && eslint --config js/tests/.eslintrc.json docs/assets/js/src docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js",
     "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/",
     "htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html",
@@ -50,35 +50,35 @@
     "tether": "^1.4.0"
   },
   "devDependencies": {
-    "autoprefixer": "^6.6.1",
+    "autoprefixer": "^6.7.2",
     "babel-eslint": "^7.1.1",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
-    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-es2015": "^6.22.0",
-    "clean-css": "^3.4.23",
+    "clean-css-cli": "^4.0.0",
-    "eslint": "^3.12.2",
+    "eslint": "^3.15.0",
     "grunt": "^1.0.1",
     "grunt-babel": "^6.0.0",
     "grunt-build-control": "^0.7.1",
     "grunt-contrib-clean": "^1.0.0",
-    "grunt-contrib-compress": "^1.3.0",
+    "grunt-contrib-compress": "^1.4.1",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-qunit": "^1.2.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-exec": "^1.0.1",
-    "grunt-jekyll": "^0.4.4",
+    "grunt-jekyll": "^0.4.6",
     "grunt-saucelabs": "^9.0.0",
     "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
-    "htmllint-cli": "0.0.6",
+    "htmllint-cli": "^0.0.6",
     "is-travis": "^1.0.0",
     "load-grunt-tasks": "^3.5.2",
-    "node-sass": "^4.1.1",
+    "node-sass": "^4.5.0",
     "postcss-cli": "^2.6.0",
     "postcss-flexbugs-fixes": "^2.1.0",
-    "shelljs": "^0.7.5",
+    "shelljs": "^0.7.6",
-    "shx": "^0.2.1",
+    "shx": "^0.2.2",
     "time-grunt": "^1.4.0",
     "uglify-js": "^2.7.5"
   },