diff options
| author | Mark Otto <[email protected]> | 2017-08-13 16:47:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-08-13 16:47:45 -0700 |
| commit | 0f2acc4b9e7dae7e3465d9fafc16a53823fecd08 (patch) | |
| tree | 305b161f837bbc679e754b2c159d6198bb35ed1f /package.json | |
| parent | 7739388938a28a4272254556c410353604c50b50 (diff) | |
| parent | 52310bfd69719cec463e2a7282d0d696c7a62b40 (diff) | |
| download | bootstrap-0f2acc4b9e7dae7e3465d9fafc16a53823fecd08.tar.xz bootstrap-0f2acc4b9e7dae7e3465d9fafc16a53823fecd08.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 2112d7e7a..196657782 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,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 css-docs", "test": "npm-run-all dist js-test docs", + "watch": "npm-run-all --parallel watch-css watch-js", "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-plugins\"", - "watch": "npm-run-all --parallel watch-css watch-js" + "watch-js": "nodemon --ignore scss/ --ignore js/dist/ --ignore dist/ -e js -x \"npm run js-compile-plugins\"" }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", |