diff --git a/assets/images/startpage.webp b/assets/images/startpage.webp index 8811a7d9..f61868fe 100644 Binary files a/assets/images/startpage.webp and b/assets/images/startpage.webp differ diff --git a/assets/sass/_variables.scss b/assets/sass/_variables.scss index a1a75d7c..d301626f 100644 --- a/assets/sass/_variables.scss +++ b/assets/sass/_variables.scss @@ -32,8 +32,9 @@ body { --color-table-border: #{$color-table-border}; --border-radius-s: .4rem; --border-radius-m: .8rem; - --border-radius-l: 1.2rem; + --border-radius-l: 1.6rem; --pagefind-ui-border-radius: var(--border-radius-l); --pagefind-ui-border: #000; --bs-highlight-bg: var(--bg-accent); + --box-shadow: 0 .4rem 1rem rgba(0,0,0,.25); } diff --git a/assets/sass/fonts.scss b/assets/sass/fonts.scss index 4cca068d..e79ac5c8 100644 --- a/assets/sass/fonts.scss +++ b/assets/sass/fonts.scss @@ -58,6 +58,16 @@ unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; } +/* sansita-latin-800-normal */ +@font-face { + font-family: 'Sansita'; + font-style: normal; + font-display: swap; + font-weight: 800; + src: url(@fontsource/sansita/files/sansita-latin-800-normal.woff2) format('woff2'), url(@fontsource/sansita/files/sansita-latin-800-normal.woff) format('woff'); + unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + /* material-symbols-rounded-latin-400-normal */ @font-face { font-family: 'Material Symbols Rounded'; diff --git a/assets/sass/form.scss b/assets/sass/form.scss index eade6ab9..d3fafc39 100644 --- a/assets/sass/form.scss +++ b/assets/sass/form.scss @@ -14,7 +14,7 @@ input[type=text], input[type=email], select, textarea { width: 100%; margin-bottom: 1.6rem; - border-radius: var(--border-radius-m); + border-radius: var(--border-radius-l); border-width: .2rem; border-color: var(--color-onLight); padding: 1.2rem; @@ -29,7 +29,7 @@ background-color: var(--bg-accent); color: var(--color-onLight); border: none; - border-radius: var(--border-radius-m); + border-radius: var(--border-radius-l); transition: background-color .3s ease; font-weight: 700; diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 4f7a6d07..756f7121 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -4,7 +4,7 @@ @import "fonts.scss"; @import "navigation.scss"; @import "sidemenu.scss"; -@import "stage.scss"; +@import "search.scss"; @import "teaser.scss"; @import "footer.scss"; @import "content.scss"; diff --git a/assets/sass/navigation.scss b/assets/sass/navigation.scss index 8bbae661..909d2c77 100644 --- a/assets/sass/navigation.scss +++ b/assets/sass/navigation.scss @@ -7,11 +7,14 @@ .o-header { background-color: var(--bg-default); + z-index: 5; + position: relative; } .o-header__wrapper { display: flex; justify-content: space-between; + padding: 0; @media (min-width: #{$breakpoint-md}) { justify-content: unset; @@ -54,7 +57,7 @@ .o-header__logo { display: flex; - margin: .6rem; + margin: .6rem 0; position: relative; text-decoration: none; border-radius: var(--border-radius-m); @@ -66,7 +69,8 @@ img { height: 4.7rem; - padding: 0 .4rem + padding: 0 .4rem; + align-self: center; } } diff --git a/assets/sass/stage.scss b/assets/sass/search.scss similarity index 72% rename from assets/sass/stage.scss rename to assets/sass/search.scss index 942ff134..4e898fff 100644 --- a/assets/sass/stage.scss +++ b/assets/sass/search.scss @@ -1,42 +1,9 @@ -.o-stage > picture { - width: 100%; - max-width: 1320px; - filter: brightness(60%); - - img { - border-radius: 0 0 var(--border-radius-l) var(--border-radius-l); - } -} - -.o-stage { - display: flex; - justify-content: center; - align-items: center; -} - -.o-stage__searchfield { - position: absolute; - width: 60%; - height: 6rem; - background-color: white; - border-radius: var(--border-radius-l); -} - #search { - position: absolute; - width: 80%; - max-width: 1056px; // 1320*0.8 + width: 100%; height: 6rem; - left: 50%; - transform: translate(-50%); display: flex; z-index: 2; - @media (min-width: #{$breakpoint-md}) { - width: 60%; - max-width: 792px; // 1320*0.6 - } - .pagefind-ui__search-input, .pagefind-ui__message, .pagefind-ui__search-clear { @@ -46,6 +13,8 @@ .pagefind-ui__search-input { z-index: 3; outline: .2rem solid transparent; + border: 0; + box-shadow: var(--box-shadow); &:focus { outline: .2rem solid orange; @@ -70,6 +39,10 @@ display: none; } + .pagefind-ui__form::before { + z-index: 4; + } + .pagefind-ui__drawer { background-color: white; padding: 0 1rem 1rem 1rem; @@ -83,6 +56,7 @@ border-bottom: var(--pagefind-ui-border-width) solid var(--pagefind-ui-border); border-bottom-left-radius: var(--pagefind-ui-border-radius); border-bottom-right-radius: var(--pagefind-ui-border-radius); + z-index: 3; } .pagefind-ui__result-link { @@ -131,10 +105,11 @@ opacity: 0; } -.curtain:has(~ .o-stage .o-stage__search:focus-within), -.curtain:has(~ .o-stage .pagefind-ui__drawer:not(.pagefind-ui__hidden)), -.curtain:has(~ article .o-aside__mobile-container2.o-aside__mobile-container--open){ - opacity: 1; - inset: 0; - position: fixed; +main:has(#search:focus-within), +main:has(.pagefind-ui__drawer:not(.pagefind-ui__hidden)) { + .curtain { + opacity: 1; + position: fixed; + inset: 0; + } } diff --git a/assets/sass/sidemenu.scss b/assets/sass/sidemenu.scss index 0a88335a..8e640201 100644 --- a/assets/sass/sidemenu.scss +++ b/assets/sass/sidemenu.scss @@ -99,3 +99,7 @@ margin-bottom: 0; } } + +.o-related__item img { + border-radius: var(--border-radius-s); +} diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 3108982b..f2a88cf5 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -9,12 +9,7 @@ body { overflow-x: hidden; } -header { - z-index: 4; - position: relative; -} - -a:not(.m-teaser) { +a { color: var(--link-default); transition: all 0.3s ease; text-underline-offset: .2rem; @@ -34,51 +29,15 @@ a:not(.m-teaser) { } } -a:has(i) { - display: inline-flex; - align-items: center; - - > :first-child { - margin-right: .4rem; - } -} - -a.m-teaser { - .m-teaser__headline { - color: var(--link-default); - text-decoration: underline; - transition: color .3s ease; - text-underline-offset: .2rem; - } - - &:hover, - &:focus { - .m-teaser__headline { - color: var(--link-hovered); - } - } -} - -//space for fixed header -main > .o-stage { - margin-top: 5.3rem; -} - //space for fixed header -main > .container.o-single, -main > .container.o-list { +main { margin-top: 8rem; } -main > .container { - margin-top: 4rem; +.container.o-list:not(.o-list--news) { background-color: var(--bg-default); border-radius: var(--border-radius-l); padding: 2rem; - - @media (max-width: #{$breakpoint-sm}) { - margin-top: 1.6rem; - } } main > .container:is(.o-single--with-sidemenu) { @@ -98,18 +57,13 @@ main > .container:is(.o-single--with-sidemenu) { img { width: 100%; height: auto; - border-radius: var(--border-radius-m); + border-radius: var(--border-radius-l); } .o-list__picture { margin-right: 1.2rem; } -.o-list__picture--operator { - width: auto; - margin-left: 1rem; -} - .o-related__operator-wrapper > .o-related__list { display: flex; flex-wrap: wrap; @@ -138,7 +92,7 @@ img { .container { @media (max-width: #{$breakpoint-sm}) { - max-width: calc(100% - 3.6rem); + max-width: calc(100% - 3.2rem); } } @@ -168,6 +122,12 @@ img { background-color: inherit; } + &__container { + background-color: var(--bg-default); + padding: 2rem; + border-radius: var(--border-radius-l); + } + &__content { display: flex; flex-direction: column; @@ -185,41 +145,44 @@ img { display: none; } } -} -.o-single__content-header { - display: flex; - justify-content: space-between; - flex-flow: wrap; - column-gap: 2rem; - row-gap: 1rem; - margin-bottom: 1.6rem; - align-items: center; + &__content-header { + display: flex; + justify-content: space-between; + flex-flow: wrap; + column-gap: 2rem; + row-gap: 1rem; + margin-bottom: 1.6rem; + align-items: center; + + h1 { + margin-bottom: 0; + } - h1 { - margin-bottom: 0; + img { + max-height: 3.6rem; + width: auto; + border-radius: var(--border-radius-m); + } } -} -.o-single__content-header-title { - display: flex; - align-items: center; - gap: 1.5rem; -} + &__content-header-title { + display: flex; + align-items: center; + gap: 1.5rem; + } -.o-single__content-header-title img { - max-height: 3.6rem; - width: auto; -} + &__news-image { + margin-bottom: 1.6rem; -.o-single__container { - background-color: var(--bg-default); - padding: 2rem; - border-radius: var(--border-radius-l); + @media (min-width: #{$breakpoint-lg}) { + display: none; + } + } } .pagefind-highlight { - padding: 0px; + padding: 0; } .sr-only { @@ -231,3 +194,34 @@ img { height: 2rem; width: auto; } + +.o-startpage .row { + margin-bottom: 2.4rem; +} + +.o-startpage__intro { + text-wrap: balance; + + h2 { + font-family: Sansita,Arial,Helvetica,sans-serif; + font-weight: 800; + font-size: 6.2rem; + line-height: 1.1; + } + + > div { + align-content: center; + } + + @media (max-width: #{$breakpoint-md}) { + h2 { + font-size: 4.8rem; + } + } +} + +.o-startpage__image { + @media (max-width: #{$breakpoint-md}) { + display: none; + } +} diff --git a/assets/sass/teaser.scss b/assets/sass/teaser.scss index 6c462e9b..d4589b35 100644 --- a/assets/sass/teaser.scss +++ b/assets/sass/teaser.scss @@ -1,35 +1,107 @@ .m-teaser { + display: flex; text-decoration: none; - color: var(--link-special); +} + +.m-teaser__wrapper { + text-decoration: none; + background-color: var(--color-onDark); + box-shadow: var(--box-shadow); + border-radius: var(--border-radius-l); + display: flex; + flex-direction: column; &:nth-child(-n+3) { @media (max-width: #{$breakpoint-lg}) { margin-bottom: 2rem; } } + + &:hover, + &:focus { + background: rgba($link-hovered, 0.15); + + .m-teaser__headline { + text-decoration: underline; + } + } + + .material-symbols-rounded { + font-size: 2.4rem; + margin-top: 1rem; + } } -.m-teaser--listview { +.m-teaser--listview .m-teaser__wrapper { margin-bottom: 2.4rem; - display: flex; + display: grid; + grid-template-columns: 1fr 2fr; @media (max-width: #{$breakpoint-md}) { - flex-flow: wrap; + display: flex; + flex-direction: column; + } + + .m-teaser__image img { + border-radius: var(--border-radius-l) 0 0 var(--border-radius-l); + + @media (max-width: #{$breakpoint-md}) { + border-radius: var(--border-radius-l) var(--border-radius-l) 0 0; + width: 100%; + } + } +} + +.m-teaser--shortcut-tile { + .m-teaser__wrapper { + width: 100%; + height: 12rem; + padding: 1.4rem; + justify-content: space-between; } - &:last-of-type { - margin-bottom: 0; + a { + h3 { + overflow-wrap: normal; + word-break: normal; + white-space: normal; + hyphens: manual; + margin-bottom: 0; + } + + transition: background 0.2s, color 0.2s; + } } -.m-teaser img { +.m-teaser__image img { aspect-ratio: 16/9; + border-radius: var(--border-radius-l) var(--border-radius-l) 0 0; + object-fit: cover; + height: 100%; } .m-teaser__dateline { font-size: 1.4rem; + color: var(--link-special); } .m-teaser__headline { margin-bottom: .5rem; } + +.m-teaser__content { + padding: 1.4rem; + display: flex; + flex-direction: column; + justify-content: space-between; +} + +.m-teaser__text { + line-clamp: 3; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; + color: var(--link-special); +} diff --git a/content/_index.de.md b/content/_index.de.md index 08440089..5fddf13e 100644 --- a/content/_index.de.md +++ b/content/_index.de.md @@ -5,12 +5,6 @@ In diesem Projekt sind Informationen und Nutzungshinweise zu FIP sowie Besonderh ## Willkommen beim FIP Guide! -Die Community-Website für alle Informationen zu FIP (internationale Fahrvergünstigungen für Eisenbahnpersonal). -In diesem Projekt sind Informationen und Nutzungshinweise zu FIP sowie Besonderheiten zu den jeweiligen beteiligten Bahngesellschaften aufgeführt. +Finde relevante Informationen und Nutzungshinweise zu FIP sowie Besonderheiten zu den jeweiligen beteiligten Bahngesellschaften. -* [Grundlegende Informationen zu FIP]({{< ref "generalinformation" >}}) -* [Übersicht der Länder]({{< ref "country" >}}) - -## 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. +**Schnell. Übersichtlich. Community-basiert.** diff --git a/content/_index.en.md b/content/_index.en.md index 98db5c10..b68922bb 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -5,12 +5,6 @@ This project includes information and usage instructions for FIP as well as spec ## Welcome to the FIP Guide! -The community website for all information about FIP. -This project includes information and usage instructions for FIP as well as special features of the respective participating railway companies. +Find relevant information and usage instructions for FIP, as well as specifics about the participating railway companies. -* [Basic information about FIP]({{< ref "generalinformation" >}}) -* [Overview of countries]({{< ref "country" >}}) - -## 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" >}}). +**Fast. Clear. Community-based.** diff --git a/content/country/_index.de.md b/content/country/_index.de.md index f0b97afa..1b5ba6f6 100644 --- a/content/country/_index.de.md +++ b/content/country/_index.de.md @@ -1,6 +1,6 @@ --- -title: "Länder" -description: "Überblick über die Länder, in denen FIP-Vergünstigungen genutzt werden können." +title: "Übersicht der Länder" +description: "Übersicht über die Länder, in denen FIP-Vergünstigungen genutzt werden können." --- Für einige Länder sind bereits Informationen verfügbar und kontinuierlich kommen weitere Länder hinzu. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3). diff --git a/content/country/_index.en.md b/content/country/_index.en.md index c9e746a0..be26e1c1 100644 --- a/content/country/_index.en.md +++ b/content/country/_index.en.md @@ -1,5 +1,5 @@ --- -title: "Countries" +title: "Overview of countries" description: "Overview of the countries where FIP benefits are available." --- diff --git a/content/operator/_index.de.md b/content/operator/_index.de.md index 76009293..1f7a3181 100644 --- a/content/operator/_index.de.md +++ b/content/operator/_index.de.md @@ -1,6 +1,6 @@ --- -title: "Betreiber mit FIP" -description: "Überblick über die Betreiber, die FIP-Vergünstigungen anbieten." +title: "Übersicht der Betreiber" +description: "Übersicht über die Betreiber, die FIP-Vergünstigungen anbieten." --- Für einige Betreiber sind bereits Informationen verfügbar und kontinuierlich kommen weitere Betreiber hinzu. Den aktuellen Bearbeitungsstand findest du auf [GitHub](https://github.com/orgs/fipguide/projects/3). diff --git a/content/operator/_index.en.md b/content/operator/_index.en.md index 66865566..e632c2b0 100644 --- a/content/operator/_index.en.md +++ b/content/operator/_index.en.md @@ -1,5 +1,5 @@ --- -title: "Operators supporting FIP" +title: "Overview of operators" description: "Overview of the operators providing FIP benefits." --- diff --git a/i18n/de.yaml b/i18n/de.yaml index c00ca809..504c4b95 100644 --- a/i18n/de.yaml +++ b/i18n/de.yaml @@ -49,6 +49,13 @@ related-operators: Verwandte Betreiber reportError: Melde ein Fehler search-placeholder: Suche skipToContent: Zum Inhalt springen +support: + text: >- + Du möchtest dein Wissen rund um FIP-Regelungen teilen? Schau auf unserem GitHub Repository + vorbei, um Inhalte beizutragen. Alternativ kannst du uns auch über das Kontaktformular schreiben. + title: Unterstütze uns toc_name: Inhalt updateDate: Zuletzt aktualisiert wip: >- diff --git a/i18n/en.yaml b/i18n/en.yaml index 821c6c0a..6dafc8ff 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -45,6 +45,13 @@ related: reportError: Report an error search-placeholder: Search skipToContent: Skip to content +support: + text: >- + Would you like to share your knowledge about FIP regulations? Visit our GitHub Repository + to contribute content. Alternatively, you can also write to us via the contact form. + title: Support Us toc_name: Contents updateDate: Last updated wip: >- diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 60dbfb80..968ca557 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,11 +4,11 @@ dir="{{ or site.Language.LanguageDirection `ltr` }}" > - {{ partial "head.html" . }} + {{ partial "head" . }} -
{{ block "main" . }}{{ end }}
+
{{ block "main" . }}{{ end }}
{{ if and (eq .Kind "page") (or (eq .Page.Type "country") (eq .Page.Type "operator")) }} {{ partial "snackbar" . }} diff --git a/layouts/_default/home.html b/layouts/_default/home.html index 7430a030..b3855da8 100644 --- a/layouts/_default/home.html +++ b/layouts/_default/home.html @@ -1,16 +1,41 @@ {{ define "main" }}

{{ T "home-page-text" }}

+
+
+
+ {{ .Content }} +
+
+ {{ $image := resources.Get "images/startpage.webp" }} + {{ partial "image" (dict "image" $image "eager" true) }} +
+
+
+
+ {{ partial "search-slot" }} +
+
+
+ {{ partial "shortcut-tile" (.Site.GetPage "generalinformation") }} + {{ partial "shortcut-tile" (.Site.GetPage "country") }} + {{ partial "shortcut-tile" (.Site.GetPage "operator") }} +
+
+
+
+
+

{{ T "support.title" }}

+

{{ T "support.text" | safeHTML }}

+
+
+
+
+
+

{{ T "news-headline"}}

+ {{ range first 3 (where site.RegularPages "Section" "news") }} + {{ partial "teaser.html" (dict "listview" false "type" "news" "page" .) }} + {{ end }} +
+
- {{ partial "stage.html" }} -
- {{ .Content }} -
-
-
-

{{ T "news-headline"}}

- {{ range first 3 (where site.RegularPages "Section" "news") }} - {{ partial "teaser.html" (dict "listview" false "type" "news" "page" .) }} - {{ end }} -
-
{{ end }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index bf0ae9c1..092bdbb3 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -11,7 +11,7 @@ {{ .Title }} {{ .Permalink }} - {{ $cleanedHTML := .Summary | replaceRE `]*class="material-symbols-rounded"[^>]*>.*?` "" | transform.XMLEscape | safeHTML}} + {{ $cleanedHTML := partial "strip-material-icons" .Summary | transform.XMLEscape | safeHTML}} {{ $cleanedHTML }} {{ .PublishDate.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} diff --git a/layouts/country/list.html b/layouts/country/list.html index dbfe674e..24c4f17d 100644 --- a/layouts/country/list.html +++ b/layouts/country/list.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+

{{ .Title }}

{{ .Content }} diff --git a/layouts/country/single.html b/layouts/country/single.html index 7171c6c8..8a8d3ebf 100644 --- a/layouts/country/single.html +++ b/layouts/country/single.html @@ -1,7 +1,6 @@ {{ define "main" }} {{ $related := .Site.RegularPages.RelatedIndices . "country" }} -
{{ partial "sidemenu" . }}
diff --git a/layouts/news/list.html b/layouts/news/list.html index b74dd68a..7c3fe0e0 100644 --- a/layouts/news/list.html +++ b/layouts/news/list.html @@ -1,10 +1,13 @@ {{ define "main" }} -
+

{{ .Title }}

- {{ .Content }} {{ range .Pages }} - {{ partial "teaser.html" (dict "listview" "true" "page" .) }} - {{ end }} + {{ .Content }} +
+ {{ range .Pages }} + {{ partial "teaser" (dict "listview" "true" "page" .) }} + {{ end }} +
-
+
{{ end }} diff --git a/layouts/news/single.html b/layouts/news/single.html index ca3a0aa0..50039e36 100644 --- a/layouts/news/single.html +++ b/layouts/news/single.html @@ -1,5 +1,4 @@ {{ define "main" }} -
{{ end }} diff --git a/layouts/operator/single.html b/layouts/operator/single.html index b7ff1c18..add95334 100644 --- a/layouts/operator/single.html +++ b/layouts/operator/single.html @@ -1,5 +1,4 @@ {{ define "main" }} -
{{ partial "sidemenu" . }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 19fbaf90..3c9f8d63 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,9 +1,9 @@ -{{ partial "headMeta.html" . }} +{{ partial "headMeta" . }} {{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }} -{{ partialCached "head/js.html" . }} +{{ partialCached "head/js" . }} {{ $options := (dict "targetPath" "css/styles.css" "outputStyle" "compressed") }} {{ with resources.Get "sass/main.scss" }} {{ $style := (resources.ExecuteAsTemplate "sass/main_templated.scss" $ .) | toCSS $options | minify }} @@ -43,4 +43,4 @@ {{- end -}} -{{ partial "structuredData.html" . }} +{{ partial "structuredData" . }} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 8995308a..fef7af1d 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1 +1 @@ -{{ partial "menu.html" (dict "menuID" "main" "page" .) }} +{{ partial "menu" (dict "menuID" "main" "page" .) }} diff --git a/layouts/partials/stage.html b/layouts/partials/search-slot.html similarity index 85% rename from layouts/partials/stage.html rename to layouts/partials/search-slot.html index 01991a2b..8a727b56 100644 --- a/layouts/partials/stage.html +++ b/layouts/partials/search-slot.html @@ -43,8 +43,4 @@ }); -
- {{ $image := resources.Get "images/startpage.webp" }} - {{ partial "image.html" (dict "image" $image "eager" true) }} -
-
+
diff --git a/layouts/partials/shortcut-tile.html b/layouts/partials/shortcut-tile.html new file mode 100644 index 00000000..006e6464 --- /dev/null +++ b/layouts/partials/shortcut-tile.html @@ -0,0 +1,6 @@ +
+ +

{{ .Title }}

+ {{- partial "icon" "arrow_forward" -}} + +
diff --git a/layouts/partials/sidemenu.html b/layouts/partials/sidemenu.html index 2f5d9b49..1ba76371 100644 --- a/layouts/partials/sidemenu.html +++ b/layouts/partials/sidemenu.html @@ -20,7 +20,7 @@ {{ end }}

{{ .Title }}

- {{ partial "toc.html" (dict "context" . "startLevel" 2 "endLevel" 3 ) }} + {{ partial "toc" (dict "context" . "startLevel" 2 "endLevel" 3 ) }} {{ if eq .Page.Type "country" }} {{ partial "related" (dict "index" "country" "pageType" "operator" "title" (T "_operator__list_title") "page" . "identifier" "operators") }} diff --git a/layouts/partials/strip-material-icons.html b/layouts/partials/strip-material-icons.html new file mode 100644 index 00000000..44593729 --- /dev/null +++ b/layouts/partials/strip-material-icons.html @@ -0,0 +1 @@ +{{ return replaceRE `]*class="[^"]*\bmaterial-symbols-rounded\b[^"]*"[^>]*>.*?` "" . }} diff --git a/layouts/partials/teaser.html b/layouts/partials/teaser.html index 243669a9..14746c6e 100644 --- a/layouts/partials/teaser.html +++ b/layouts/partials/teaser.html @@ -3,19 +3,26 @@ {{ $dateMachine := $page.Date | time.Format "2006-01-02T15:04:05-07:00" }} {{ $dateHuman := $page.Date | time.Format ":date_long" }} - - +
+ {{ $image := (partial "helper/contentImage" $page ) }} {{ if $image }} -
+
{{ partialCached "image.html" $image $image }} - {{ end }} + {{ end }}
- diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 49dc7388..5b0972ad 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -64,7 +64,7 @@ @returns {template.HTML} -@example {{ partial "toc.html" (dict "context" . "startLevel" 2 "endLevel" 3 ) }} +@example {{ partial "toc" (dict "context" . "startLevel" 2 "endLevel" 3 ) }} */}} {{- /* Initialize. */}} diff --git a/package-lock.json b/package-lock.json index 71011f05..4d19cc26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@fontsource/material-symbols-rounded": "^5.2.10", "@fontsource/roboto": "^5.2.5", + "@fontsource/sansita": "^5.2.5", "bootstrap": "^5.3.3", "pagefind": "^1.3.0" }, @@ -37,6 +38,14 @@ "url": "https://github.com/sponsors/ayuhito" } }, + "node_modules/@fontsource/sansita": { + "version": "5.2.6", + "resolved": "https://registry.npmjs.org/@fontsource/sansita/-/sansita-5.2.6.tgz", + "integrity": "sha512-/v0I66p3CQoCIlwD4quH6H9g6hAfSOrl2aJo8h4ylIFzrRyz/AO+3hM8Modo3IdGVF4YE1fhKlQQlU8ntI5ATg==", + "funding": { + "url": "https://github.com/sponsors/ayuhito" + } + }, "node_modules/@pagefind/darwin-arm64": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@pagefind/darwin-arm64/-/darwin-arm64-1.3.0.tgz", diff --git a/package.json b/package.json index f9731d55..958b48f8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "@fontsource/material-symbols-rounded": "^5.2.10", "@fontsource/roboto": "^5.2.5", + "@fontsource/sansita": "^5.2.5", "bootstrap": "^5.3.3", "pagefind": "^1.3.0" },