From 01c73e9f01cb4fab0f263d58951aa668147cdadf Mon Sep 17 00:00:00 2001 From: Thomas Dedek Date: Sun, 22 Dec 2019 10:45:40 +0100 Subject: [PATCH] base layout: update CSP; add RP --- build+deploy.sh | 3 +++ layouts/_default/baseof.html | 2 ++ layouts/_default/single.html | 10 ++++---- public/de/index.html | 11 ++++---- public/ecogood.css | 49 ++++++++++-------------------------- public/en/index.html | 11 ++++---- public/fr/index.html | 11 ++++---- static/ecogood.css | 49 ++++++++++-------------------------- 8 files changed, 54 insertions(+), 92 deletions(-) diff --git a/build+deploy.sh b/build+deploy.sh index a7a6869..6fbe975 100755 --- a/build+deploy.sh +++ b/build+deploy.sh @@ -10,3 +10,6 @@ rsync -v --archive --delete --exclude /.htpasswd public/ \ ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/htdocs-ssl/ rsync -v --archive public/.htpasswd \ ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/ + +echo +echo Finished. See results at https://my.ecogood.world diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0aa8b0d..acd70f1 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,6 +2,8 @@ Ecogood portal + + diff --git a/layouts/_default/single.html b/layouts/_default/single.html index fa61a48..d9cbe67 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -33,20 +33,20 @@
-
+
-
-
+
+ -
+
Umgangs
kodex
 -
+
diff --git a/public/de/index.html b/public/de/index.html index 10cef34..b0f62eb 100644 --- a/public/de/index.html +++ b/public/de/index.html @@ -2,6 +2,7 @@ Ecogood portal + @@ -142,20 +143,20 @@
-
+
-
-
+
+ -
+
Umgangs
kodex
 -
+
diff --git a/public/ecogood.css b/public/ecogood.css index 7d10ed4..871354c 100644 --- a/public/ecogood.css +++ b/public/ecogood.css @@ -14,41 +14,6 @@ a { color: #333; } -/* -.item-box { - border-radius: 15px; - position: relative; - float: left; - - border: 1px dashed gray; - width: 480px; - height: 140px; - background-color: #eee; - margin: 20px; - padding: 8px; -} - -.item-box .image-box { - width: 100px; - height: 100px; - float: left; - padding: 10px; -} - -.item-box img { - max-width: 100%; - max-height: 100%; - margin: auto; - display: block; -} - -h2 { - color: #009da5; - font-size: 26px; - font-weight: 500; -} -*/ - #epframe { margin: auto; max-width: 900px; @@ -74,7 +39,6 @@ h2 { .epsrect { width: 23%; padding-bottom: 32.2%; - background-color: none; position: relative; margin: 0.5%; display: inline-block; @@ -83,6 +47,19 @@ h2 { border: 1px solid #ccc; } +.epsrect.buchvoll { + background-image: url(gwoe-arbeitsbuch-5v.jpg); +} +.epsrect.buchkompakt { + background-image: url(gwoe-arbeitsbuch-5k.jpg); +} +.epsrect.buchkodex { + background-image: url(epecg.png); +} +.epsrect.buchregel { + background-image: url(gwoe-regelwerk.jpg); background-size: 100%; +} + .eptextfunc { width: 100%; font-weight: bold; diff --git a/public/en/index.html b/public/en/index.html index de533ac..d54ee9f 100644 --- a/public/en/index.html +++ b/public/en/index.html @@ -2,6 +2,7 @@ Ecogood portal + @@ -142,20 +143,20 @@
-
+
-
-
+
+ -
+
Umgangs
kodex
 -
+
diff --git a/public/fr/index.html b/public/fr/index.html index c8706a2..0737098 100644 --- a/public/fr/index.html +++ b/public/fr/index.html @@ -2,6 +2,7 @@ Ecogood portal + @@ -142,20 +143,20 @@
-
+
-
-
+
+ -
+
Umgangs
kodex
 -
+
diff --git a/static/ecogood.css b/static/ecogood.css index 7d10ed4..871354c 100644 --- a/static/ecogood.css +++ b/static/ecogood.css @@ -14,41 +14,6 @@ a { color: #333; } -/* -.item-box { - border-radius: 15px; - position: relative; - float: left; - - border: 1px dashed gray; - width: 480px; - height: 140px; - background-color: #eee; - margin: 20px; - padding: 8px; -} - -.item-box .image-box { - width: 100px; - height: 100px; - float: left; - padding: 10px; -} - -.item-box img { - max-width: 100%; - max-height: 100%; - margin: auto; - display: block; -} - -h2 { - color: #009da5; - font-size: 26px; - font-weight: 500; -} -*/ - #epframe { margin: auto; max-width: 900px; @@ -74,7 +39,6 @@ h2 { .epsrect { width: 23%; padding-bottom: 32.2%; - background-color: none; position: relative; margin: 0.5%; display: inline-block; @@ -83,6 +47,19 @@ h2 { border: 1px solid #ccc; } +.epsrect.buchvoll { + background-image: url(gwoe-arbeitsbuch-5v.jpg); +} +.epsrect.buchkompakt { + background-image: url(gwoe-arbeitsbuch-5k.jpg); +} +.epsrect.buchkodex { + background-image: url(epecg.png); +} +.epsrect.buchregel { + background-image: url(gwoe-regelwerk.jpg); background-size: 100%; +} + .eptextfunc { width: 100%; font-weight: bold;