From dfa5ccd2fac20c51c6fe859d5e07f51e1acaa7ae Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 4 Jan 2025 11:24:16 +0100 Subject: [PATCH] WIP: added footer --- homepage/cwsvJudo/Makefile.heliohost | 11 ++++- homepage/cwsvJudo/Makefile.heliohost.config | 2 + .../materialize-fromScratch.html | 44 +++++++++++++++++-- .../src/css/{ => materialize}/code.css | 0 .../src/css/{ => materialize}/fonts.css | 0 5 files changed, 53 insertions(+), 4 deletions(-) rename homepage/cwsvJudo/src/css/{ => materialize}/code.css (100%) rename homepage/cwsvJudo/src/css/{ => materialize}/fonts.css (100%) diff --git a/homepage/cwsvJudo/Makefile.heliohost b/homepage/cwsvJudo/Makefile.heliohost index 99d8ab7..109051d 100644 --- a/homepage/cwsvJudo/Makefile.heliohost +++ b/homepage/cwsvJudo/Makefile.heliohost @@ -2,7 +2,7 @@ include Makefile.heliohost.config -cssFiles = $(wildcard src/css/*.css) +cssFiles = $(wildcard src/css/materialize/*.css) mdFiles = $(wildcard src/md/*.md) phpFiles = $(patsubst src/md/%.md, build/materialize/%.php, $(mdFiles)) ampFiles = $(patsubst src/md/%.md, build/amp/%.php, $(mdFiles)) @@ -37,6 +37,10 @@ installDependencies: # - materialize-css if [ ! -d "submodules/materialize" ]; then cd submodules; git clone https://github.com/materializecss/materialize; fi cd submodules/materialize; git fetch; git checkout $(VERSION_MATERIALIZE); npm install; npm audit fix; npm run release; +# - google material icons + if [ ! -d "submodules/material-design-icons" ]; then cd submodules; git clone --filter=tree:0 https://github.com/google/material-design-icons.git; fi + cd submodules/material-design-icons; git fetch; git checkout $(VERSION_GOOGLE_MATERIAL_ICONS); + # copy/link all together to get a "distributable" package # (distributable means: That directory can be uploaded va ftp) @@ -132,10 +136,15 @@ build/yaml/%.yaml: src/yaml/images.yaml src/yaml/navTargets.yaml src/yaml/mainNa mkdir -p build/yaml python tools/yamlMerge.py $^ > $@ + # combine css files into one build/css/cwsvJudo.css: $(cssFiles) cat $^ | $(CSSO) -o $@ +# .PHONY: download_material_icons +# download_material_icons: +# curl + .PHONY: upload upload: all lftp -f scripts/upload-heliohost diff --git a/homepage/cwsvJudo/Makefile.heliohost.config b/homepage/cwsvJudo/Makefile.heliohost.config index 2ac1686..46300f9 100644 --- a/homepage/cwsvJudo/Makefile.heliohost.config +++ b/homepage/cwsvJudo/Makefile.heliohost.config @@ -2,6 +2,8 @@ # versions (git branches) to use VERSION_MATERIALIZE = v2.1.1 +# version of google material icons to use +VERSION_GOOGLE_MATERIAL_ICONS = 4.0.0 # where to put the distribution distDir = ./build/dist/heliohost diff --git a/homepage/cwsvJudo/pandocTemplate/materialize-fromScratch.html b/homepage/cwsvJudo/pandocTemplate/materialize-fromScratch.html index 4b176e7..7ecf877 100644 --- a/homepage/cwsvJudo/pandocTemplate/materialize-fromScratch.html +++ b/homepage/cwsvJudo/pandocTemplate/materialize-fromScratch.html @@ -50,8 +50,17 @@ $endfor$$endif$ - - + + + + + + + + + $if(extraCss)$$for(extraCss)$ $endfor$$endif$ @@ -131,9 +140,38 @@
$body$
-