From f8d5584593a0a7e73e4b38e96c2c7f5bf56d3471 Mon Sep 17 00:00:00 2001 From: Volpeon Date: Thu, 11 Nov 2021 18:08:43 +0100 Subject: Added music, updated graph, better makefile --- Makefile | 38 ++++++++++++++++++++------------ src/icons/graph.svg | 33 ++++++++++++++-------------- src/icons/music.svg | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 31 deletions(-) create mode 100644 src/icons/music.svg diff --git a/Makefile b/Makefile index 80eb5ef..c3b21ff 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,30 @@ -all: build +FILES_SRC := $(shell find src/icons -type f -name "*.svg") +FILES := $(patsubst src/icons/%.svg,output/%.svg,$(FILES_SRC)) -clean_output: - @mkdir -p output - @rm -rf output/* +all: files showcase/index.html -clean_showcase: - @mkdir -p showcase - @rm -rf showcase/* +files: $(FILES) -icons: clean_output - @scripts/build.sh +### -showcase: clean_showcase - @scripts/build_showcase.sh +output/%.svg: src/icons/%.svg | output + scour -i "$<" \ + --enable-viewboxing \ + --enable-id-stripping \ + --enable-comment-stripping \ + --remove-descriptive-elements \ + --strip-xml-prolog \ + --shorten-ids | sed -z 's/\(fill\|stroke\)="#.\{3,6\}"/\1="currentColor"/g;s/stroke-width="[0-9.]*"//g;s/stroke-linecap="[a-z]*"//g;s/stroke-linejoin="[a-z]*"//g;s/style="[ a-z0-9:-]*"//g' > "$@" -build: icons - $(MAKE) showcase +showcase/index.html: src/showcase/index.html $(FILES) | showcase + scripts/build_showcase.sh -.PHONY: all clean_output clean_showcase icons showcase build +showcase: + mkdir -p showcase + +output: + mkdir -p output + +### + +.PHONY: all diff --git a/src/icons/graph.svg b/src/icons/graph.svg index 5a9814f..60fe112 100644 --- a/src/icons/graph.svg +++ b/src/icons/graph.svg @@ -1,22 +1,22 @@ + style="fill:none;stroke:currentColor;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> @@ -25,7 +25,6 @@ image/svg+xml - @@ -44,22 +43,22 @@ inkscape:window-height="992" id="namedview12" showgrid="true" - inkscape:zoom="32" - inkscape:cx="4.4837086" - inkscape:cy="9.082647" + inkscape:zoom="22.627417" + inkscape:cx="5.9220193" + inkscape:cy="11.269514" inkscape:window-x="1536" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg10" showguides="true" - inkscape:document-rotation="0"> + inkscape:document-rotation="0" + inkscape:pagecheckerboard="0"> + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + d="m 5.25,13 c 0,0.966498 -0.7835017,1.75 -1.75,1.75 -0.9664983,0 -1.75,-0.783502 -1.75,-1.75 0,-0.966498 0.7835017,-1.75 1.75,-1.75 0.9664983,0 1.75,0.783502 1.75,1.75 z m 8.999995,-3.5000048 c 0,0.9664978 -0.783502,1.7499998 -1.75,1.7499998 -0.966498,0 -1.75,-0.783502 -1.75,-1.7499998 0,-0.9664983 0.783502,-1.75 1.75,-1.75 0.966498,0 1.75,0.7835017 1.75,1.75 z M 7.25,2.999995 c 0,0.9664983 -0.7835017,1.75 -1.75,1.75 -0.9664983,0 -1.75,-0.7835017 -1.75,-1.75 0,-0.9664983 0.7835017,-1.75 1.75,-1.75 0.9664983,0 1.75,0.7835017 1.75,1.75 z m -2.0942209,9.412612 5.6868079,-2.3235 M 6.6796333,4.3023047 11.2655,8.2329569 M 5.1792385,4.730093 3.8296598,11.27309" /> diff --git a/src/icons/music.svg b/src/icons/music.svg new file mode 100644 index 0000000..4597de6 --- /dev/null +++ b/src/icons/music.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + -- cgit v1.2.3-54-g00ecf