From 3365fc6638ef4e53014f40b80c8d77840b96dd95 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Mon, 5 Mar 2018 17:40:26 +0100 Subject: [PATCH] Improved assets --- assets/css/Makefile | 10 +++++++++ assets/css/generate_makefile.sh | 39 +++++++++++++++++++++++++++++++++ package.json | 6 ++--- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 assets/css/Makefile create mode 100755 assets/css/generate_makefile.sh diff --git a/assets/css/Makefile b/assets/css/Makefile new file mode 100644 index 0000000..2c52408 --- /dev/null +++ b/assets/css/Makefile @@ -0,0 +1,10 @@ +SASS = $(shell pwd)/../../node_modules/node-sass/bin/node-sass --output-style compressed +all: fonts.css style.css important.css semantic.css +fonts.css: fonts.sass + $(SASS) fonts.sass -o . +style.css: style.sass + $(SASS) style.sass -o . +important.css: important.scss + $(SASS) important.scss -o . +semantic.css: semantic.scss + $(SASS) semantic.scss -o . diff --git a/assets/css/generate_makefile.sh b/assets/css/generate_makefile.sh new file mode 100755 index 0000000..6755fe4 --- /dev/null +++ b/assets/css/generate_makefile.sh @@ -0,0 +1,39 @@ +#!/bin/bash +QUALITY=85 +THUMB_QUALITY_PNG=70 +THUMB_QUALITY_JPG=50 + +cd $(dirname $(realpath -s ${0})) + +RULES=() + +function generate_rule() { + file=${1} + filename=${2} + + RULES+=("${filename}.css") + echo "${filename}.css: ${file}" >> Makefile.wip + echo " \$(SASS) ${file} -o ." >> Makefile.wip +} + +function finalize() { + echo -n "all:" >> Makefile + for rule in "${RULES[@]}"; do + echo -n " $rule" >> Makefile + done + echo >> Makefile + cat Makefile.wip >> Makefile + rm Makefile.wip +} + +cat <<EOF > Makefile +SASS = \$(shell pwd)/../../node_modules/node-sass/bin/node-sass --output-style compressed +EOF +for file in *.sass; do + generate_rule ${file} ${file%.*} +done +for file in *.scss; do + generate_rule ${file} ${file%.*} +done + +finalize \ No newline at end of file diff --git a/package.json b/package.json index 6121aae..6844649 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "description": "This is a websearch frontend for a quassel database.", "scripts": { "pug": "node_modules/pug-cli/index.js --basedir . **/index.pug index.pug", - "sass": "node_modules/node-sass/bin/node-sass assets/css/ -o assets/css/ --output-style compressed", - "assets": "assets/images/generate_makefile.sh && cd assets/images && make", - "build": "npm run assets && npm run sass && npm run pug" + "sass": "assets/css/generate_makefile.sh && cd assets/css && make", + "images": "assets/images/generate_makefile.sh && cd assets/images && make", + "build": "npm run images && npm run sass && npm run pug" }, "author": "Janne Koschinski", "license": "GPL", -- GitLab