From 045888fa3887f5e65658499da11c8ad737222759 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 6 Jan 2017 08:38:04 -0800
Subject: version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 0f08dfa1c..4773a3ffe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bootstrap",
   "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.6",
   "keywords": [
     "css",
     "sass",
-- 
cgit v1.2.3


From cdf73209df37016210e0ac91282b84b554ec6d7d Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Sat, 7 Jan 2017 16:22:23 +1100
Subject: Fix incorrect docs.min.js bundle source.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4773a3ffe..69c7f6223 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss",
     "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
     "uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
-    "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/*.js docs/assets/js/src/application.js",
+    "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
     "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
     "test": "npm run eslint && grunt test"
   },
-- 
cgit v1.2.3


From 4fa7749442ea7ab609d1c8c25dc4ba750194e542 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 21 Jan 2017 14:14:25 -0800
Subject: Drop Normalize, port relevant parts to Reboot (#21741)

* Get this party started by removing mention of Normalize.css

* Nuke the old comment, consolidate to a single line and number as appropriate

* Bring over styles for HTML element from Normalize to Reboot

* Move margin override for body element from Normalize to Reboot

* Drop the block reset for HTML5 elements in IE9- from Normalize given we dropped IE9 support

* Building on previous commit, do the same thing for figure, figcaption, and main

* Remove IE9- display from Normalize given our browser support

* Drop IE8 figure margin because we're IE10+

* No need for the h1 overrides because we reset these font and margin styles anyway in _type.scss already

* Drop Safari 6 b and strong normalization because we're Safari 8+

* Remove mark styles for IE9- from Normalize

* Remove old iOS audio fixes from Normalize

* Remove IE9- display for progress from Normalize

* Remove more IE9- rules from Normalize

* One more IE9- display removal for canvas element

* Move pre overrides from Normalize to Reboot

* Move over some link resets to Reboot, drop others

- Move over background-color and text-decoration
- Drop focus outline change given it affects the offset on hover of
focused links

* Move over more code element resets, consolidate with pre overrides, too

* Move over sub and sup wholesale

* Move over img normalization to Reboot

* Move over SVG override too

* - Drop dupe hidden, but add comment for it
- Move over template
- Move over summary

* Remove bulk of @viewport comment

* edit down that code comment

* consolidate html-based normalizations

* update comments

* Consolidate abbr styles

* move over more type elements

* move over hr changes

* move over form controls and more

* move over button resets

* move over firefox button changes

* move over search changes and more

* we nuke all these styles for fieldsets anyway, so outright remove them

* no need for those, we override them

* move over legend, fieldset, progress

* line break

* delete normalize file

* linting

* update comment

* clarify docs mentions of normalize and reboot

* remove normalize excludes from linter

* remove normalize excludes from cli task

* linting

* callout license since we forked part of normalize

* Improve comments, move table background reset to .table class instead of in reboot

* trailing space
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 69c7f6223..ae913bbc1 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
     "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "sass-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
-    "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude scss/_normalize.scss scss/*.scss",
+    "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
     "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
     "uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
     "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
-- 
cgit v1.2.3


From c5a9ebf57635cdf5096e76be961a05367edd3ddf Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Mon, 23 Jan 2017 20:38:34 +1100
Subject: Move htmllint to npm script.

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ae913bbc1..4a5aac3db 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "clean-css-docs": "cleancss --skip-advanced --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",
     "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css",
     "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
     "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
@@ -66,11 +67,11 @@
     "grunt-contrib-qunit": "^1.2.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-exec": "^1.0.1",
-    "grunt-html": "^8.1.0",
     "grunt-jekyll": "^0.4.4",
     "grunt-saucelabs": "^9.0.0",
     "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
+    "htmllint-cli": "0.0.6",
     "is-travis": "^1.0.0",
     "load-grunt-tasks": "^3.5.2",
     "node-sass": "^4.1.1",
-- 
cgit v1.2.3


From cb87eebcbb2a585b366934f8efff988f1c0e7e57 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Sun, 5 Feb 2017 23:39:16 +1100
Subject: Update dependencies.

---
 package.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4a5aac3db..130c45cb4 100644
--- a/package.json
+++ b/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-docs": "cleancss --skip-advanced --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.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 --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",
-    "clean-css": "^3.4.23",
-    "eslint": "^3.12.2",
+    "babel-preset-es2015": "^6.22.0",
+    "clean-css-cli": "^4.0.0",
+    "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",
-    "shx": "^0.2.1",
+    "shelljs": "^0.7.6",
+    "shx": "^0.2.2",
     "time-grunt": "^1.4.0",
     "uglify-js": "^2.7.5"
   },
-- 
cgit v1.2.3


From db23b1f32e277e0e39485284f4007e8c19a31cf6 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Sat, 25 Feb 2017 16:32:18 +1100
Subject: Move Jekyll to npm script.

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 130c45cb4..f468ed858 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,8 @@
     "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",
+    "jekyll": "bundle exec jekyll build",
+    "jekyll-github": "shx echo 'github: true' > $npm_config_tmp/twbsjekyll.yml && npm run jekyll -- --config _config.yml,$npm_config_tmp/twbsjekyll.yml && shx rm $npm_config_tmp/twbsjekyll.yml",
     "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css",
     "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
     "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
@@ -67,7 +69,6 @@
     "grunt-contrib-qunit": "^1.2.0",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-exec": "^1.0.1",
-    "grunt-jekyll": "^0.4.6",
     "grunt-saucelabs": "^9.0.0",
     "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
-- 
cgit v1.2.3


From 348c770a6cea18db1c0876b8820342e7400e0602 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Sun, 12 Mar 2017 03:32:50 +0000
Subject: Update dependencies.

---
 package.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index f468ed858..a354ab722 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
     "htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html",
     "jekyll": "bundle exec jekyll build",
     "jekyll-github": "shx echo 'github: true' > $npm_config_tmp/twbsjekyll.yml && npm run jekyll -- --config _config.yml,$npm_config_tmp/twbsjekyll.yml && shx rm $npm_config_tmp/twbsjekyll.yml",
-    "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css",
-    "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
+    "postcss": "postcss --config grunt/ --replace dist/css/*.css",
+    "postcss-docs": "postcss --config grunt/ --replace docs/assets/css/docs.min.css && postcss --config grunt/ --replace docs/examples/**/*.css",
     "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "sass-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
     "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
@@ -52,12 +52,12 @@
     "tether": "^1.4.0"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.2",
+    "autoprefixer": "^6.7.7",
     "babel-eslint": "^7.1.1",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
     "babel-preset-es2015": "^6.22.0",
-    "clean-css-cli": "^4.0.0",
-    "eslint": "^3.15.0",
+    "clean-css-cli": "^4.0.8",
+    "eslint": "^3.17.1",
     "grunt": "^1.0.1",
     "grunt-babel": "^6.0.0",
     "grunt-build-control": "^0.7.1",
@@ -66,9 +66,9 @@
     "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-qunit": "^1.3.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-exec": "^1.0.1",
+    "grunt-exec": "^2.0.0",
     "grunt-saucelabs": "^9.0.0",
     "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
@@ -76,12 +76,12 @@
     "is-travis": "^1.0.0",
     "load-grunt-tasks": "^3.5.2",
     "node-sass": "^4.5.0",
-    "postcss-cli": "^2.6.0",
+    "postcss-cli": "^3.0.0-beta",
     "postcss-flexbugs-fixes": "^2.1.0",
-    "shelljs": "^0.7.6",
+    "shelljs": "^0.7.7",
     "shx": "^0.2.2",
     "time-grunt": "^1.4.0",
-    "uglify-js": "^2.7.5"
+    "uglify-js": "^2.8.12"
   },
   "engines": {
     "node": ">=4"
-- 
cgit v1.2.3


From 09fb2b9af3ee7ef0e6a23e913ac74967d4a08d24 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Mon, 20 Mar 2017 05:07:18 +0000
Subject: Update dependencies.

---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index a354ab722..d11ffbf41 100644
--- a/package.json
+++ b/package.json
@@ -55,9 +55,9 @@
     "autoprefixer": "^6.7.7",
     "babel-eslint": "^7.1.1",
     "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
-    "babel-preset-es2015": "^6.22.0",
-    "clean-css-cli": "^4.0.8",
-    "eslint": "^3.17.1",
+    "babel-preset-es2015": "^6.24.0",
+    "clean-css-cli": "^4.0.9",
+    "eslint": "^3.18.0",
     "grunt": "^1.0.1",
     "grunt-babel": "^6.0.0",
     "grunt-build-control": "^0.7.1",
@@ -76,12 +76,12 @@
     "is-travis": "^1.0.0",
     "load-grunt-tasks": "^3.5.2",
     "node-sass": "^4.5.0",
-    "postcss-cli": "^3.0.0-beta",
+    "postcss-cli": "^3.0.0",
     "postcss-flexbugs-fixes": "^2.1.0",
     "shelljs": "^0.7.7",
     "shx": "^0.2.2",
     "time-grunt": "^1.4.0",
-    "uglify-js": "^2.8.12"
+    "uglify-js": "^2.8.14"
   },
   "engines": {
     "node": ">=4"
-- 
cgit v1.2.3


From eae1d3873365f8f6ffcf4bc167977cd41b206469 Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Mon, 10 Apr 2017 21:12:24 -0700
Subject: Package grunt (#22396)

Remove docs files and Gruntfile from package managers
---
 package.json | 2 --
 1 file changed, 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index d11ffbf41..7d2f2d893 100644
--- a/package.json
+++ b/package.json
@@ -88,10 +88,8 @@
   },
   "files": [
     "dist",
-    "grunt",
     "js/**/*.js",
     "scss/**/*.scss",
-    "Gruntfile.js",
     "LICENSE"
   ],
   "jspm": {
-- 
cgit v1.2.3


From b4ac48fdec7637c0c7c69f9d3ff9fc5d21d23676 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Wed, 19 Apr 2017 21:59:12 +1000
Subject: Build system overhaul.

---
 package.json | 95 ++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 54 insertions(+), 41 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 7d2f2d893..e7ec5afe0 100644
--- a/package.json
+++ b/package.json
@@ -17,24 +17,40 @@
     "Twitter, Inc."
   ],
   "scripts": {
-    "change-version": "node grunt/change-version.js",
-    "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 --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",
-    "jekyll": "bundle exec jekyll build",
-    "jekyll-github": "shx echo 'github: true' > $npm_config_tmp/twbsjekyll.yml && npm run jekyll -- --config _config.yml,$npm_config_tmp/twbsjekyll.yml && shx rm $npm_config_tmp/twbsjekyll.yml",
-    "postcss": "postcss --config grunt/ --replace dist/css/*.css",
-    "postcss-docs": "postcss --config grunt/ --replace docs/assets/css/docs.min.css && postcss --config grunt/ --replace docs/examples/**/*.css",
-    "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
-    "sass-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
-    "scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
-    "scss-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
-    "uglify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
-    "uglify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
-    "update-shrinkwrap": "npm shrinkwrap --dev && shx mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
-    "test": "npm run eslint && grunt test"
+    "bash": "bash",
+    "css": "npm-run-all css-lint css-compile css-prefix css-minify",
+    "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs",
+    "css-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
+    "css-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
+    "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
+    "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
+    "css-prefix": "postcss --config build/ --replace dist/css/*.css",
+    "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css docs/examples/**/*.css",
+    "css-minify": "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",
+    "css-minify-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
+    "js": "npm-run-all js-compile js-minify",
+    "js-docs": "npm-run-all js-lint-docs js-minify-docs",
+    "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/",
+    "js-lint-docs": "eslint --config js/tests/.eslintrc.json docs/assets/js/",
+    "js-compile": "npm-run-all --parallel js-compile-*",
+    "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed 's/^(import|export).*//' | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js",
+    "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps",
+    "js-minify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
+    "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
+    "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60",
+    "js-test-cloud": "ruby -run -ehttpd . -p3000 & grunt saucelabs-qunit",
+    "docs": "npm-run-all docs-compile docs-lint",
+    "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
+    "docs-clean": "shx rm -r docs/dist/* && shx cp -r dist/* docs/dist/",
+    "docs-compile": "npm run docs-clean && bundle exec jekyll build",
+    "docs-serve": "npm run docs-clean && bundle exec jekyll serve",
+    "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml",
+    "docs-upload-preview": "build/upload-preview.sh",
+    "maintenance-dependencies": "ncu -a -x jquery && bundle update && shx echo 'Manually update docs/assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'",
+    "maintenance-shrinkwrap": "npm shrinkwrap --dev && shx mv npm-shrinkwrap.json build/npm-shrinkwrap.json",
+    "release-version": "node build/change-version.js",
+    "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
+    "test": "npm-run-all --parallel css js && npm-run-all docs"
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
@@ -53,42 +69,39 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-transform-es2015-modules-strip": "^0.1.0",
-    "babel-preset-es2015": "^6.24.0",
-    "clean-css-cli": "^4.0.9",
-    "eslint": "^3.18.0",
+    "babel-cli": "^6.24.1",
+    "babel-eslint": "^7.2.2",
+    "babel-plugin-transform-es2015-modules-strip": "^0.1.1",
+    "babel-preset-es2015": "^7.0.0-alpha.7",
+    "clean-css-cli": "^4.0.12",
+    "eslint": "^3.19.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.4.1",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-connect": "^1.0.2",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-contrib-qunit": "^1.3.0",
-    "grunt-contrib-watch": "^1.0.0",
-    "grunt-exec": "^2.0.0",
     "grunt-saucelabs": "^9.0.0",
-    "grunt-stamp": "^0.3.0",
     "htmlhint": "^0.9.13",
     "htmllint-cli": "^0.0.6",
-    "is-travis": "^1.0.0",
-    "load-grunt-tasks": "^3.5.2",
-    "node-sass": "^4.5.0",
-    "postcss-cli": "^3.0.0",
-    "postcss-flexbugs-fixes": "^2.1.0",
+    "node-sass": "^4.5.2",
+    "npm-run-all": "^4.0.2",
+    "phantomjs-prebuilt": "^2.1.14",
+    "postcss-cli": "^3.1.1",
+    "postcss-flexbugs-fixes": "^2.1.1",
+    "qunit-phantomjs-runner": "^2.3.0",
+    "qunitjs": "^2.3.1",
     "shelljs": "^0.7.7",
     "shx": "^0.2.2",
-    "time-grunt": "^1.4.0",
-    "uglify-js": "^2.8.14"
+    "uglify-js": "^2.8.22"
   },
   "engines": {
     "node": ">=4"
   },
   "files": [
+    ".babelrc",
+    ".eslintignore",
+    "Gruntfile.js",
     "dist",
+    "build",
+    "js/.eslintrc.json",
     "js/**/*.js",
+    "scss/.scss-lint.yml",
     "scss/**/*.scss",
     "LICENSE"
   ],
-- 
cgit v1.2.3


From 2906b612d5bc3d7e33950044c9b89a91b117df03 Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Thu, 20 Apr 2017 20:33:51 +1000
Subject: More minor build tweaks and docs updates.

---
 package.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e7ec5afe0..ab1185bd7 100644
--- a/package.json
+++ b/package.json
@@ -30,15 +30,15 @@
     "css-minify-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
     "js": "npm-run-all js-compile js-minify",
     "js-docs": "npm-run-all js-lint-docs js-minify-docs",
-    "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/",
+    "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js",
     "js-lint-docs": "eslint --config js/tests/.eslintrc.json docs/assets/js/",
     "js-compile": "npm-run-all --parallel js-compile-*",
-    "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed 's/^(import|export).*//' | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js",
+    "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed \"s/^(import|export).*//\" | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js",
     "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps",
     "js-minify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
     "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
     "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60",
-    "js-test-cloud": "ruby -run -ehttpd . -p3000 & grunt saucelabs-qunit",
+    "js-test-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit",
     "docs": "npm-run-all docs-compile docs-lint",
     "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
     "docs-clean": "shx rm -r docs/dist/* && shx cp -r dist/* docs/dist/",
@@ -50,7 +50,8 @@
     "maintenance-shrinkwrap": "npm shrinkwrap --dev && shx mv npm-shrinkwrap.json build/npm-shrinkwrap.json",
     "release-version": "node build/change-version.js",
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
-    "test": "npm-run-all --parallel css js && npm-run-all docs"
+    "dist": "npm-run-all --parallel css js",
+    "test": "npm-run-all dist docs"
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
-- 
cgit v1.2.3


From d336adfafdf2c8edf8715a9d5dc3becaee819483 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Thu, 27 Apr 2017 23:03:17 +0200
Subject: Fix build by installing grunt dependencies before js-test-cloud

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ab1185bd7..4833746d1 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,9 @@
     "js-minify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
     "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
     "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60",
-    "js-test-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit",
+    "js-test-dep": "npm install grunt && npm install grunt-saucelabs",
+    "js-launch-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit",
+    "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud",
     "docs": "npm-run-all docs-compile docs-lint",
     "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
     "docs-clean": "shx rm -r docs/dist/* && shx cp -r dist/* docs/dist/",
@@ -76,8 +78,6 @@
     "babel-preset-es2015": "^7.0.0-alpha.7",
     "clean-css-cli": "^4.0.12",
     "eslint": "^3.19.0",
-    "grunt": "^1.0.1",
-    "grunt-saucelabs": "^9.0.0",
     "htmlhint": "^0.9.13",
     "htmllint-cli": "^0.0.6",
     "node-sass": "^4.5.2",
-- 
cgit v1.2.3


From ebf0c3104e8c70daeb77696277e22366ec144b88 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Thu, 27 Apr 2017 23:20:29 +0200
Subject: Run js-test locally before js-test-cloud

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4833746d1..28937f563 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "release-version": "node build/change-version.js",
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
     "dist": "npm-run-all --parallel css js",
-    "test": "npm-run-all dist docs"
+    "test": "npm-run-all dist js-test docs"
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
-- 
cgit v1.2.3


From 03c26407aa1e0dc082a367d54df34e639b1697bb Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 21 Apr 2017 23:35:24 -0700
Subject: watch task docs + css

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 28937f563..7307a56b1 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,8 @@
     "release-version": "node build/change-version.js",
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
     "dist": "npm-run-all --parallel css js",
-    "test": "npm-run-all dist js-test docs"
+    "test": "npm-run-all dist js-test docs",
+    "watch": "nodemon -e scss -x \"npm run css && npm run css-docs\""
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
@@ -81,6 +82,7 @@
     "htmlhint": "^0.9.13",
     "htmllint-cli": "^0.0.6",
     "node-sass": "^4.5.2",
+    "nodemon": "^1.11.0",
     "npm-run-all": "^4.0.2",
     "phantomjs-prebuilt": "^2.1.14",
     "postcss-cli": "^3.1.1",
-- 
cgit v1.2.3


From 482052585eee27bd8f3b315c2cce9120ecd11559 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Fri, 21 Apr 2017 23:46:54 -0700
Subject: don't prefix docs css, it generates .map files and mucks it all up

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 7307a56b1..5440548a5 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
     "css-prefix": "postcss --config build/ --replace dist/css/*.css",
-    "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css docs/examples/**/*.css",
+    "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css",
     "css-minify": "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",
     "css-minify-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
     "js": "npm-run-all js-compile js-minify",
-- 
cgit v1.2.3


From dbe8e554bb0df9175c31c68efa05f89ef26461fc Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Fri, 28 Apr 2017 13:43:42 +0200
Subject: Add watch-css and watch-js + a global watch command

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 5440548a5..7e9ee3c75 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,9 @@
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
     "dist": "npm-run-all --parallel css js",
     "test": "npm-run-all dist js-test docs",
-    "watch": "nodemon -e scss -x \"npm run css && npm run css-docs\""
+    "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"",
+    "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"",
+    "watch": "npm-run-all --parallel watch-css watch-js"
   },
   "style": "dist/css/bootstrap.css",
   "sass": "scss/bootstrap.scss",
-- 
cgit v1.2.3


From 954f482f4a48939c78b8e00199de0090cd5239aa Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 2 May 2017 15:26:45 +0200
Subject: Remove log from WEBrick during js-test-cloud

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 7e9ee3c75..97bb60381 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
     "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60",
     "js-test-dep": "npm install grunt && npm install grunt-saucelabs",
-    "js-launch-cloud": "ruby -run -ehttpd . -p3000 > /dev/null & grunt saucelabs-qunit",
+    "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit",
     "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud",
     "docs": "npm-run-all docs-compile docs-lint",
     "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
-- 
cgit v1.2.3


From c4b4d534a4e935db72a37b54f0f41f4dba4c83de Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Mon, 17 Apr 2017 15:20:53 +0200
Subject: Remove Tether from package.json + Update Popper

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 97bb60381..4ea20b9dc 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "tether": "^1.4.0"
+    "Popper": "^1.8.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From d5fabf8de50710c5a09ecd91f4b9e961e67d7937 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Tue, 18 Apr 2017 14:02:24 +0200
Subject: Remove totaly Tether from documentation + dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 4ea20b9dc..ebed39388 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "Popper": "^1.8.1"
+    "popper.js": "^1.8.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From 458b3cc4a37fc315a927c2d84bc362dad3e5a163 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Thu, 20 Apr 2017 10:18:57 +0200
Subject: Update Popper.js 1.8.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ebed39388..1a12fb066 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.8.1"
+    "popper.js": "^1.8.2"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From 3cfa5e8c055b1aaea809b404447ebdfa25269cac Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Sat, 29 Apr 2017 16:05:22 +0200
Subject: Update Popper.js 1.9.1 + Update documentation about Dropdown
 placement

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 1a12fb066..812d81955 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.8.2"
+    "popper.js": "^1.9.1"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From 21c38641342b98d7590b9c901f77d2a21e99f1fd Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Fri, 12 May 2017 21:44:43 +0200
Subject: Update Popper.js 1.9.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 812d81955..2a5c35c38 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.9.1"
+    "popper.js": "^1.9.3"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From dd78950d0a6a1586ae91b7f702980bc682f0df55 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Wed, 17 May 2017 14:09:14 +0200
Subject: Update Popper.js 1.9.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 2a5c35c38..5f5c56957 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.9.3"
+    "popper.js": "^1.9.4"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From cc303d5d26338e4a6c6856c991204db996251a52 Mon Sep 17 00:00:00 2001
From: Johann-S <johann.servoire@gmail.com>
Date: Wed, 24 May 2017 14:44:16 +0200
Subject: Update Popper.js to 1.9.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 5f5c56957..881a5b806 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
   "license": "MIT",
   "dependencies": {
     "jquery": ">=1.9.1",
-    "popper.js": "^1.9.4"
+    "popper.js": "^1.9.9"
   },
   "devDependencies": {
     "autoprefixer": "^6.7.7",
-- 
cgit v1.2.3


From 793e84400cec314198df38b6ae0a06e4711f72de Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Fri, 26 May 2017 21:41:36 -0700
Subject: Add `docs-clean` task to watch scripts

Without this, the CSS and JS files don't get copied over to the `docs/dist/` folder during development. I imagine we can simplify this and not run it twice, and instead run it once? Unsure.

/cc @johann-s
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 881a5b806..9ee855d58 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
     "dist": "npm-run-all --parallel css js",
     "test": "npm-run-all dist js-test docs",
-    "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"",
-    "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"",
+    "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs && npm run docs-clean\"",
+    "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile && npm run docs-clean\"",
     "watch": "npm-run-all --parallel watch-css watch-js"
   },
   "style": "dist/css/bootstrap.css",
-- 
cgit v1.2.3


From 7c9efe786aad4d55b468223697c6018b9b59b8dd Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 27 May 2017 17:54:23 -0700
Subject: move .scss-lint.yml to route dir instead of symlink (which didn't
 work)

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 9ee855d58..e23a89bd9 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "bash": "bash",
     "css": "npm-run-all css-lint css-compile css-prefix css-minify",
     "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs",
-    "css-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
-    "css-lint-docs": "bundle exec scss-lint --config scss/.scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
+    "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss",
+    "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
     "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
     "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
     "css-prefix": "postcss --config build/ --replace dist/css/*.css",
@@ -106,7 +106,7 @@
     "build",
     "js/.eslintrc.json",
     "js/**/*.js",
-    "scss/.scss-lint.yml",
+    ".scss-lint.yml",
     "scss/**/*.scss",
     "LICENSE"
   ],
-- 
cgit v1.2.3


From 3e76d6565603fafa2c85ad81d7b6345c4e279c72 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sun, 28 May 2017 22:50:57 -0700
Subject: Rearrange all the docs to allow for a docs/major.minor/ setup

---
 package.json | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index e23a89bd9..ff331185f 100644
--- a/package.json
+++ b/package.json
@@ -21,41 +21,40 @@
     "css": "npm-run-all css-lint css-compile css-prefix css-minify",
     "css-docs": "npm-run-all css-lint-docs css-compile-docs css-prefix-docs css-minify-docs",
     "css-lint": "bundle exec scss-lint --config .scss-lint.yml scss/*.scss",
-    "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude docs/assets/scss/docs.scss docs/assets/scss/*.scss",
+    "css-lint-docs": "bundle exec scss-lint --config .scss-lint.yml --exclude assets/scss/docs.scss assets/scss/*.scss",
     "css-compile": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
-    "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
+    "css-compile-docs": "node-sass --output-style expanded --source-map true --precision 6 assets/scss/docs.scss assets/css/docs.min.css",
     "css-prefix": "postcss --config build/ --replace dist/css/*.css",
-    "css-prefix-docs": "postcss --config build/ --no-map --replace docs/assets/css/docs.min.css",
+    "css-prefix-docs": "postcss --config build/ --no-map --replace assets/css/docs.min.css",
     "css-minify": "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",
-    "css-minify-docs": "cleancss --level 1 --source-map --output docs/assets/css/docs.min.css docs/assets/css/docs.min.css",
+    "css-minify-docs": "cleancss --level 1 --source-map --output assets/css/docs.min.css assets/css/docs.min.css",
     "js": "npm-run-all js-compile js-minify",
     "js-docs": "npm-run-all js-lint-docs js-minify-docs",
     "js-lint": "eslint js/ && eslint --config js/tests/.eslintrc.json --env node build/ Gruntfile.js",
-    "js-lint-docs": "eslint --config js/tests/.eslintrc.json docs/assets/js/",
+    "js-lint-docs": "eslint --config js/tests/.eslintrc.json assets/js/",
     "js-compile": "npm-run-all --parallel js-compile-*",
     "js-compile-bundle": "shx cat js/src/util.js js/src/alert.js js/src/button.js js/src/carousel.js js/src/collapse.js js/src/dropdown.js js/src/modal.js js/src/scrollspy.js js/src/tab.js js/src/tooltip.js js/src/popover.js | shx sed \"s/^(import|export).*//\" | babel --filename js/src/bootstrap.js | node build/stamp.js > dist/js/bootstrap.js",
     "js-compile-plugins": "babel js/src/ --out-dir js/dist/ --source-maps",
     "js-minify": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output dist/js/bootstrap.min.js dist/js/bootstrap.js",
-    "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output docs/assets/js/docs.min.js docs/assets/js/vendor/anchor.min.js docs/assets/js/vendor/clipboard.min.js docs/assets/js/vendor/holder.min.js docs/assets/js/src/application.js",
+    "js-minify-docs": "uglifyjs --compress warnings=false --mangle --comments '/^!/' --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/src/application.js",
     "js-test": "phantomjs ./node_modules/qunit-phantomjs-runner/runner.js js/tests/index.html 60",
     "js-test-dep": "npm install grunt && npm install grunt-saucelabs",
     "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit",
     "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud",
     "docs": "npm-run-all docs-compile docs-lint",
-    "docs-lint": "htmlhint --config docs/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc docs/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
-    "docs-clean": "shx rm -r docs/dist/* && shx cp -r dist/* docs/dist/",
-    "docs-compile": "npm run docs-clean && bundle exec jekyll build",
-    "docs-serve": "npm run docs-clean && bundle exec jekyll serve",
+    "docs-lint": "htmlhint --config build/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
+    "docs-compile": "bundle exec jekyll build",
+    "docs-serve": "bundle exec jekyll serve",
     "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml",
     "docs-upload-preview": "build/upload-preview.sh",
-    "maintenance-dependencies": "ncu -a -x jquery && bundle update && shx echo 'Manually update docs/assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'",
+    "maintenance-dependencies": "ncu -a -x jquery && bundle update && shx echo 'Manually update assets/js/vendor/*, js/tests/vendor/*, bower.json and .travis.yml'",
     "maintenance-shrinkwrap": "npm shrinkwrap --dev && shx mv npm-shrinkwrap.json build/npm-shrinkwrap.json",
     "release-version": "node build/change-version.js",
     "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..",
     "dist": "npm-run-all --parallel css js",
     "test": "npm-run-all dist js-test docs",
-    "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs && npm run docs-clean\"",
-    "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile && npm run docs-clean\"",
+    "watch-css": "nodemon --ignore js/ --ignore dist/ -e scss -x \"npm run css && npm run css-docs\"",
+    "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile\"",
     "watch": "npm-run-all --parallel watch-css watch-js"
   },
   "style": "dist/css/bootstrap.css",
-- 
cgit v1.2.3


From 4d2570d0383da92b22cc136987f041412c4d20a3 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Mon, 29 May 2017 11:15:43 -0700
Subject: drop htmlhint given htmllint gives us most of the coverage we need
 here

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index ff331185f..8816c1bd1 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "js-launch-cloud": "ruby -r webrick -e \"s = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd, :Logger => WEBrick::Log.new('/dev/null'), :AccessLog => []); trap('INT') { s.shutdown }; s.start\" & grunt saucelabs-qunit",
     "js-test-cloud": "npm-run-all js-test-dep js-launch-cloud",
     "docs": "npm-run-all docs-compile docs-lint",
-    "docs-lint": "htmlhint --config build/.htmlhintrc _gh_pages/ js/tests/visual/ && htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
+    "docs-lint": "htmllint --rc build/.htmllintrc _gh_pages/*.html _gh_pages/**/*.html js/tests/visual/*.html",
     "docs-compile": "bundle exec jekyll build",
     "docs-serve": "bundle exec jekyll serve",
     "docs-github": "shx echo 'github: true' > $npm_config_tmp/twbsconfig.yml && npm run docs-compile -- --config _config.yml,$npm_config_tmp/twbsconfig.yml && shx rm $npm_config_tmp/twbsconfig.yml",
@@ -80,7 +80,6 @@
     "babel-preset-es2015": "^7.0.0-alpha.7",
     "clean-css-cli": "^4.0.12",
     "eslint": "^3.19.0",
-    "htmlhint": "^0.9.13",
     "htmllint-cli": "^0.0.6",
     "node-sass": "^4.5.2",
     "nodemon": "^1.11.0",
-- 
cgit v1.2.3