aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix.sipma@no-log.org>2018-02-09 10:47:55 +0100
committerFélix Sipma <felix.sipma@no-log.org>2018-02-09 10:47:55 +0100
commit97284a7b96174b9dbb706b755e9e07fc03bfeac5 (patch)
tree90476bec0ea935c9c8673c7d569c0c8c171cfa0e
parenta136a69863264617b392bb204c379dbe6ac44fa7 (diff)
use bootstrap.js (concatenating util.js & collapse.js fails)
-rw-r--r--Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 4fe4c45..67204ec 100644
--- a/Makefile
+++ b/Makefile
@@ -20,30 +20,33 @@ css:
node_modules/font-awesome/css/font-awesome.css \
$(STATIC)/css/fournil.css \
> $(TMP)/css/fournil.css
+ csso $(TMP)/css/fournil.css --output $(TMP)/css/fournil.min.css
+ cp $(TMP)/css/fournil.min.css $(DIST_STATIC)/css
cat \
node_modules/leaflet/dist/leaflet.css \
> $(TMP)/css/fournil-map.css
- cp $(TMP)/css/fournil.css $(DIST_STATIC)/css
- csso $(TMP)/css/fournil.css --output $(TMP)/css/fournil.min.css
- cp $(TMP)/css/fournil-map.css $(DIST_STATIC)/css
csso $(TMP)/css/fournil-map.css --output $(TMP)/css/fournil-map.min.css
+ cp $(TMP)/css/fournil-map.min.css $(DIST_STATIC)/css
js:
mkdir -p $(TMP)/js/
mkdir -p $(DIST_STATIC)/js
+ cp node_modules/jquery/dist/jquery.min.js $(DIST_STATIC)/js/
+ cp node_modules/popper.js/dist/umd/popper.min.js $(DIST_STATIC)/js/
+ cp node_modules/bootstrap/js/dist/util.js $(DIST_STATIC)/js/
+ cp node_modules/bootstrap/js/dist/collapse.js $(DIST_STATIC)/js/
cat \
node_modules/jquery/dist/jquery.js \
node_modules/popper.js/dist/umd/popper.js \
- node_modules/bootstrap/js/dist/util.js \
- node_modules/bootstrap/js/dist/collapse.js \
+ node_modules/bootstrap/dist/js/bootstrap.js \
> $(TMP)/js/fournil.js
+ uglifyjs --compress --mangle -o $(TMP)/js/fournil.min.js $(TMP)/js/fournil.js
+ cp $(TMP)/js/fournil.min.js $(DIST_STATIC)/js
cat \
node_modules/leaflet/dist/leaflet.js \
$(STATIC)/js/fournil-map.js \
> $(TMP)/js/fournil-map.js
- uglifyjs --compress --mangle -o $(TMP)/js/fournil.min.js $(TMP)/js/fournil.js
uglifyjs --compress --mangle -o $(TMP)/js/fournil-map.min.js $(TMP)/js/fournil-map.js
- cp $(TMP)/js/fournil.min.js $(DIST_STATIC)/js
cp $(TMP)/js/fournil-map.min.js $(DIST_STATIC)/js
fonts: