diff --git a/homepage/redesign2018/markdownExperiment/.gitignore b/homepage/redesign2018/markdownExperiment/.gitignore index 35da9a1..dc5000f 100644 --- a/homepage/redesign2018/markdownExperiment/.gitignore +++ b/homepage/redesign2018/markdownExperiment/.gitignore @@ -1,4 +1,3 @@ *~ - temp/* diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index f38968b..3eb0d61 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -47,7 +47,8 @@ build/css/cwsvJudo.css: $(cssFiles) mkdir -p $(dir $@) # cat $(cssFiles) > $@ # cat $(cssFiles) | cleancss -o $@ - cat $^ | ./node_modules/.bin/csso -o $@ +# cat $^ | ./node_modules/.bin/csso -o $@ + cat $^ | csso -o $@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate mkdir -p build @@ -127,12 +128,7 @@ build/.uploadMarker/css/%.css: build/css/%.css curl \ --upload-file $^ \ --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - curl \ - --upload-file $^ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%,%,$^) \ + ftp://cwsvjudo.square7.net/ressourcen/$(patsubst build/%,%,$^) \ --ftp-create-dirs curl \ --upload-file $^ \ @@ -165,20 +161,21 @@ cwsvLogoWappen: $(addprefix build/graphiken/cwsvLogoWappen/cwsvLogoWappen., build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png: graphiken/cwsvJudoLogoWappen.xcf mkdir -p $(dir $@) convert -layers merge -background transparent $< $@ -build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf +build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png: graphiken/cwsvLogoWappen.xcf mkdir -p $(dir $@) convert -layers flatten -background transparent $< $@ build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.%w.png: build/graphiken/cwsvJudoLogoWappen/cwsvJudoLogoWappen.png mkdir -p $(dir $@) convert -layers merge -background transparent -resize $*x $< $@ -# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ - zopflipng -my $@ $@ -build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png + zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ +# zopflipng -my $@ $@ + +build/graphiken/cwsvLogoWappen/cwsvLogoWappen.%w.png: build/graphiken/cwsvLogoWappen/cwsvLogoWappen.png mkdir -p $(dir $@) convert -layers flatten -background transparent -resize $*x $< $@ -# zopfli/zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ - zopflipng -my $@ $@ + zopflipng --iterations=500 --filters=01234mepb --lossy_8bit --lossy_transparent $@ $@ +# zopflipng -my $@ $@ .PHONY: favIcons diff --git a/homepage/redesign2018/markdownExperiment/Makefile~ b/homepage/redesign2018/markdownExperiment/Makefile~ deleted file mode 100644 index 1843a78..0000000 --- a/homepage/redesign2018/markdownExperiment/Makefile~ +++ /dev/null @@ -1,55 +0,0 @@ -cssFiles = $(wildcard css/*.css) -mdFiles = $(wildcard md/*.md) -phpFiles = $(patsubst md/%.md, build/%.php, $(mdFiles)) - -uploadMarker = $(patsubst build/%.php, build/.uploadMarker/%.php, $(phpFiles)) build/.uploadMarker/css/cwsvJudo.css - -all: $(phpFiles) build/css/cwsvJudo.css - -.PHONY: echo -echo: - @echo $(phpFiles) - -build/css/cwsvJudo.css: $(cssFiles) - mkdir -p build/css - cat $(cssFiles) > $@ - -build/%.php: md/%.md pandocTemplate/cwsvJudo.html5.pandocTemplate - mkdir -p build - pandoc \ - --standalone \ - --css=css/cwsvJudo.css \ - --template=pandocTemplate/cwsvJudo.html5.pandocTemplate \ - --output=$@ \ - $< - -.PHONY: upload -upload: $(uploadMarker) - -build/.uploadMarker/%.php: build/%.php - mkdir -p build/.uploadMarker - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs - curl \ - --upload-file $^ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \ - --ftp-create-dirs - touch $@ - -build/.uploadMarker/css/%.css: build/css/%.css - mkdir -p build/.uploadMarker/css - curl \ - --upload-file $^ \ - --user cwsvjudo:Dee4oquu \ - ftp://cwsvjudo.square7.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - curl \ - --upload-file $^ \ - --user cwsvjudo:***REMOVED*** \ - ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%,%,$^) \ - --ftp-create-dirs - touch $@ diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate index c903db0..2fccdb2 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate @@ -75,7 +75,8 @@ $endfor$ margin-top: 50px; } .hamburger { - padding-left: 10px; + padding-left: .5em; + padding-right: .5em; } .sidebar { padding: 10px; @@ -132,8 +133,10 @@ $endfor$ alt="Judo im Chemnitzer WSV - Promo" src="http://cwsvjudo.bplaced.net/ressourcen/graphiken/banner/bannerlogo.1.jpg" > - Judo - + + Judo + + $if(title-prefix)$$title-prefix$ – $endif$$pagetitle$ $endif$ - + $if(quotes)$ $endif$ -$for(css)$ - -$endfor$ $for(extraCss)$ $endfor$ diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php index 7e7d75d..6aa0261 100644 --- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php +++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/galleryRedirector.php @@ -1,13 +1,19 @@