summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 4a873f0..690995c 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,6 @@ buildenv:
# ----------
node.env: buildenv
- $(Q)./manage.sh npm_packages
node.clean:
$(Q)echo "CLEAN locally installed npm dependencies"
@@ -156,20 +155,23 @@ PHONY += themes.bootstrap themes themes.oscar themes.simple themes.legacy themes
themes: buildenv themes.bootstrap themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
quiet_cmd_lessc = LESSC $3
- cmd_lessc = PATH="$$(npm bin):$$PATH" \
- lessc --clean-css="--s1 --advanced --compatibility=ie9" "searx/static/$2" "searx/static/$3"
+ cmd_lessc = lessc -x "searx/static/$2" "searx/static/$3"
quiet_cmd_grunt = GRUNT $2
- cmd_grunt = PATH="$$(npm bin):$$PATH" \
- grunt --gruntfile "$2"
+ cmd_grunt = grunt --gruntfile "$2"
themes.oscar: node.env
$(Q)echo '[!] build oscar theme'
$(call cmd,grunt,searx/static/themes/oscar/gruntfile.js)
+ $(call cmd,lessc,themes/oscar/less/logicodev/oscar.less,themes/oscar/css/logicodev.min.css)
+ $(call cmd,lessc,themes/oscar/less/logicodev-dark/oscar.less,themes/oscar/css/logicodev-dark.min.css)
+ $(call cmd,lessc,themes/oscar/less/pointhi/oscar.less,themes/oscar/css/pointhi.min.css)
themes.simple: node.env
$(Q)echo '[!] build simple theme'
$(call cmd,grunt,searx/static/themes/simple/gruntfile.js)
+ $(call cmd,lessc,themes/simple/less/style-rtl.less,themes/simple/css/style-rtl.min.css)
+ $(call cmd,lessc,themes/simple/less/style.less,themes/simple/css/style.min.css)
themes.legacy: node.env
$(Q)echo '[!] build legacy theme'
@@ -186,7 +188,6 @@ themes.pixart: node.env
$(call cmd,lessc,themes/pix-art/less/style.less,themes/pix-art/css/style.css)
themes.bootstrap: node.env
- $(call cmd,lessc,less/bootstrap/bootstrap.less,css/bootstrap.min.css)
# docker