From c1895a915c479c49d180f8d134a9c96eee0bbdb5 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 17:29:54 +0100 Subject: [PATCH 01/16] feature: news styling --- assets/sass/teaser.scss | 10 ++++++++++ layouts/_default/list.html | 16 ++++++++-------- layouts/_default/single.html | 2 +- layouts/country/single.html | 2 +- layouts/operator/single.html | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index b1665a81..e64e5f8e 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -9,6 +9,16 @@ } } +.m-teaser--listview { + margin-bottom: 2.4rem; +} + +.m-teaser__headline { + color: #ec0016; + text-decoration: underline; + +} + .m-teaser img { width: 100%; aspect-ratio: 16/9; diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 33a33a5b..5820d63c 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,13 +1,13 @@ {{ define "main" }} -
-

{{ .Title }}

- {{ .Content }} {{ range .Pages }} -
- -

{{ .LinkTitle }}

+
+
+

{{ .Title }}

+ {{ .Content }} {{ range .Pages }} + +

{{ .LinkTitle }}

+
{{ .Summary | plainify | truncate 200 }}
 -
{{ .Summary | plainify | truncate 200 }}
+ {{ end }}
- {{ end }}
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 58b6ef4f..8400b6e0 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 09c7c5fa..92abfe30 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} diff --git a/layouts/operator/single.html b/layouts/operator/single.html index 19a1905d..69a6304c 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} From fa831fc6c93c4076c6bfdc77c298f5e7f085a2b5 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 17:30:37 +0100 Subject: [PATCH 02/16] feature: news styling --- layouts/operator/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/operator/single.html b/layouts/operator/single.html index 69a6304c..d2f366f5 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -26,5 +26,5 @@

See Also

{{ end }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} -
+ {{ end }} \ No newline at end of file From 9253ceb66728a6cbc10c86bd17ebe6dbc4713a29 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 17:40:30 +0100 Subject: [PATCH 03/16] feature: general styling --- assets/sass/content.scss | 2 +- assets/sass/headings.scss | 10 +++++++--- assets/sass/styles.scss | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/assets/sass/content.scss b/assets/sass/content.scss index 1216e81b..5be5b974 100644 --- a/assets/sass/content.scss +++ b/assets/sass/content.scss @@ -1,4 +1,4 @@ .updateDate { font-size: 1.3rem; - margin-bottom: 5px; + margin-bottom: 1.6rem; } \ No newline at end of file diff --git a/assets/sass/headings.scss b/assets/sass/headings.scss index ef8e86ff..f65a94f1 100644 --- a/assets/sass/headings.scss +++ b/assets/sass/headings.scss @@ -8,20 +8,24 @@ h1 { h2 { font-size: 2.4rem; line-height: 1.25; - margin-bottom: 1.6rem; + margin-bottom: 1.2rem; font-weight: 700; } h3 { font-size: 2rem; line-height: 1.25; - margin-bottom: 1.4rem; + margin-bottom: 1rem; font-weight: 700; } h4 { font-size: 1.8rem; line-height: 1.25; - margin-bottom: 1.2rem; + margin-bottom: 1rem; font-weight: 700; +} + +h2:has(+ .updateDate) { + margin-bottom: .4rem; } \ No newline at end of file diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 9d1314d9..a94451c5 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -75,8 +75,8 @@ p { margin-bottom: 3.2rem; } -p:has(p + ul) { - margin-bottom: 0; +p:has( + ul) { + margin-bottom: 1rem; } article p:last-child { From fad51c075e75b574527b099fd67394ee9596109c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 17:45:29 +0100 Subject: [PATCH 04/16] fix: localization --- i18n/de.yaml | 1 + i18n/en.yaml | 1 + layouts/_default/home.html | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n/de.yaml b/i18n/de.yaml index b54f4406..4df186a5 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -15,3 +15,4 @@ information-disclaimer-short: Diese Informationen sind inoffiziell und ohne Gew highlight-important: Wichtige Information highlight-inofficial: Inoffizielle Information highlight-tip: Persönlicher Tipp +news-headline: Was gibt's neues? diff --git a/i18n/en.yaml b/i18n/en.yaml index 05f723eb..4f43a296 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -15,3 +15,4 @@ information-disclaimer-short: The information provided is unofficial and without highlight-important: Important Information highlight-inofficial: Unofficial Information highlight-tip: Personal Tip +news-headline: What's new? diff --git a/layouts/_default/home.html b/layouts/_default/home.html index ac2f320a..e5612e34 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -6,7 +6,7 @@
-

Die neuesten Neuigkeiten đŸ”„

+

{{ T "news-headline"}}

{{ range first 3 (where site.RegularPages "Section" "news") }} {{ partial "teaser.html" . }} {{ end }} From 585b58b22282fdd5188d3e91b566f2c8140151a9 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 18:03:02 +0100 Subject: [PATCH 05/16] fix: footer-styling --- assets/sass/footer.scss | 18 ++++++++++++++---- layouts/partials/footer.html | 34 +++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/assets/sass/footer.scss b/assets/sass/footer.scss index 3f760d58..3693411b 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -3,11 +3,21 @@ margin-bottom: 2rem; } -.o-footer div { +.o-footer__links { display: flex; - justify-content: flex-end; + justify-content: normal; + + @include media-breakpoint-up(md) { + justify-content: flex-end; + } } .o-footer__link { - margin-left: 1.6rem; -} \ No newline at end of file + margin-left: 0; + margin-right: 1.6rem; + + @include media-breakpoint-up(md) { + margin-left: 1.6rem; + margin-right: 0; + } +} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f949cc46..d84e1156 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,18 +1,22 @@
-
{{ T "footer-love.text"}}
-
- {{ $contactPage := site.GetPage "contact" }} - {{ if $contactPage }} - {{ $contactPage.Title }} - {{ end }} - {{ $imprintPage := site.GetPage "imprint" }} - {{ if $imprintPage }} - {{ $imprintPage.Title }} - {{ end }} - {{ $privacyPage := site.GetPage "privacy" }} - {{ if $privacyPage }} - {{ $privacyPage.Title }} - {{ end }} +
+
{{ T "footer-love.text"}}
+
+ {{ $contactPage := site.GetPage "contact" }} + {{ if $contactPage }} + {{ $contactPage.Title }} + {{ end }} + {{ $imprintPage := site.GetPage "imprint" }} + {{ if $imprintPage }} + {{ $imprintPage.Title }} + {{ end }} + {{ $privacyPage := site.GetPage "privacy" }} + {{ if $privacyPage }} + {{ $privacyPage.Title }} + {{ end }} +
+
+
+
{{ T "information-disclaimer-short"}}
-
{{ T "information-disclaimer-short"}}
From 7da50785b006ea133d7f1480dd596b2c23ee355a Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 18:04:00 +0100 Subject: [PATCH 06/16] fix: footer-styling --- layouts/partials/footer.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index d84e1156..396fc009 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,8 @@
-
{{ T "footer-love.text"}}
+
+ {{ T "footer-love.text"}} +
{{ $contactPage := site.GetPage "contact" }} {{ if $contactPage }} @@ -17,6 +19,8 @@
-
{{ T "information-disclaimer-short"}}
+
+ {{ T "information-disclaimer-short"}} +
From 3370d68eafb4e63b186f786872ce4690db26ceff Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 18:04:25 +0100 Subject: [PATCH 07/16] fix: footer-styling --- layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 396fc009..4ebe3229 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,6 +1,6 @@
-
+
{{ T "footer-love.text"}}
From 1f19518ba7f7cf11cf0b459f9fdb4c4b530793bc Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 18:16:17 +0100 Subject: [PATCH 08/16] fix: link-styling --- assets/sass/styles.scss | 17 ++++++++++++++++- assets/sass/teaser.scss | 6 ------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index a94451c5..0177da07 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -14,7 +14,7 @@ header { position: relative; } -a { +a:not(.m-teaser) { color: #ec0016; &:hover, @@ -23,6 +23,21 @@ a { } } +a.m-teaser { + .m-teaser__headline { + color: #ec0016; + text-decoration: underline; + transition: color .3s ease; + } + + &:hover, + &:focus { + .m-teaser__headline { + color: #c50014; + } + } +} + .o-footer__link { text-decoration: underline; color: black; diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index e64e5f8e..0dd4b3fd 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -13,12 +13,6 @@ margin-bottom: 2.4rem; } -.m-teaser__headline { - color: #ec0016; - text-decoration: underline; - -} - .m-teaser img { width: 100%; aspect-ratio: 16/9; From 98bf753c8a960453155fb8ce6fabdba24b721b0c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 18:32:47 +0100 Subject: [PATCH 09/16] fix: list title localization --- i18n/de.yaml | 3 +++ i18n/en.yaml | 3 +++ layouts/_default/list.html | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/i18n/de.yaml b/i18n/de.yaml index 4df186a5..b2ea3221 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -16,3 +16,6 @@ highlight-important: Wichtige Information highlight-inofficial: Inoffizielle Information highlight-tip: Persönlicher Tipp news-headline: Was gibt's neues? +_operator__list_title: Betreiber +_country__list_title: LÀnder +_news__list_title: Neuigkeiten \ No newline at end of file diff --git a/i18n/en.yaml b/i18n/en.yaml index 4f43a296..564259a0 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -16,3 +16,6 @@ highlight-important: Important Information highlight-inofficial: Unofficial Information highlight-tip: Personal Tip news-headline: What's new? +_operator__list_title: Operator +_country__list_title: Countries +_news__list_title: News diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5820d63c..29c1701f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,7 +1,10 @@ {{ define "main" }}
-

{{ .Title }}

+ {{ $path := .RelPermalink }} + {{ $cleanPath := replaceRE "^/[^/]+/" "/" $path }} + {{ $key := printf "%s_list_title" (replace $cleanPath "/" "_" -1) }} +

{{ i18n $key }}

{{ .Content }} {{ range .Pages }}

{{ .LinkTitle }}

From cfcf5dd502fd0eb796fd030afc27bebdcd61d766 Mon Sep 17 00:00:00 2001 From: lennartrommeiss Date: Wed, 5 Mar 2025 21:07:30 +0100 Subject: [PATCH 10/16] fix: special layout for common pages (no date) Signed-off-by: lennartrommeiss --- layouts/_default/common.html | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 layouts/_default/common.html diff --git a/layouts/_default/common.html b/layouts/_default/common.html new file mode 100644 index 00000000..bd616b48 --- /dev/null +++ b/layouts/_default/common.html @@ -0,0 +1,10 @@ +{{ define "main" }} +
+

{{ .Title }}

+ +
+ {{ .Content }} +
+ +
+{{ end }} \ No newline at end of file From f87be945d8b86cb8e97187620c45a78ecea11839 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 21:09:12 +0100 Subject: [PATCH 11/16] fix: styling --- assets/sass/footer.scss | 2 ++ assets/sass/headings.scss | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/assets/sass/footer.scss b/assets/sass/footer.scss index 3693411b..2f19f004 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -6,9 +6,11 @@ .o-footer__links { display: flex; justify-content: normal; + flex-flow: column; @include media-breakpoint-up(md) { justify-content: flex-end; + flex-flow: row; } } diff --git a/assets/sass/headings.scss b/assets/sass/headings.scss index f65a94f1..e27ccd14 100644 --- a/assets/sass/headings.scss +++ b/assets/sass/headings.scss @@ -3,6 +3,7 @@ h1 { line-height: 1.25; font-weight: 700; margin-bottom: 2rem; + text-wrap: balance; } h2 { @@ -10,6 +11,7 @@ h2 { line-height: 1.25; margin-bottom: 1.2rem; font-weight: 700; + text-wrap: balance; } h3 { @@ -17,6 +19,7 @@ h3 { line-height: 1.25; margin-bottom: 1rem; font-weight: 700; + text-wrap: balance; } h4 { @@ -24,6 +27,7 @@ h4 { line-height: 1.25; margin-bottom: 1rem; font-weight: 700; + text-wrap: balance; } h2:has(+ .updateDate) { From 63deafb68cd4d8b63241f4d2bc3f5290bdc76d04 Mon Sep 17 00:00:00 2001 From: lennartrommeiss Date: Wed, 5 Mar 2025 21:18:25 +0100 Subject: [PATCH 12/16] fix: headlines in news Signed-off-by: lennartrommeiss --- content/news/2/index.de.md | 4 +--- content/news/2/index.en.md | 4 +--- content/news/3/index.de.md | 8 ++++---- content/news/3/index.en.md | 8 ++++---- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/content/news/2/index.de.md b/content/news/2/index.de.md index 8c02a12b..ad847c9f 100644 --- a/content/news/2/index.de.md +++ b/content/news/2/index.de.md @@ -5,11 +5,9 @@ author: "Willy" title: "GrenzĂŒberschreitende FIP-Tickets der SNCB" --- -## SNCB vereinfacht Kauf von FIP-Tickets auf internationaler Website - Die belgische Staatsbahn SNCB / NMBS bietet auf ihrer [Website fĂŒr internationale Fahrkarten ](https://www.b-europe.com/) neben regulĂ€ren grenzĂŒberschreitenden Tickets nun auch Tickets mit FIP-Rabatt an. Dies erleichtert den Kauf von Fahrkarten, die ĂŒber die Grenze Belgiens hinausgehen, erheblich. Bisher mussten diese an einem Schalter in Belgien oder bestimmten NachbarlĂ€ndern wie Deutschland oder den Niederlanden gekauft werden. -### Folgende Tickets sind möglich +## Folgende Tickets sind möglich Das Angebot umfasst folgende Möglichkeiten: - GrenzĂŒberschreitende Tickets mit Freifahrt in Belgien diff --git a/content/news/2/index.en.md b/content/news/2/index.en.md index 89a1abae..e6702027 100644 --- a/content/news/2/index.en.md +++ b/content/news/2/index.en.md @@ -5,11 +5,9 @@ author: "Willy" title: "Cross-border FIP Tickets of SNCB" --- -## SNCB simplifies purchase of FIP tickets on international website - The Belgian national railway company SNCB / NMBS now offers tickets with FIP discount on their [international ticket website](https://www.b-europe.com/) in addition to regular cross-border tickets. This significantly simplifies the purchase of tickets that go beyond the borders of Belgium. Previously, these had to be purchased at a counter in Belgium or certain neighboring countries such as Germany or the Netherlands. -### The following tickets are available +## The following tickets are available The offer includes the following options: - Cross-border tickets with free travel in Belgium diff --git a/content/news/3/index.de.md b/content/news/3/index.de.md index eb6c243b..cc892361 100644 --- a/content/news/3/index.de.md +++ b/content/news/3/index.de.md @@ -6,19 +6,19 @@ title: "Unglaubliche Entdeckung im Park!" Heute Morgen wurde im Park eine sensationelle Entdeckung gemacht. Ein SpaziergĂ€nger fand heraus, dass ein unscheinbarer Baum tatsĂ€chlich ein Portal zu einer anderen Dimension ist. -### Die Geschichte +## Die Geschichte Es begann alles, als Frau Meier, eine regelmĂ€ĂŸige Parkbesucherin, sich unter dem Baum ausruhen wollte. Doch anstatt eines ruhigen Moments fand sie sich plötzlich in einer Welt voller fliegender Eichhörnchen und sprechender Blumen wieder. "Es war wie ein MĂ€rchen, aber ich war wach!", berichtete Frau Meier. -### Reaktionen +## Reaktionen Die anderen Parkbesucher waren zunĂ€chst skeptisch, doch nach mehreren erfolgreichen Expeditionen in die "Baum-Dimension" sind sie nun ĂŒberzeugt. "Es ist unglaublich! Ich habe dort sogar meinen verlorenen Hut wiedergefunden", sagte Herr Schmidt begeistert. -### Wissenschaftliche Untersuchung +## Wissenschaftliche Untersuchung Ein Team von Wissenschaftlern wurde bereits beauftragt, das PhĂ€nomen zu untersuchen. Erste Theorien deuten darauf hin, dass es sich um eine Art Wurmloch handelt, das durch die spezielle Anordnung der Äste und BlĂ€tter im Baum entstanden ist. -### Fazit +## Fazit Die Entdeckung hat den Park in Aufruhr versetzt und die SpaziergĂ€nge sind nun spannender denn je. Wer weiß, welche Geheimnisse der Baum noch birgt? Eines ist sicher: Der Ruheplatz von Frau Meier bleibt vorerst unberĂŒhrt. diff --git a/content/news/3/index.en.md b/content/news/3/index.en.md index e95540b6..bbd91413 100644 --- a/content/news/3/index.en.md +++ b/content/news/3/index.en.md @@ -6,19 +6,19 @@ title: "Incredible Discovery in the Park!" This morning, a sensational discovery was made in the park. A walker found out that an unassuming tree is actually a portal to another dimension. -### The Story +## The Story It all started when Mrs. Meier, a regular park visitor, wanted to rest under the tree. But instead of a quiet moment, she suddenly found herself in a world full of flying squirrels and talking flowers. "It was like a fairy tale, but I was awake!" reported Mrs. Meier. -### Reactions +## Reactions The other park visitors were initially skeptical, but after several successful expeditions into the "tree dimension," they are now convinced. "It's incredible! I even found my lost hat there," said Mr. Schmidt enthusiastically. -### Scientific Investigation +## Scientific Investigation A team of scientists has already been commissioned to investigate the phenomenon. Initial theories suggest that it is a kind of wormhole created by the special arrangement of the branches and leaves in the tree. -### Conclusion +## Conclusion The discovery has stirred up the park, and walks are now more exciting than ever. Who knows what other secrets the tree holds? One thing is certain: Mrs. Meier's resting spot remains untouched for now. From 556ff67a745b4d8376b8eb26b9dff93535ad8d76 Mon Sep 17 00:00:00 2001 From: lennartrommeiss Date: Wed, 5 Mar 2025 21:23:04 +0100 Subject: [PATCH 13/16] fix: improve formatting without a spearate template and use the date if statement instead Signed-off-by: lennartrommeiss --- content/contact.de.html | 1 - content/contact.en.html | 1 - content/generalInformation.de.md | 2 -- content/generalInformation.en.md | 2 -- content/imprint.de.md | 3 --- content/imprint.en.md | 3 --- content/privacy.de.md | 3 --- content/privacy.en.md | 3 --- content/success.de.html | 1 - content/success.en.html | 1 - layouts/_default/common.html | 10 ---------- 11 files changed, 30 deletions(-) delete mode 100644 layouts/_default/common.html diff --git a/content/contact.de.html b/content/contact.de.html index 20621fab..958659f0 100644 --- a/content/contact.de.html +++ b/content/contact.de.html @@ -1,6 +1,5 @@ --- title: "Kontakt" -layout: "common" ---
diff --git a/content/contact.en.html b/content/contact.en.html index 485ec85f..4262e2ae 100644 --- a/content/contact.en.html +++ b/content/contact.en.html @@ -1,6 +1,5 @@ --- title: "Contact" -layout: "common" --- diff --git a/content/generalInformation.de.md b/content/generalInformation.de.md index 9c663087..4b17756e 100644 --- a/content/generalInformation.de.md +++ b/content/generalInformation.de.md @@ -1,8 +1,6 @@ --- date: "2024-10-17" -draft: false title: "Übergreifende Infos" -layout: "common" --- Willkommen auf unserer Webseite! Hier finden Sie alle wichtigen Informationen rund um unser Projekt. diff --git a/content/generalInformation.en.md b/content/generalInformation.en.md index 8cd5cd8e..5e773288 100644 --- a/content/generalInformation.en.md +++ b/content/generalInformation.en.md @@ -1,8 +1,6 @@ --- date: "2024-10-17" -draft: false title: "General Information" -layout: "common" --- Welcome to our website! Here you will find all the important information about our project. diff --git a/content/imprint.de.md b/content/imprint.de.md index 725f306b..a3096a50 100644 --- a/content/imprint.de.md +++ b/content/imprint.de.md @@ -1,8 +1,5 @@ --- -date: "2024-10-17" -draft: false title: "Impressum" -layout: "common" --- **Lennart Rommeiß**\ diff --git a/content/imprint.en.md b/content/imprint.en.md index 237ccd09..d3bf27ab 100644 --- a/content/imprint.en.md +++ b/content/imprint.en.md @@ -1,8 +1,5 @@ --- -date: "2024-10-17" -draft: false title: "Imprint" -layout: "common" --- **Lennart Rommeiß**\ diff --git a/content/privacy.de.md b/content/privacy.de.md index 2d074b14..9ac5dddf 100644 --- a/content/privacy.de.md +++ b/content/privacy.de.md @@ -1,8 +1,5 @@ --- -date: "2024-10-17" -draft: false title: "DatenschutzerklĂ€rung" -layout: "common" --- **Lennart Rommeiß**\ diff --git a/content/privacy.en.md b/content/privacy.en.md index 90193904..04eb869b 100644 --- a/content/privacy.en.md +++ b/content/privacy.en.md @@ -1,8 +1,5 @@ --- -date: "2024-10-17" -draft: false title: "Privacy Policy" -layout: "common" --- **Lennart Rommeiß**\ diff --git a/content/success.de.html b/content/success.de.html index 471f746d..9c662ca2 100644 --- a/content/success.de.html +++ b/content/success.de.html @@ -1,6 +1,5 @@ --- title: "Erfolgreich!" -layout: "common" ---
diff --git a/content/success.en.html b/content/success.en.html index 808abc4f..eaa8a276 100644 --- a/content/success.en.html +++ b/content/success.en.html @@ -1,6 +1,5 @@ --- title: "Success" -layout: "common" ---
diff --git a/layouts/_default/common.html b/layouts/_default/common.html deleted file mode 100644 index bd616b48..00000000 --- a/layouts/_default/common.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
-

{{ .Title }}

- -
- {{ .Content }} -
- -
-{{ end }} \ No newline at end of file From 3d7a405f6904284fe603fd0ec1b55936edbc850c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 22:18:17 +0100 Subject: [PATCH 14/16] feat: global styling --- assets/images/logo.svg | 25 +++++++++++++++---------- assets/sass/_variables.scss | 4 ++++ assets/sass/footer.scss | 10 +++++++++- assets/sass/navigation.scss | 22 ++++++++++++++-------- assets/sass/stage.scss | 19 +++++++++++++++++++ assets/sass/styles.scss | 21 +++++---------------- layouts/partials/menu.html | 2 +- 7 files changed, 67 insertions(+), 36 deletions(-) diff --git a/assets/images/logo.svg b/assets/images/logo.svg index 53faf277..a363f835 100644 --- a/assets/images/logo.svg +++ b/assets/images/logo.svg @@ -1,10 +1,15 @@ - - - - - - - - - - + + + Group 11 + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss index 8cf9ba8d..cbb9079c 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -2,4 +2,8 @@ body { --bs-light-rgb: 219, 224, 229; --pagefind-ui-scale: 1; --pagefind-ui-text: #000; + --link-default: #BA3D12; + --link-hovered: #8F2501; + --link-special: #000000; + --bg-accent: #FFD900; } \ No newline at end of file diff --git a/assets/sass/footer.scss b/assets/sass/footer.scss index 2f19f004..142d7c4c 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -17,9 +17,17 @@ .o-footer__link { margin-left: 0; margin-right: 1.6rem; + text-decoration: underline; + color: var(--link-special); + font-weight: 700; + + &:hover, + &:focus { + color: var(--link-hovered); + } @include media-breakpoint-up(md) { margin-left: 1.6rem; margin-right: 0; } -} +} \ No newline at end of file diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index bf3a574b..98913e88 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -43,21 +43,27 @@ .o-header__logo { display: flex; - padding: 1rem; margin: .3rem; position: relative; + text-decoration: none; h1 { - position: absolute; - top: 1.6rem; - left: 1.7rem; margin: 0; - font-size: 1.5rem; - color: black; + font-size: 2.4rem; + color: var(--link-special); + font-weight: 700; + align-self: center; + text-wrap-mode: nowrap; + + &:hover, + &:focus { + color: var(--link-hovered); + text-decoration: underline; + } } img { - width: 8rem; + width: 5rem; } } @@ -111,7 +117,7 @@ &:hover, &:focus { - color: red; + color: var(--link-hovered); } span { diff --git a/assets/sass/stage.scss b/assets/sass/stage.scss index 7d1368ca..8bb39e12 100644 --- a/assets/sass/stage.scss +++ b/assets/sass/stage.scss @@ -67,6 +67,21 @@ border-bottom-right-radius: var(--pagefind-ui-border-radius); } + .pagefind-ui__result-link { + color: var(--link-default); + text-decoration: underline; + + &:hover, + &:focus { + color: var(--link-hovered); + } + } + + .pagefind-ui__result-link:hover, + .pagefind-ui__result-link:focus { + color: var(--link-hovered); + } + .pagefind-ui__result-link:focus { outline: .2rem solid orange; outline-offset: .1rem; @@ -76,6 +91,10 @@ .pagefind-ui__result-link::before { top: -.2rem; } + + .pagefind-ui--reset mark { + background-color: var(--bg-accent); + } } .curtain { diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 0177da07..f023dc05 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -4,7 +4,7 @@ html { } body { - background-color: $gray-200; + background-color: #EBE9E1; font-size: 1.8rem; overflow-x: hidden; } @@ -15,17 +15,17 @@ header { } a:not(.m-teaser) { - color: #ec0016; + color: var(--link-default); &:hover, &:focus { - color: #c50014; + color: var(--link-hovered); } } a.m-teaser { .m-teaser__headline { - color: #ec0016; + color: var(--link-default); text-decoration: underline; transition: color .3s ease; } @@ -33,22 +33,11 @@ a.m-teaser { &:hover, &:focus { .m-teaser__headline { - color: #c50014; + color: var(--link-hovered); } } } -.o-footer__link { - text-decoration: underline; - color: black; - font-weight: 700; - - &:hover, - &:focus { - color: red; - } -} - header { background-color: #fff; } diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 9251e2c0..d80633d0 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -5,8 +5,8 @@
From 670adc5db609f4e9e8ba1733cd5b36739a95b2ea Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 22:57:50 +0100 Subject: [PATCH 15/16] feat: global styling --- assets/sass/_variables.scss | 9 +++++++++ assets/sass/form.scss | 19 +++++++++++++++++-- assets/sass/navigation.scss | 8 ++++---- assets/sass/stage.scss | 23 +++++++++++++++++++---- assets/sass/styles.scss | 16 +++++++++++++--- assets/sass/teaser.scss | 4 ++-- assets/sass/textHighlight.scss | 2 +- 7 files changed, 65 insertions(+), 16 deletions(-) diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss index cbb9079c..95690e93 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -5,5 +5,14 @@ body { --link-default: #BA3D12; --link-hovered: #8F2501; --link-special: #000000; + --bg-default: #FFFFFF; + --bg-neutral: #EBE9E1; --bg-accent: #FFD900; + --bg-accent2: #DABA00; + --color-onDark: #FFFFFF; + --color-onLight: #000000; + --border-radius-s: .4rem; + --border-radius-m: .8rem; + --border-radius-l: 1.2rem; + --pagefind-ui-border-radius: var(--border-radius-l); } \ No newline at end of file diff --git a/assets/sass/form.scss b/assets/sass/form.scss index 4cacb09e..a0b5bb10 100644 --- a/assets/sass/form.scss +++ b/assets/sass/form.scss @@ -1,13 +1,17 @@ .m-form { margin-bottom: 1.6rem; - .row>* { + .row > label { padding: 0; } input[type=text], input[type=email], select, textarea { width: 100%; margin-bottom: 1.6rem; + border-radius: var(--border-radius-m); + border-width: .2rem; + border-color: var(--color-onLight); + padding: 1.2rem; @include media-breakpoint-up(md) { width: 50%; @@ -15,6 +19,17 @@ } input[type=submit] { width: auto; - padding: 0 1rem; + padding: 1.2rem 2.4rem; + background-color: var(--bg-accent); + color: var(--color-onLight); + border: none; + border-radius: var(--border-radius-m); + transition: background-color .3s ease; + font-weight: 700; + + &:hover, + &:focus { + background-color: var(--bg-accent2); + } } } \ No newline at end of file diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 98913e88..4ae66b6b 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -81,9 +81,9 @@ padding: 1rem; margin: .3rem; pointer-events: none; - background-color: gainsboro; - border-radius: .4rem; - color: black; + background-color: var(--bg-neutral); + border-radius: var(--border-radius-s); + color: var(--color-onDark); &:focus { opacity: 1; @@ -151,7 +151,7 @@ flex-direction: column; background-color: white; box-shadow: 0 .4rem 1rem 0 rgba(0,0,0,.1); - border-radius: .4rem; + border-radius: var(--border-radius-s); } &.o-header__item-countries--open { diff --git a/assets/sass/stage.scss b/assets/sass/stage.scss index 8bb39e12..838e6756 100644 --- a/assets/sass/stage.scss +++ b/assets/sass/stage.scss @@ -7,7 +7,7 @@ max-width: 1320px; img { - border-radius: 0 0 1rem 1rem; + border-radius: 0 0 var(--border-radius-l) var(--border-radius-l); } } @@ -30,6 +30,12 @@ width: 60%; } + .pagefind-ui__search-input, + .pagefind-ui__message, + .pagefind-ui__search-clear { + font-family: "Roboto", Arial, Helvetica, sans-serif; + } + .pagefind-ui__search-input { z-index: 3; outline: .2rem solid transparent; @@ -44,7 +50,7 @@ z-index: 3; height: auto; padding: 1rem; - top: .7rem; + top: 1rem; margin-right: .7rem; } @@ -54,7 +60,7 @@ .pagefind-ui__drawer { background-color: white; - padding: 0 1rem; + padding: 0 1rem 1rem 1rem; overscroll-behavior: contain; height: 35rem; overflow-y: scroll; @@ -85,7 +91,7 @@ .pagefind-ui__result-link:focus { outline: .2rem solid orange; outline-offset: .1rem; - border-radius: .4rem; + border-radius: var(--border-radius-s); } .pagefind-ui__result-link::before { @@ -95,6 +101,15 @@ .pagefind-ui--reset mark { background-color: var(--bg-accent); } + + .pagefind-ui__button { + background-color: var(--bg-accent); + + &:hover, + &:focus { + background-color: var(--bg-accent2); + } + } } .curtain { diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index f023dc05..7e394974 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -1,6 +1,6 @@ html { font-size: 62.5%; - color: #000; + color: var(--color-onLight); } body { @@ -44,9 +44,13 @@ header { main > .container:not(.o-stage) { margin-top: 4rem; - background-color: white; - border-radius: 1rem; + background-color: var(--bg-default); + border-radius: var(--border-radius-l); padding: 2rem; + + @include media-breakpoint-down(sm) { + margin-top: 1.6rem; + } } img { @@ -85,4 +89,10 @@ p:has( + ul) { article p:last-child { margin-bottom: 0; +} + +.container { + @include media-breakpoint-down(sm) { + max-width: calc(100% - 3.6rem); + } } \ No newline at end of file diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index 0dd4b3fd..d51b9af7 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -16,7 +16,7 @@ .m-teaser img { width: 100%; aspect-ratio: 16/9; - border-radius: 1rem; + border-radius: var(--border-radius-l); } .m-teaser__dateline { @@ -38,5 +38,5 @@ width: 60%; height: 6rem; background-color: white; - border-radius: 1rem; + border-radius: var(--border-radius-l); } \ No newline at end of file diff --git a/assets/sass/textHighlight.scss b/assets/sass/textHighlight.scss index 1cb97a30..5dce498e 100644 --- a/assets/sass/textHighlight.scss +++ b/assets/sass/textHighlight.scss @@ -2,7 +2,7 @@ background-color: #eee; padding: 1.5rem; margin-bottom: 1rem; - border-radius: .8rem; + border-radius: var(--border-radius-m); border-left: gray solid 1rem; } From b5b11f2ae149683caba105f2179d94e40002ab7e Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 5 Mar 2025 23:05:31 +0100 Subject: [PATCH 16/16] feat: sticky navbar --- assets/sass/navigation.scss | 6 ++++++ layouts/_default/baseof.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 4ae66b6b..f7973348 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -1,3 +1,9 @@ +#header { + position: sticky; + top: 0; + box-shadow: 0 .4rem 1rem 0 rgba(0,0,0,.1); +} + .o-header { display: flex; justify-content: space-between; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b2ca21b2..7515b53f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,7 +7,7 @@ {{ partial "head.html" . }} -
{{ partial "header.html" . }}
+
{{ block "main" . }}{{ end }}