From 90e08c8367aee6367c90ebad6b748fe39205738c Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 10:55:56 +0100 Subject: [PATCH 01/15] fix: contact.en.html --- content/contact.de.html | 6 +++--- content/contact.en.html | 35 ++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/content/contact.de.html b/content/contact.de.html index 958659f0..d4a6d190 100644 --- a/content/contact.de.html +++ b/content/contact.de.html @@ -14,17 +14,17 @@
- +
- +
- +
diff --git a/content/contact.en.html b/content/contact.en.html index 4262e2ae..bedd3845 100644 --- a/content/contact.en.html +++ b/content/contact.en.html @@ -2,21 +2,30 @@ title: "Contact" --- -
- + + - }}"> + -
-

- -
-

- -
-

- +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
-Or write us an email: nextstop@fipguide.org +Or write us an email: nextstop@fipguide.org \ No newline at end of file From 7fabb08602d08e851c201ec4d0f4fcc557e9ebb4 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 11:01:22 +0100 Subject: [PATCH 02/15] fix: updateDate localization --- i18n/de.yaml | 3 ++- i18n/en.yaml | 1 + layouts/_default/single.html | 9 +-------- layouts/country/single.html | 7 ++----- layouts/operator/single.html | 7 ++----- layouts/partials/updateDate.html | 8 ++++++++ 6 files changed, 16 insertions(+), 19 deletions(-) create mode 100644 layouts/partials/updateDate.html diff --git a/i18n/de.yaml b/i18n/de.yaml index b2ea3221..8e5dc5a9 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -18,4 +18,5 @@ 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 +_news__list_title: Neuigkeiten +updateDate: Zuletzt aktualisiert \ No newline at end of file diff --git a/i18n/en.yaml b/i18n/en.yaml index 564259a0..2ef6295b 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -19,3 +19,4 @@ news-headline: What's new? _operator__list_title: Operator _country__list_title: Countries _news__list_title: News +updateDate: Last updated \ No newline at end of file diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 8400b6e0..4ae4e039 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,14 +2,7 @@

{{ .Title }}

- {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Date | time.Format ":date_long" }} - - {{ if .Date }} -
- -
- {{ end }} + {{ partial "updateDate.html" . }}
{{ .Content }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 92abfe30..ba78e48b 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -2,11 +2,8 @@

{{ .Title }}

- {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Date | time.Format ":date_long" }} -
- -
+ {{ partial "updateDate.html" . }} +
{{ .TableOfContents }} diff --git a/layouts/operator/single.html b/layouts/operator/single.html index d2f366f5..fc3f267b 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -2,11 +2,8 @@

{{ .Title }}

- {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Date | time.Format ":date_long" }} -
- -
+ {{ partial "updateDate.html" . }} +
{{ .TableOfContents }} diff --git a/layouts/partials/updateDate.html b/layouts/partials/updateDate.html new file mode 100644 index 00000000..93c8695c --- /dev/null +++ b/layouts/partials/updateDate.html @@ -0,0 +1,8 @@ +{{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} +{{ $dateHuman := .Date | time.Format ":date_long" }} + +{{ if .Date }} +
+ +
+{{ end }} \ No newline at end of file From 4df804221879f18ac2fa140e1a2a68b5bfae49f8 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:02:22 +0100 Subject: [PATCH 03/15] feature: expander styling --- assets/sass/expander.scss | 44 +++++++++++++++++++++++++++++++ assets/sass/main.scss | 3 ++- assets/sass/styles.scss | 21 --------------- content/operator/sncb/index.de.md | 14 +++++----- content/operator/sncb/index.en.md | 14 +++++----- content/operator/zsr/index.de.md | 14 +++++----- content/operator/zsr/index.en.md | 14 +++++----- layouts/shortcodes/expander.html | 10 ++++--- 8 files changed, 81 insertions(+), 53 deletions(-) create mode 100644 assets/sass/expander.scss diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss new file mode 100644 index 00000000..7237c35e --- /dev/null +++ b/assets/sass/expander.scss @@ -0,0 +1,44 @@ +summary { + display: flex; +} + +details { + padding: 1.2rem; + background-color: var(--bg-neutral); + border-radius: var(--border-radius-s); + margin-bottom: 1.2rem; +} + +details[open] > summary { + margin-bottom: 0.5rem; +} + +details > summary { + list-style-type: none; +} + +details > div { + margin-left: 3.2rem; +} + +details > summary::-webkit-details-marker { + display: none; +} + +summary::before { + content: '\e145'; + font-family: "material icons round"; + width: 2.4rem; + height: 2.4rem; + transition: 0.2s; + margin-right: .8rem; + transition: content 0.3s ease; +} + +details[open] > summary::before { + content: '\e15b'; +} + +details[open] > summary { + font-weight: 700; +} \ No newline at end of file diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 8c9aa153..2eb9fd41 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -10,4 +10,5 @@ @import "content.scss"; @import "textHighlight.scss"; @import "headings.scss"; -@import "form.scss"; \ No newline at end of file +@import "form.scss"; +@import "expander.scss"; \ No newline at end of file diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 7e394974..fded1dbe 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -58,27 +58,6 @@ img { height: auto; } -details { - position: relative; - overflow: hidden; - padding: 5px; -} - -details[open] summary ~ * { - animation: slideDown 0.5s ease-in-out; -} - -@keyframes slideDown { - from { - opacity: 0; - transform: translateY(-10px); - } - to { - opacity: 1; - transform: translateY(0); - } -} - p { margin-bottom: 3.2rem; } diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index bc3e9943..3ae6ae78 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -25,7 +25,7 @@ FIP-Freifahrtscheine und FIP 50 Tickets sind auf Verbindungen der SNCB gültig. Innerhalb Belgiens ist bei der SNCB keine Reservierung erforderlich und in vielen Zügen auch nicht möglich. Beim grenzüberschreitenden ICE nach Deutschland ist eine Reservierung möglich und war beispielsweise im Sommer 2024 auch verpflichtend (nur bei grenzüberschreitenden Reisen). -{{< expander "InterCity Express (ICE)" >}} +{{< expander "InterCity Express (ICE)" category >}} **Beschreibung:** Hochgeschwindigkeitszüge der Deutschen Bahn, die in Belgien von der SNCB übernommen werden. Sie verkehren zwischen Brüssel (Midi) und Deutschland (Köln / Frankfurt am Main), können jedoch auch innerhalb Belgiens zwischen Bruxelles Midi und Liège-Guillemins mit FIP Fahrscheinen ohne Aufschlag genutzt werden. **Reservierung möglich:** ja @@ -35,7 +35,7 @@ Hochgeschwindigkeitszüge der Deutschen Bahn, die in Belgien von der SNCB übern 5,20 € (2. Klasse) {{< /expander >}} -{{< expander "InterCity (IC)" >}} +{{< expander "InterCity (IC)" category >}} **Beschreibung:** Anders als in anderen Ländern keine wirklichen Fernzüge, sondern eher schnelle Regionalzüge mit wenigen Halten. **Reservierung möglich:** nein @@ -43,7 +43,7 @@ Anders als in anderen Ländern keine wirklichen Fernzüge, sondern eher schnelle **Kosten für Reservierung:** - {{< /expander >}} -{{< expander "Train local oder Lokale trein (L)" >}} +{{< expander "Train local oder Lokale trein (L)" category >}} **Beschreibung:** Regionalbahnen mit Halt an meist allen Stationen, in den Verbindungsauskünften oft auch einfach als "R" für Regionalzug zu finden. **Reservierung möglich:** nein @@ -51,7 +51,7 @@ Regionalbahnen mit Halt an meist allen Stationen, in den Verbindungsauskünften **Kosten für Reservierung:** - {{< /expander >}} -{{< expander "Train S oder S-Trein (S)" >}} +{{< expander "Train S oder S-Trein (S)" category >}} **Beschreibung:** Eine S-Bahn in den Großräumen Antwerpen, Brüssel, Charleroi, Gent oder Lüttich. Sie verbinden die großen Städte mit den Vororten und halten meist überall. Anders als in anderen Ländern zeichnen sich die S-Bahnen hier nicht durch dichtere Takte als bei anderen Zugkategorien aus. In der Verbindungsauskunft werden auch diese manchmal als "R" für Regionalzug zusammengefasst. **Reservierung möglich:** nein @@ -59,7 +59,7 @@ Eine S-Bahn in den Großräumen Antwerpen, Brüssel, Charleroi, Gent oder Lütti **Kosten für Reservierung:** - {{< /expander >}} -{{< expander "Train d’heure de pointe oder Piekuurtrein (P)" >}} +{{< expander "Train d’heure de pointe oder Piekuurtrein (P)" category >}} **Beschreibung:** Zusätzliche Züge zu den Hauptverkehrszeiten montags bis freitags morgens sowie am späten Nachmittag, in den Verbindungsauskünften oft auch einfach als "R" für Regionalzug zu finden. **Reservierung möglich:** nein @@ -67,7 +67,7 @@ Zusätzliche Züge zu den Hauptverkehrszeiten montags bis freitags morgens sowie **Kosten für Reservierung:** - {{< /expander >}} -{{< expander "Express (E/EXP/EXTRA)" >}} +{{< expander "Express (E/EXP/EXTRA)" category >}} **Beschreibung:** Zusätzliche Züge bei hohem Verkehrsaufkommen, vor allem in den Sommermonaten zur belgischen Küste. **Reservierung möglich:** nein @@ -75,7 +75,7 @@ Zusätzliche Züge bei hohem Verkehrsaufkommen, vor allem in den Sommermonaten z **Kosten für Reservierung:** - {{< /expander >}} -{{< expander "Tourist (T)" >}} +{{< expander "Tourist (T)" category >}} **Beschreibung:** Zusätzliche Züge zu bestimmten touristischen Zielen, oft auch einfach als "R" für Regionalzug zu finden. **Reservierung möglich:** nein diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index 2a8f9fc5..fca6c67f 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -25,7 +25,7 @@ FIP vouchers and FIP 50 tickets are valid on SNCB connections. For cross-border Within Belgium, no reservation is required for SNCB and in many trains, it is not possible. For the cross-border ICE to Germany, a reservation is possible and was mandatory in summer 2024 (only for cross-border journeys). -{{< expander "InterCity Express (ICE)" >}} +{{< expander "InterCity Express (ICE)" category >}} **Description:** High-speed trains of Deutsche Bahn, operated by SNCB in Belgium. They run between Brussels (Midi) and Germany (Cologne / Frankfurt am Main), but can also be used with FIP tickets without surcharge within Belgium between Brussels Midi and Liège-Guillemins. **Reservation possible:** yes @@ -35,7 +35,7 @@ High-speed trains of Deutsche Bahn, operated by SNCB in Belgium. They run betwee 5.20 € (2nd class) {{< /expander >}} -{{< expander "InterCity (IC)" >}} +{{< expander "InterCity (IC)" category >}} **Description:** Unlike in other countries, these are not real long-distance trains, but rather fast regional trains with few stops. **Reservation possible:** no @@ -43,7 +43,7 @@ Unlike in other countries, these are not real long-distance trains, but rather f **Cost of reservation:** - {{< /expander >}} -{{< expander "Train local or Lokale trein (L)" >}} +{{< expander "Train local or Lokale trein (L)" category >}} **Description:** Regional trains stopping at most stations, often simply referred to as "R" for regional train in connection information. **Reservation possible:** no @@ -51,7 +51,7 @@ Regional trains stopping at most stations, often simply referred to as "R" for r **Cost of reservation:** - {{< /expander >}} -{{< expander "Train S or S-Trein (S)" >}} +{{< expander "Train S or S-Trein (S)" category >}} **Description:** A suburban train in the metropolitan areas of Antwerp, Brussels, Charleroi, Ghent, or Liège. They connect the major cities with the suburbs and usually stop everywhere. Unlike in other countries, the S-trains here do not have denser schedules than other train categories. In the connection information, these are sometimes also summarized as "R" for regional train. **Reservation possible:** no @@ -59,7 +59,7 @@ A suburban train in the metropolitan areas of Antwerp, Brussels, Charleroi, Ghen **Cost of reservation:** - {{< /expander >}} -{{< expander "Train d’heure de pointe or Piekuurtrein (P)" >}} +{{< expander "Train d’heure de pointe or Piekuurtrein (P)" category >}} **Description:** Additional trains during peak hours from Monday to Friday mornings and late afternoons, often simply referred to as "R" for regional train in connection information. **Reservation possible:** no @@ -67,7 +67,7 @@ Additional trains during peak hours from Monday to Friday mornings and late afte **Cost of reservation:** - {{< /expander >}} -{{< expander "Express (E/EXP/EXTRA)" >}} +{{< expander "Express (E/EXP/EXTRA)" category >}} **Description:** Additional trains during high traffic periods, especially in the summer months to the Belgian coast. **Reservation possible:** no @@ -75,7 +75,7 @@ Additional trains during high traffic periods, especially in the summer months t **Cost of reservation:** - {{< /expander >}} -{{< expander "Tourist (T)" >}} +{{< expander "Tourist (T)" category >}} **Description:** Additional trains to certain tourist destinations, often simply referred to as "R" for regional train. **Reservation possible:** no diff --git a/content/operator/zsr/index.de.md b/content/operator/zsr/index.de.md index 1fc878ab..00433dd3 100644 --- a/content/operator/zsr/index.de.md +++ b/content/operator/zsr/index.de.md @@ -27,7 +27,7 @@ FIP-Freifahrtscheine und FIP 50 Tickets sind auf Verbindungen der ZSSK mit der E Reservierungspflicht für SC- und IC-Züge. Andere ZSSK Züge erfordern nur eine Reservierung in der 1. Klasse. -{{< expander "SuperCity (SC) ⚠️" >}} +{{< expander "SuperCity (SC) ⚠️" category >}} **Beschreibung:** Schnelle Neigetechnik-Züge (Pendolino), die zwischen Prag (Tschechien) und Košice, mit wenigen Halten verkehren. **Reservierung möglich:** ja @@ -36,7 +36,7 @@ Schnelle Neigetechnik-Züge (Pendolino), die zwischen Prag (Tschechien) und Koš Abhängig von Strecke und Auslastung (inkl. Aufschlag für Zugkategorie) {{< /expander >}} -{{< expander "InterCity (IC) ⚠️" >}} +{{< expander "InterCity (IC) ⚠️" category >}} **Beschreibung:** Grenzüberschreitende Fernzüge, die eigenwirtschaftlich von der ZSSK und CD erbracht werden und meist zwischen Prag und Bratislava/Zilina mit wenigen Halten und schneller Durchschnittsgeschwindigkeit verkehren. **Reservierung möglich:** ja @@ -45,7 +45,7 @@ Grenzüberschreitende Fernzüge, die eigenwirtschaftlich von der ZSSK und CD erb Abhängig von Strecke und Auslastung (inkl. Aufschlag für Zugkategorie) {{< /expander >}} -{{< expander "EuroCity (EC) / RailJet (RJ) ⚠️ (1️⃣)" >}} +{{< expander "EuroCity (EC) / RailJet (RJ) ⚠️ (1️⃣)" category >}} **Beschreibung:** Grenzüberschreitende Züge zwischen der Slowakei und Tschechien, Österreich oder Ungarn. Sie verkehren oft mit wenigen Halten und im Vergleich relativ hoher Durchschnittsgeschwindigkeit. Die RJ-Züge sind RailJet-Züge der Österreichischen Bundesbahn, die auf slowakischem Abschnitt auch mit ZSSK-Freifahrtscheinen genutzt werden können. **Wichtig:** RJ ist gleichzeitig auch die Abkürzung für RegioJet, dort gelten keinerlei FIP-Farscheine. **Reservierung möglich:** ja @@ -55,7 +55,7 @@ Grenzüberschreitende Züge zwischen der Slowakei und Tschechien, Österreich od 1 € (2. Klasse) {{< /expander >}} -{{< expander "EuroNight (EN) ⚠️" >}} +{{< expander "EuroNight (EN) ⚠️" category >}} **Beschreibung:** EN sind internationale Nachtzüge, bei denen Reservierungspflicht besteht und die Möglichkeit einen Aufpreis für Liege- oder Schlafwagen zu zahlen. Sonst sind sie ähnlich wie die EC. **Reservierung möglich:** ja @@ -65,7 +65,7 @@ Abhängig von Strecke und Auslastung sowie Wagenkategorie (inkl. Aufschlag für {{< /expander >}} -{{< expander "Express (Ex) ⚠️ (1️⃣)" >}} +{{< expander "Express (Ex) ⚠️ (1️⃣)" category >}} **Beschreibung:** Eine Art Interregio mit weniger Halten als ein Regionalzug, aber mehr als beispielsweise den IC. Oft haben sie auch ein Bordrestaurant und fahren mit komfortablen Lok-Wagen-Zügen. **Reservierung möglich:** ja @@ -75,7 +75,7 @@ Eine Art Interregio mit weniger Halten als ein Regionalzug, aber mehr als beispi 1 € (2. Klasse) {{< /expander >}} -{{< expander "Rychlik (R) ⚠️ (1️⃣)" >}} +{{< expander "Rychlik (R) ⚠️ (1️⃣)" category >}} **Beschreibung:** Schnelle Regionalzüge mit Halten an den wichtigsten Bahnhöfen in der Region, eine Art Regionalexpress mit sehr unterschiedlichem Wagenmaterial. **Reservierung möglich:** ja @@ -85,7 +85,7 @@ Schnelle Regionalzüge mit Halten an den wichtigsten Bahnhöfen in der Region, e 1 € (2. Klasse) {{< /expander >}} -{{< expander "Osobní vlak (Os) ⚠️ (1️⃣)" >}} +{{< expander "Osobní vlak (Os) ⚠️ (1️⃣)" category >}} **Beschreibung:** Standard-Regionalzüge, die meist überall halten (es gibt jedoch Ausnahmen). Gerade auf Nebenstrecken verkehren sie oft mit veralteten Wagenmaterial. Teilweise werden sie auch als S-Bahnen vermarktet, ohne jedoch wirklich in einem S-Bahn-Takt zu fahren. **Reservierung möglich:** ja diff --git a/content/operator/zsr/index.en.md b/content/operator/zsr/index.en.md index cbb51c03..7c1f16dc 100644 --- a/content/operator/zsr/index.en.md +++ b/content/operator/zsr/index.en.md @@ -27,7 +27,7 @@ FIP vouchers and FIP 50 tickets are valid on ZSSK connections with the restricti Reservation required for SC and IC trains. Other ZSSK trains only require a reservation in 1st class. -{{< expander "SuperCity (SC) ⚠️" >}} +{{< expander "SuperCity (SC) ⚠️" category >}} **Description:** Fast tilting trains (Pendolino) running between Prague (Czech Republic) and Košice, with few stops. **Reservation possible:** yes @@ -36,7 +36,7 @@ Fast tilting trains (Pendolino) running between Prague (Czech Republic) and Koš Depending on route and occupancy (including surcharge for train category) {{< /expander >}} -{{< expander "InterCity (IC) ⚠️" >}} +{{< expander "InterCity (IC) ⚠️" category >}} **Description:** Cross-border long-distance trains operated commercially by ZSSK and CD, usually running between Prague and Bratislava/Zilina with few stops and high average speed. **Reservation possible:** yes @@ -45,7 +45,7 @@ Cross-border long-distance trains operated commercially by ZSSK and CD, usually Depending on route and occupancy (including surcharge for train category) {{< /expander >}} -{{< expander "EuroCity (EC) / RailJet (RJ) ⚠️ (1️⃣)" >}} +{{< expander "EuroCity (EC) / RailJet (RJ) ⚠️ (1️⃣)" category >}} **Description:** Cross-border trains between Slovakia and the Czech Republic, Austria, or Hungary. They often run with few stops and relatively high average speed. RJ trains are RailJet trains of the Austrian Federal Railways, which can also be used with ZSSK vouchers on the Slovak section. **Important:** RJ is also the abbreviation for RegioJet, where no FIP tickets are valid. **Reservation possible:** yes @@ -55,7 +55,7 @@ Cross-border trains between Slovakia and the Czech Republic, Austria, or Hungary 1 € (2nd class) {{< /expander >}} -{{< expander "EuroNight (EN) ⚠️" >}} +{{< expander "EuroNight (EN) ⚠️" category >}} **Description:** EN are international night trains that require reservations and offer the option to pay a surcharge for couchette or sleeper cars. Otherwise, they are similar to EC trains. **Reservation possible:** yes @@ -64,7 +64,7 @@ EN are international night trains that require reservations and offer the option Depending on route and occupancy as well as car category (including surcharge for train category) {{< /expander >}} -{{< expander "Express (Ex) ⚠️ (1️⃣)" >}} +{{< expander "Express (Ex) ⚠️ (1️⃣)" category >}} **Description:** A type of interregional train with fewer stops than a regional train but more than, for example, IC trains. They often have a dining car and run with comfortable locomotive-hauled trains. **Reservation possible:** yes @@ -74,7 +74,7 @@ A type of interregional train with fewer stops than a regional train but more th 1 € (2nd class) {{< /expander >}} -{{< expander "Rychlik (R) ⚠️ (1️⃣)" >}} +{{< expander "Rychlik (R) ⚠️ (1️⃣)" category >}} **Description:** Fast regional trains stopping at the main stations in the region, a type of regional express with very varied rolling stock. **Reservation possible:** yes @@ -84,7 +84,7 @@ Fast regional trains stopping at the main stations in the region, a type of regi 1 € (2nd class) {{< /expander >}} -{{< expander "Osobní vlak (Os) ⚠️ (1️⃣)" >}} +{{< expander "Osobní vlak (Os) ⚠️ (1️⃣)" category >}} **Description:** Standard regional trains that usually stop everywhere (there are exceptions). Especially on branch lines, they often run with outdated rolling stock. They are sometimes marketed as S-Bahn trains, but without really running on an S-Bahn schedule. **Reservation possible:** yes diff --git a/layouts/shortcodes/expander.html b/layouts/shortcodes/expander.html index b6054f90..ef5d3fde 100644 --- a/layouts/shortcodes/expander.html +++ b/layouts/shortcodes/expander.html @@ -1,4 +1,8 @@ -
- {{ (.Get 0) | markdownify }} - {{ .Inner | markdownify }} +
+ + {{ (.Get 0) | markdownify }} + +
+ {{ .Inner | markdownify }} +
\ No newline at end of file From 6265a0a85a62c2440e71b9971c40f4f0f97f7db0 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:15:21 +0100 Subject: [PATCH 04/15] feature: expander styling --- assets/sass/expander.scss | 15 +++++++++++++-- assets/sass/styles.scss | 1 + assets/sass/teaser.scss | 2 -- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss index 7237c35e..d376527b 100644 --- a/assets/sass/expander.scss +++ b/assets/sass/expander.scss @@ -1,11 +1,18 @@ summary { display: flex; + + &:hover, + &:focus { + font-weight: 700; + text-decoration: underline; + } } details { + position: relative; padding: 1.2rem; background-color: var(--bg-neutral); - border-radius: var(--border-radius-s); + border-radius: var(--border-radius-m); margin-bottom: 1.2rem; } @@ -17,7 +24,8 @@ details > summary { list-style-type: none; } -details > div { +details > div, +summary { margin-left: 3.2rem; } @@ -33,6 +41,9 @@ summary::before { transition: 0.2s; margin-right: .8rem; transition: content 0.3s ease; + text-decoration: none; + position: absolute; + left: 1.2rem; } details[open] > summary::before { diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index fded1dbe..c6188aea 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -56,6 +56,7 @@ main > .container:not(.o-stage) { img { width: 100%; height: auto; + border-radius: var(--border-radius-m); } p { diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index d51b9af7..d2769dd2 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -14,9 +14,7 @@ } .m-teaser img { - width: 100%; aspect-ratio: 16/9; - border-radius: var(--border-radius-l); } .m-teaser__dateline { From 17d14119143eb9080ca7fc7baf2925a753c72999 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:17:17 +0100 Subject: [PATCH 05/15] feature: expander styling --- assets/sass/expander.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss index d376527b..32d9aec9 100644 --- a/assets/sass/expander.scss +++ b/assets/sass/expander.scss @@ -38,9 +38,7 @@ summary::before { font-family: "material icons round"; width: 2.4rem; height: 2.4rem; - transition: 0.2s; margin-right: .8rem; - transition: content 0.3s ease; text-decoration: none; position: absolute; left: 1.2rem; From 1e9722c1db168adaf58cb5a30637bd79a505ecb9 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:22:29 +0100 Subject: [PATCH 06/15] fix: contact.en.html --- content/contact.en.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/contact.en.html b/content/contact.en.html index bedd3845..62cb898e 100644 --- a/content/contact.en.html +++ b/content/contact.en.html @@ -3,7 +3,7 @@ ---
- + From f0c42c8ec9a3c833d0bd82f8e777a865e02b542d Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:28:06 +0100 Subject: [PATCH 07/15] feature: styling --- assets/sass/content.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/assets/sass/content.scss b/assets/sass/content.scss index 5be5b974..b070b93d 100644 --- a/assets/sass/content.scss +++ b/assets/sass/content.scss @@ -1,4 +1,13 @@ .updateDate { font-size: 1.3rem; margin-bottom: 1.6rem; +} + +code { + font-size: inherit; + font-weight: 700; + color: var(--color-onLight); + background-color: var(--bg-accent); + padding: .2rem .8rem; + border-radius: var(--border-radius-s); } \ No newline at end of file From ee0ca50d7f1ac68abd04bf06f7d591e3f2ab02ba Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:38:47 +0100 Subject: [PATCH 08/15] feature: table styling --- assets/sass/_variables.scss | 1 + assets/sass/content.scss | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss index 95690e93..24de4b2e 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -11,6 +11,7 @@ body { --bg-accent2: #DABA00; --color-onDark: #FFFFFF; --color-onLight: #000000; + --color-table-border: #5B5B5B; --border-radius-s: .4rem; --border-radius-m: .8rem; --border-radius-l: 1.2rem; diff --git a/assets/sass/content.scss b/assets/sass/content.scss index b070b93d..cc1d9bd1 100644 --- a/assets/sass/content.scss +++ b/assets/sass/content.scss @@ -10,4 +10,16 @@ code { background-color: var(--bg-accent); padding: .2rem .8rem; border-radius: var(--border-radius-s); +} + +table { + margin-bottom: .6rem; +} + +tr { + border-bottom: .1rem solid var(--color-table-border); +} + +th, td { + padding: .6rem 2rem .6rem 0; } \ No newline at end of file From 38ec10670592092d2992cea6aec8269eaa5fdce0 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:43:09 +0100 Subject: [PATCH 09/15] fix: sticky navbar --- assets/sass/navigation.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index f7973348..7b43bfde 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -1,5 +1,6 @@ #header { - position: sticky; + position: fixed; + width: 100%; top: 0; box-shadow: 0 .4rem 1rem 0 rgba(0,0,0,.1); } From 0fc5c349759dfdd616a1f1b5124ca73d0c15c0ba Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 12:54:57 +0100 Subject: [PATCH 10/15] fix: sticky navbar --- assets/sass/navigation.scss | 4 ++++ assets/sass/stage.scss | 4 ---- assets/sass/styles.scss | 12 +++++++++--- layouts/_default/baseof.html | 2 +- layouts/partials/menu.html | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 7b43bfde..1c498f93 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -6,6 +6,10 @@ } .o-header { + background-color: #fff; +} + +.o-header__wrapper { display: flex; justify-content: space-between; diff --git a/assets/sass/stage.scss b/assets/sass/stage.scss index 838e6756..4702e927 100644 --- a/assets/sass/stage.scss +++ b/assets/sass/stage.scss @@ -1,7 +1,3 @@ -.o-stage { - margin-bottom: 4rem; -} - .o-stage > picture { width: 100%; max-width: 1320px; diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index c6188aea..067afa77 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -38,11 +38,17 @@ a.m-teaser { } } -header { - background-color: #fff; +//space for fixed header +main > .o-stage { + margin-top: 5.3rem; +} + +//space for fixed header +main > .container:first-child { + margin-top: 9.3rem; } -main > .container:not(.o-stage) { +main > .container { margin-top: 4rem; background-color: var(--bg-default); border-radius: var(--border-radius-l); diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 7515b53f..1f953d0e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -7,7 +7,7 @@ {{ partial "head.html" . }} - +
{{ block "main" . }}{{ end }}
{{ partial "footer.html" . }}
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index d80633d0..5f90248e 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -2,7 +2,7 @@ {{ $expandicon := resources.Get "images/expand-more.svg" }} {{ $closeicon := resources.Get "images/close.svg" }} {{ $logo := resources.Get "images/logo.svg" }} -
+
- {{ end }} + + {{ partial "related.html" . }} {{ 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 ba78e48b..0188f63f 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -13,16 +13,8 @@

{{ .Title }}

{{ .Content }}
- - {{ $related := .Site.RegularPages.RelatedIndices . "country" }} - {{ with $related }} -

See Also

- - {{ end }} + + {{ partial "related.html" . }} {{ 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 fc3f267b..2a01ebc4 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -12,16 +12,8 @@

{{ .Title }}

{{ .Content }}
- - {{ $related := .Site.RegularPages.RelatedIndices . "country" }} - {{ with $related }} -

See Also

- - {{ end }} + + {{ partial "related.html" . }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
{{ end }} \ No newline at end of file diff --git a/layouts/partials/related.html b/layouts/partials/related.html new file mode 100644 index 00000000..ea5df7e4 --- /dev/null +++ b/layouts/partials/related.html @@ -0,0 +1,9 @@ +{{ $related := .Site.RegularPages.RelatedIndices . "country" }} +{{ with $related }} + + +{{ end }} \ No newline at end of file From e11c58e446414e4b4a43c1a2eba64950d65ade90 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 13:21:23 +0100 Subject: [PATCH 12/15] fix: performance --- assets/sass/fonts.scss | 2 ++ assets/sass/navigation.scss | 1 + assets/sass/styles.scss | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss index 7e141137..e408ee59 100644 --- a/assets/sass/fonts.scss +++ b/assets/sass/fonts.scss @@ -3,6 +3,7 @@ font-style: normal; font-weight: 100 700; src: url(/fonts/Roboto-VariableFont_wdth,wght.ttf) format('woff2'); + font-display: swap; } @font-face { @@ -10,6 +11,7 @@ font-style: italic; font-weight: 100 700; src: url(/fonts/Roboto-Italic-VariableFont_wdth,wght.ttf) format('woff2'); + font-display: swap; } body { diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 1c498f93..2efde107 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -75,6 +75,7 @@ img { width: 5rem; + height: 4.7rem; } } diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 067afa77..8434f015 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -61,7 +61,7 @@ main > .container { img { width: 100%; - height: auto; + height: 100%; border-radius: var(--border-radius-m); } From cdd8932c9ee0056a8789753734016ebdac3099a2 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 13:46:57 +0100 Subject: [PATCH 13/15] fix: expander.scss --- assets/sass/expander.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/sass/expander.scss b/assets/sass/expander.scss index 32d9aec9..578460cb 100644 --- a/assets/sass/expander.scss +++ b/assets/sass/expander.scss @@ -34,8 +34,9 @@ details > summary::-webkit-details-marker { } summary::before { - content: '\e145'; + content: '\e145' / ''; font-family: "material icons round"; + font-weight: normal; width: 2.4rem; height: 2.4rem; margin-right: .8rem; @@ -45,7 +46,7 @@ summary::before { } details[open] > summary::before { - content: '\e15b'; + content: '\e15b' / ''; } details[open] > summary { From b0adbb11f74c850d3434cb355173f7f225339dc0 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 6 Mar 2025 13:50:48 +0100 Subject: [PATCH 14/15] fix: styling --- layouts/_default/single.html | 2 +- layouts/country/single.html | 2 +- layouts/operator/single.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 385b4702..de55b933 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -7,7 +7,7 @@

{{ .Title }}

{{ .Content }}
- +
{{ partial "related.html" . }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 0188f63f..347c75b0 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -13,7 +13,7 @@

{{ .Title }}

{{ .Content }}
- +
{{ partial "related.html" . }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} diff --git a/layouts/operator/single.html b/layouts/operator/single.html index 2a01ebc4..302c6d19 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -12,7 +12,7 @@

{{ .Title }}

{{ .Content }}
- +
{{ partial "related.html" . }} {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} From 810ab0e155901d2ee6f244ec1940f2a5c9ee0e6d Mon Sep 17 00:00:00 2001 From: lennartrommeiss Date: Thu, 6 Mar 2025 14:59:51 +0100 Subject: [PATCH 15/15] fix: exclude news article from "zuletzt aktualisiert" Signed-off-by: lennartrommeiss --- content/operator/sncb/index.de.md | 2 ++ content/operator/sncb/index.en.md | 4 +++- layouts/partials/updateDate.html | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index 3ae6ae78..939e7abd 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -159,7 +159,9 @@ Auf Verbindungen von und zum Flughafen Brüssel Zaventem muss für den FIP Freif ## Erfahrungen +{{< highlight inofficial "1. Klasse" >}} Die 1. Klasse in den Zügen der SNCB / NMBS wird oft auch mit 2. Klasse Tickets benutzt. Auch ist die 1. Klasse meist nicht viel komfortabler als die 2. Klasse. Anders als in anderen Ländern lohnt sich daher ein Kauf von 1. Klasse Tickets, um hier mehr Platz und Ruhe zu haben, nur bedingt. +{{< /highlight >}} ## Quellen diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index fca6c67f..4651f9c8 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -156,7 +156,9 @@ For connections to and from Brussels Zaventem Airport, a surcharge must be paid ## Experiences -The 1st class in SNCB / NMBS trains is often used with 2nd class tickets. Also, the 1st class is usually not much more comfortable than the 2nd class. Unlike in other countries, buying 1st class tickets to have more space and quiet is only worthwhile to a limited extent. +{{< highlight inofficial "First class" >}} +The first class in SNCB / NMBS trains is often used with second class tickets. Also, the 1st class is usually not much more comfortable than the second class. Unlike in other countries, buying first class tickets to have more space and quiet is only worthwhile to a limited extent. +{{< /highlight >}} ## Sources diff --git a/layouts/partials/updateDate.html b/layouts/partials/updateDate.html index 93c8695c..f38087cc 100644 --- a/layouts/partials/updateDate.html +++ b/layouts/partials/updateDate.html @@ -3,6 +3,6 @@ {{ if .Date }}
- +
{{ end }} \ No newline at end of file