Skip to content
Snippets Groups Projects
Commit f510c25b authored by Piotr Gawron's avatar Piotr Gawron
Browse files

when merging css "our" css is the most important

parent 31636c3c
No related branches found
No related tags found
1 merge request!58some refactoring giving additional Rest API functionlaity
......@@ -4,7 +4,7 @@
"description": "frontentd for minerva google maps interface",
"main": "minerva.js",
"scripts": {
"build:css": "cleancss -o dist/minerva.css src/main/css/*.css node_modules/dual-listbox/dist/*.css ",
"build:css": "cleancss -o dist/minerva.css node_modules/dual-listbox/dist/*.css src/main/css/*.css",
"build:js": "browserify --debug --standalone minerva src/main/js/minerva.js | exorcist dist/minerva.js.map > dist/minerva.js ",
"//": "rm -rf dist & rmdir /q /s dist & mkdir dist & browserify --debug --standalone minerva src/main/js/minerva.js | exorcist dist/minerva.js.map > dist/minerva.js & uglifyjs --compress --mangle --in-source-map dist/minerva.js.map --source-map-include-sources --source-map dist/minerva.min.js.map -o dist/minerva.min.js dist/minerva.js",
"build-deploy": "npm run build && npm run deploy",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment