Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ js/node_modules/*
js/vendor/
build/
js/public/
css/style.css
tests/integration/vendor/
tests/integration/composer.lock
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading