diff --git a/assets/images/logo.svg b/assets/images/logo.svg index 37e3c74d..53faf277 100644 --- a/assets/images/logo.svg +++ b/assets/images/logo.svg @@ -1,8 +1,7 @@ - - + diff --git a/assets/sass/headings.scss b/assets/sass/headings.scss new file mode 100644 index 00000000..ef8e86ff --- /dev/null +++ b/assets/sass/headings.scss @@ -0,0 +1,27 @@ +h1 { + font-size: 3.6rem; + line-height: 1.25; + font-weight: 700; + margin-bottom: 2rem; +} + +h2 { + font-size: 2.4rem; + line-height: 1.25; + margin-bottom: 1.6rem; + font-weight: 700; +} + +h3 { + font-size: 2rem; + line-height: 1.25; + margin-bottom: 1.4rem; + font-weight: 700; +} + +h4 { + font-size: 1.8rem; + line-height: 1.25; + margin-bottom: 1.2rem; + font-weight: 700; +} \ No newline at end of file diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 9b7792fa..13f532e6 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -8,4 +8,5 @@ @import "footer.scss"; @import "content.scss"; @import "textHighlight.scss"; +@import "headings.scss"; @import 'node_modules/@material-design-icons/font/round.scss'; \ No newline at end of file diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index dbff9d0a..bf3a574b 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -45,6 +45,20 @@ display: flex; padding: 1rem; margin: .3rem; + position: relative; + + h1 { + position: absolute; + top: 1.6rem; + left: 1.7rem; + margin: 0; + font-size: 1.5rem; + color: black; + } + + img { + width: 8rem; + } } .o-header__nav menu { diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 36b51692..9d1314d9 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -69,4 +69,16 @@ details[open] summary ~ * { opacity: 1; transform: translateY(0); } +} + +p { + margin-bottom: 3.2rem; +} + +p:has(p + ul) { + margin-bottom: 0; +} + +article p:last-child { + margin-bottom: 0; } \ No newline at end of file diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index 82d0cf74..b1665a81 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -1,6 +1,12 @@ .m-teaser { text-decoration: none; color: #000; + + &:nth-child(-n+3) { + @include media-breakpoint-down(lg) { + margin-bottom: 2rem; + } + } } .m-teaser img { @@ -9,6 +15,14 @@ border-radius: 1rem; } +.m-teaser__dateline { + font-size: 1.4rem; +} + +.m-teaser__headline { + margin-bottom: .5rem; +} + .o-stage { display: flex; justify-content: center; diff --git a/content/_index.de.md b/content/_index.de.md index ccac264d..177658de 100644 --- a/content/_index.de.md +++ b/content/_index.de.md @@ -1,6 +1,8 @@ -### Hallo Welt +## Willkommen beim FIP-Guide! -Wir sind der FIP Guide, warum wieso weshalb -Momentan gibt es die Infos für die Länder Belgien und Slowakei. +Auf dieser Webseite findest du Informationen zu den FIP-Regelungen verschiedener europäischer Länder. +Momentan gibt es die Infos für die Länder **Belgien** und **Slowakei**. -Der FIPGuide soll wachsen: [GitHub Repository](https://github.com/fipguide/fipguide.github.io) \ No newline at end of file +### Unterstütze uns +Du möchtest dein Wissen rund um FIP-Regelungen teilen? Schau auf unserem [GitHub Repository](https://github.com/fipguide/fipguide.github.io) vorbei, um Inhalte beizutragen. +Alternativ kannst du uns auch über das [Kontaktformular]({{< ref "contact" >}}) schreiben. \ No newline at end of file diff --git a/content/_index.en.md b/content/_index.en.md index dc907531..7fe19dae 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -1,6 +1,11 @@ -### Hello World +## Welcome to the FIP Guide! + +On this website, you will find information about the FIP regulations of various European countries. +Currently, we have information for the countries **Belgium** and **Slovakia**. + +### Support Us +Would you like to share your knowledge about FIP regulations? Visit our [GitHub Repository](https://github.com/fipguide/fipguide.github.io) to contribute content. +Alternatively, you can also write to us via the [contact form]({{< ref "contact" >}}). + -We are the FIP Guide, explaining why and how -Currently, there is information available for Belgium and Slovakia. -The FIPGuide aims to grow: [GitHub Repository](https://github.com/fipguide/fipguide.github.io) \ No newline at end of file diff --git a/i18n/de.yaml b/i18n/de.yaml index 92fe7df2..b54f4406 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -5,7 +5,9 @@ country: other: Länder search-placeholder: Gib ein Land oder Bahnunternehmen ein search-button: Suchen -footer-love: Made with ♥️ in Frankfurt & Köln +footer-love: + text: Made with ♥️ in Frankfurt & Köln + aria-label: Made with love in Frankfurt & Köln menu-open: Menü menu-close: Schließen general: Übergreifendes diff --git a/i18n/en.yaml b/i18n/en.yaml index 3d93dbcd..05f723eb 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -5,7 +5,9 @@ country: other: countries search-placeholder: Type in a country or train operator search-button: Search -footer-love: Made with ♥️ in Frankfurt & Cologne +footer-love: + text: Made with ♥️ in Frankfurt & Cologne + aria-label: Made with love in Frankfurt & Cologne menu-open: Menu menu-close: Close general: general diff --git a/layouts/_default/home.html b/layouts/_default/home.html index 0c12cf53..ac674763 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -3,14 +3,10 @@ {{ partial "stage.html" }}
{{ .Content }} - {{ T "country"}}: - {{ range where site.RegularPages "Section" "country"}} - {{ .Title }} - {{ end }}
-
-

Die neuesten Neuigkeiten 🔥

+
+

Die neuesten Neuigkeiten 🔥

{{ 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 b6548d4d..93841427 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -2,7 +2,12 @@

{{ .Title }}

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

{{ .LinkTitle }}

- {{ .Summary }} {{ end }} +
+ +

{{ .LinkTitle }}

+ +
{{ .Summary | plainify | truncate 200 }}
+
+ {{ end }}
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 8c618ebb..8959a88d 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" }} @@ -7,8 +7,6 @@

{{ .Title }}

-
-
{{ .Content }} @@ -24,5 +22,5 @@

See Also

{{ end }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} -
+
{{ end }} \ No newline at end of file diff --git a/layouts/country/single.html b/layouts/country/single.html index 6f25d157..d0e5c854 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" }} @@ -7,12 +7,11 @@

{{ .Title }}

-
-
- +
{{ .TableOfContents }}
+
{{ .Content }} @@ -28,5 +27,5 @@

See Also

{{ end }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} -
+
{{ end }} \ No newline at end of file diff --git a/layouts/operator/single.html b/layouts/operator/single.html index 4600bfa4..c498ba51 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" }} @@ -7,13 +7,11 @@

{{ .Title }}

-
-
- +
{{ .TableOfContents }}
- +
{{ .Content }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8be93676..f949cc46 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,5 +1,5 @@
-
{{ T "footer-love"}}
+
{{ T "footer-love.text"}}
{{ $contactPage := site.GetPage "contact" }} {{ if $contactPage }} diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index e86c9ac2..9251e2c0 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -5,6 +5,7 @@
diff --git a/layouts/partials/teaser.html b/layouts/partials/teaser.html index afe34db2..0f1f5d7a 100644 --- a/layouts/partials/teaser.html +++ b/layouts/partials/teaser.html @@ -1,4 +1,4 @@ - + {{ $image := .Page.Resources.GetMatch "image.webp" }}
{{ partial "image.html" $image }} @@ -8,6 +8,6 @@

{{ .Title }}

- {{ .Summary | truncate 100 }} + {{ .Summary | plainify | truncate 100 }}