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..95690e93 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -2,4 +2,17 @@ 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-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/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/footer.scss b/assets/sass/footer.scss index 3f760d58..142d7c4c 100644 --- a/assets/sass/footer.scss +++ b/assets/sass/footer.scss @@ -3,11 +3,31 @@ margin-bottom: 2rem; } -.o-footer div { +.o-footer__links { display: flex; - justify-content: flex-end; + justify-content: normal; + flex-flow: column; + + @include media-breakpoint-up(md) { + justify-content: flex-end; + flex-flow: row; + } } .o-footer__link { - margin-left: 1.6rem; + 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/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/headings.scss b/assets/sass/headings.scss index ef8e86ff..e27ccd14 100644 --- a/assets/sass/headings.scss +++ b/assets/sass/headings.scss @@ -3,25 +3,33 @@ h1 { line-height: 1.25; font-weight: 700; margin-bottom: 2rem; + text-wrap: balance; } h2 { font-size: 2.4rem; line-height: 1.25; - margin-bottom: 1.6rem; + margin-bottom: 1.2rem; font-weight: 700; + text-wrap: balance; } h3 { font-size: 2rem; line-height: 1.25; - margin-bottom: 1.4rem; + margin-bottom: 1rem; font-weight: 700; + text-wrap: balance; } h4 { font-size: 1.8rem; line-height: 1.25; - margin-bottom: 1.2rem; + margin-bottom: 1rem; font-weight: 700; + text-wrap: balance; +} + +h2:has(+ .updateDate) { + margin-bottom: .4rem; } \ No newline at end of file diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index bf3a574b..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; @@ -43,21 +49,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; } } @@ -75,9 +87,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; @@ -111,7 +123,7 @@ &:hover, &:focus { - color: red; + color: var(--link-hovered); } span { @@ -145,7 +157,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 7d1368ca..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; @@ -67,15 +73,43 @@ 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; - border-radius: .4rem; + border-radius: var(--border-radius-s); } .pagefind-ui__result-link::before { top: -.2rem; } + + .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 9d1314d9..7e394974 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -1,10 +1,10 @@ html { font-size: 62.5%; - color: #000; + color: var(--color-onLight); } body { - background-color: $gray-200; + background-color: #EBE9E1; font-size: 1.8rem; overflow-x: hidden; } @@ -14,23 +14,27 @@ header { position: relative; } -a { - color: #ec0016; +a:not(.m-teaser) { + color: var(--link-default); &:hover, &:focus { - color: #c50014; + color: var(--link-hovered); } } -.o-footer__link { - text-decoration: underline; - color: black; - font-weight: 700; +a.m-teaser { + .m-teaser__headline { + color: var(--link-default); + text-decoration: underline; + transition: color .3s ease; + } &:hover, &:focus { - color: red; + .m-teaser__headline { + color: var(--link-hovered); + } } } @@ -40,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 { @@ -75,10 +83,16 @@ p { margin-bottom: 3.2rem; } -p:has(p + ul) { - margin-bottom: 0; +p:has( + ul) { + margin-bottom: 1rem; } 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 b1665a81..d51b9af7 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -9,10 +9,14 @@ } } +.m-teaser--listview { + margin-bottom: 2.4rem; +} + .m-teaser img { width: 100%; aspect-ratio: 16/9; - border-radius: 1rem; + border-radius: var(--border-radius-l); } .m-teaser__dateline { @@ -34,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; } 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/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. 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/i18n/de.yaml b/i18n/de.yaml index b54f4406..b2ea3221 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -15,3 +15,7 @@ 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? +_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 05f723eb..564259a0 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -15,3 +15,7 @@ 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? +_operator__list_title: Operator +_country__list_title: Countries +_news__list_title: News 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 }}
{{ partial "footer.html" . }}
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 }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 33a33a5b..29c1701f 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,13 +1,16 @@ {{ define "main" }} -
-

{{ .Title }}

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

{{ .LinkTitle }}

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

{{ i18n $key }}

+ {{ .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..d2f366f5 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" }} @@ -26,5 +26,5 @@

See Also

{{ end }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} -
+ {{ end }} \ No newline at end of file diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f949cc46..4ebe3229 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,18 +1,26 @@
-
{{ 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"}}
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 @@