aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-01-22 17:32:50 -0500
committerPierre-Denis Vanduynslager <[email protected]>2017-01-22 17:32:50 -0500
commit1cdd0d16c195fccdef33229eba687a0f6a65f56e (patch)
treeacbf02975ae7aa427d46049ac9a89627d242b91e /package.json
parentef2181ff4d53b9196828fae3ed8b62b493b4f937 (diff)
parent091f3b8c246a8e4923f3f156ffbf3e359058d1d5 (diff)
downloadbootstrap-1cdd0d16c195fccdef33229eba687a0f6a65f56e.tar.xz
bootstrap-1cdd0d16c195fccdef33229eba687a0f6a65f56e.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
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",