diff --git a/.gitignore b/.gitignore index ee470a22c..b7b3607d7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ js/node_modules/* js/vendor/ build/ js/public/ +css/style.css tests/integration/vendor/ tests/integration/composer.lock diff --git a/Makefile b/Makefile index cc7768876..f281df216 100644 --- a/Makefile +++ b/Makefile @@ -25,11 +25,14 @@ install-deps: cd js && npm install --deps cd js && ./node_modules/.bin/bower install -build: build-js +build: build-js build-css build-js: install-deps cd js && ./node_modules/.bin/grunt build +build-css: install-deps + ./js/node_modules/node-sass/bin/node-sass --output-style compressed css/style.scss css/style.css + watch: cd js && ./node_modules/.bin/grunt watch diff --git a/css/style.css b/css/style.scss similarity index 100% rename from css/style.css rename to css/style.scss diff --git a/js/package.json b/js/package.json index 1bd2af10c..5d30f57e1 100644 --- a/js/package.json +++ b/js/package.json @@ -16,7 +16,8 @@ "grunt-phpunit": "^0.3.6", "grunt-wrap": "^0.3.0", "jshint-stylish": "^2.2.1", - "karma": "^1.4.1" + "karma": "^1.4.1", + "node-sass": "^4.5.3" }, "scripts": { "test": "echo \"Warning: no test specified\" && exit 0"