From f510c25b1ea343ea057a7419387a623a1ca220f7 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 13 Jul 2017 17:26:17 +0200
Subject: [PATCH] when merging css "our" css is the most important
---
frontend-js/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend-js/package.json b/frontend-js/package.json
index 31599e759c..fdaa210ba8 100644
--- a/frontend-js/package.json
+++ b/frontend-js/package.json
@@ -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",
--
GitLab