- zwischen den Uploads Pausen eingefügt (ich wurde ständig geblockt)

modified:   Makefile
- die Sidebar/SubNav der ampVersion gestaltet
	new file:   css/cwsvJudo-2018-sideBar.css
	modified:   pandocTemplate/cwsvJudo.amp.pandocTemplate
- eine absolute Url für den Wettkampfplaner
	modified:   yaml/navTargets.yaml
This commit is contained in:
marko
2018-07-10 13:53:26 +02:00
parent b4b09f4c32
commit ed7cb4f632
4 changed files with 28 additions and 19 deletions

View File

@@ -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

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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"