From eadd2c13edde5083a6ef4488acbd63509f96fa5b Mon Sep 17 00:00:00 2001 From: Reto Bollinger Date: Tue, 14 Jan 2025 11:25:43 +0100 Subject: [PATCH] Restructuring content. Lifting heading levels, adjusted website title for home page and such. --- .../lektordata/project/assets/static/style.css | 18 +++++++++--------- lektor/lektordata/project/content/contents.lr | 4 ++-- .../lektordata/project/templates/layout.html | 5 ++++- lektor/lektordata/project/templates/page.html | 2 +- .../project/templates/termine_page.html | 2 +- .../scripts/calendar-fetcher-main.py | 4 ++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lektor/lektordata/project/assets/static/style.css b/lektor/lektordata/project/assets/static/style.css index 8a46fc2..9e9d60d 100644 --- a/lektor/lektordata/project/assets/static/style.css +++ b/lektor/lektordata/project/assets/static/style.css @@ -176,7 +176,7 @@ div.page.home{ font-size:36px; } -div.page h2 { +div.page h1 { font-family: "Roboto-Black","Arial Bold",sans-serif; font-size:60px; margin: 20px 0 0 0; @@ -185,7 +185,7 @@ div.page h2 { line-height: normal; } -div.page h3 { +div.page h2 { font-family: "Roboto-Thin","Arial",sans-serif; font-size:60px; margin: 0px; @@ -195,7 +195,7 @@ div.page h3 { } -div.page h4 { +div.page h3 { font-family: "Roboto-Thin","Arial",sans-serif; font-size:40px; margin: 0; @@ -571,16 +571,16 @@ div.left_footer, div.middle_footer, div.right_footer { font-size:calc(36vw * 0.091); } - div.page h2 { + div.page h1 { font-size:calc(60vw * 0.091); margin: calc(20vw * 0.091) 0 0 0; padding: calc(22vw * 0.091) 0 1em 0; width: 100%; } - div.page h3 { + div.page h2 { font-size:calc(60vw * 0.091); } - div.page h4 { + div.page h3 { font-size:calc(40vw * 0.091); } div.page div.threecolumn{ @@ -648,15 +648,15 @@ div.left_footer, div.middle_footer, div.right_footer { div.page.home{ font-size:calc(36px * 0.7); } - div.page h2 { + div.page h1 { font-size:calc(60px * 0.7); margin: 0; padding: calc(22px * 0.7) 0 1em 0; } - div.page h3 { + div.page h2 { font-size:calc(60px * 0.7); } - div.page h4 { + div.page h3 { font-size:calc(40px * 0.7); } div.page div.threecolumn{ diff --git a/lektor/lektordata/project/content/contents.lr b/lektor/lektordata/project/content/contents.lr index 519512b..00d2a3f 100644 --- a/lektor/lektordata/project/content/contents.lr +++ b/lektor/lektordata/project/content/contents.lr @@ -4,14 +4,14 @@ title: Willkommen beim PC Stammertal --- html: -

Unser nächster Anlass:


+

Unser nächster Anlass:


Leider unbekannt, aber frag mal den Vorstand der müsste es wissen
 
 
 
-

...und auch nicht verpassen:

+

...und auch nicht verpassen:

27. Zürcher Kantonalschützenfest 2025
diff --git a/lektor/lektordata/project/templates/layout.html b/lektor/lektordata/project/templates/layout.html index c5712c8..70257bd 100644 --- a/lektor/lektordata/project/templates/layout.html +++ b/lektor/lektordata/project/templates/layout.html @@ -7,8 +7,11 @@ +{% if this._path == '/' %} + +{% endif%} -{% block title %}Welcome{% endblock %} — PCS +{% if this._path == '/' %}Home - PCS{% else %}{% block title %}Welcome{% endblock %} — PCS{% endif%}
diff --git a/lektor/lektordata/project/templates/page.html b/lektor/lektordata/project/templates/page.html index 31bac15..20082d1 100644 --- a/lektor/lektordata/project/templates/page.html +++ b/lektor/lektordata/project/templates/page.html @@ -2,7 +2,7 @@ {% block title %}{{ this.title }}{% endblock %} {% block body %}
-

{{ this.title }}

+

{{ this.title }}

{{ this.body }} {{ this.html }}
diff --git a/lektor/lektordata/project/templates/termine_page.html b/lektor/lektordata/project/templates/termine_page.html index e8f6519..bcc3f18 100644 --- a/lektor/lektordata/project/templates/termine_page.html +++ b/lektor/lektordata/project/templates/termine_page.html @@ -2,7 +2,7 @@ {% block title %}{{ this.title }}{% endblock %} {% block body %}
-

{{ this.title }}

+

{{ this.title }}

{{ this.body }} {{ this.html }}
diff --git a/lektor/lektordata/scripts/calendar-fetcher-main.py b/lektor/lektordata/scripts/calendar-fetcher-main.py index 05da116..d259c9c 100644 --- a/lektor/lektordata/scripts/calendar-fetcher-main.py +++ b/lektor/lektordata/scripts/calendar-fetcher-main.py @@ -42,14 +42,14 @@ title: Willkommen beim PC Stammertal --- html: -

Unser nächster Anlass:


+

Unser nächster Anlass:


{self.fallback_html}
 
 
 
-

...und auch nicht verpassen:

+

...und auch nicht verpassen:

27. Zürcher Kantonalschützenfest 2025