From ed7cb4f63239a873aeb168812ba925f333e1e9ae Mon Sep 17 00:00:00 2001 From: marko Date: Tue, 10 Jul 2018 13:53:26 +0200 Subject: [PATCH] =?UTF-8?q?-=20zwischen=20den=20Uploads=20Pausen=20eingef?= =?UTF-8?q?=C3=BCgt=20(ich=20wurde=20st=C3=A4ndig=20geblockt)=20=09modifie?= =?UTF-8?q?d:=20=20=20Makefile=20-=20die=20Sidebar/SubNav=20der=20ampVersi?= =?UTF-8?q?on=20gestaltet=20=09new=20file:=20=20=20css/cwsvJudo-2018-sideB?= =?UTF-8?q?ar.css=20=09modified:=20=20=20pandocTemplate/cwsvJudo.amp.pando?= =?UTF-8?q?cTemplate=20-=20eine=20absolute=20Url=20f=C3=BCr=20den=20Wettka?= =?UTF-8?q?mpfplaner=20=09modified:=20=20=20yaml/navTargets.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redesign2018/markdownExperiment/Makefile | 8 ++++--- .../css/cwsvJudo-2018-sideBar.css | 22 +++++++++++++++++++ .../cwsvJudo.amp.pandocTemplate | 15 ------------- .../markdownExperiment/yaml/navTargets.yaml | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile index 3eb0d61..d5879ed 100644 --- a/homepage/redesign2018/markdownExperiment/Makefile +++ b/homepage/redesign2018/markdownExperiment/Makefile @@ -18,7 +18,7 @@ uploadMarker = \ # $(patsubst phpLib/cwsvJudo/%.php, build/.uploadMarker/phpLib/cwsvJudo/%.php, $(phpLibFiles)) \ .PHONY: all -all: $(phpFiles) build/css/cwsvJudo.css +all: $(ampFiles) $(phpFiles) build/css/cwsvJudo.css .PHONY: clean clean: @@ -91,11 +91,10 @@ build/.uploadMarker/%.php: build/%.php ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/amp/%.php: build/amp/%.php mkdir -p build/.uploadMarker/amp -# @toDo: das wenn die Entwicklung des ampParts fertig ist auf das -# Zielverzeichnis pages/amp umstellen curl \ --upload-file $^ \ --user cwsvjudo:Dee4oquu \ @@ -107,6 +106,7 @@ build/.uploadMarker/amp/%.php: build/amp/%.php ftp://cwsvjudo.bplaced.net/www/pages/$(patsubst build/amp/%.php,amp/%.php,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/phpLib/%.php: phpLib/%.php mkdir -p build/.uploadMarker/phpLib/cwsvJudo @@ -136,6 +136,7 @@ build/.uploadMarker/css/%.css: build/css/%.css ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ + sleep 1s build/.uploadMarker/config/%: config/% mkdir -p build/.uploadMarker/config @@ -150,6 +151,7 @@ build/.uploadMarker/config/%: config/% ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \ --ftp-create-dirs touch $@ + sleep 1s .PHONY: graphiken diff --git a/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css new file mode 100644 index 0000000..f25f265 --- /dev/null +++ b/homepage/redesign2018/markdownExperiment/css/cwsvJudo-2018-sideBar.css @@ -0,0 +1,22 @@ +amp-sidebar { + background-color: #FF8100; +} +.sidebar { + padding: 10px; + margin: 0; + background-color: #FF8100; + font-size: 1.5em; + font-family: 'Orbitron-Medium',sans-serif; +} +.sidebar > li { + list-style: none; + margin-bottom:10px; +} +.sidebar a { + text-decoration: none; + color: inherit; +} +.close-sidebar { + font-size: 1.5em; + padding-left: 5px; +} diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate index 2fccdb2..d6c00c8 100644 --- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate +++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.amp.pandocTemplate @@ -78,21 +78,6 @@ $endfor$ padding-left: .5em; padding-right: .5em; } - .sidebar { - padding: 10px; - margin: 0; - } - .sidebar > li { - list-style: none; - margin-bottom:10px; - } - .sidebar a { - text-decoration: none; - } - .close-sidebar { - font-size: 1.5em; - padding-left: 5px; - } #mainNav > a > span{ width: 2em; } diff --git a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml index d6704f3..69b2bec 100644 --- a/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml +++ b/homepage/redesign2018/markdownExperiment/yaml/navTargets.yaml @@ -25,7 +25,7 @@ wkKalender: &wkKalender wkParticipo: &wkParticipo caption: "Wettkampf­planer" icon: *iconPlanner - url: "/pages/desktop/wkParticipo" + url: "http://cwsvjudo.bplaced.net/pages/desktop/wkParticipo" galerien: &galerien caption: "Galerien" url: "/galerien"