Skip to content

Commit 4be773f

Browse files
feat: Add columns / column shortcodes (#970)
Add the possibility to define columns in a specific container: ``` {{% columns %}} {{% column width="40%" %}} Column 1 {{% /column %}} {{% column width="60%" %}} Wider Column 2 {{% /column %}} {{% /columns %}} ``` --------- Co-authored-by: lennartrommeiss <61516567+lenderom@users.noreply.github.com>
1 parent d103b17 commit 4be773f

6 files changed

Lines changed: 42 additions & 36 deletions

File tree

assets/sass/styles.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,20 @@ figure {
284284
}
285285
}
286286

287+
.o-columns {
288+
display: flex;
289+
gap: 1rem;
290+
align-items: flex-start;
291+
292+
@media (max-width: #{$breakpoint-md}) {
293+
flex-direction: column;
294+
295+
> .o-columns__column {
296+
flex-basis: 100% !important;
297+
}
298+
}
299+
}
300+
287301
.o-single {
288302
padding: 2rem;
289303
background-color: var(--bg-default);

content/operator/cd/index.de.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,18 +267,14 @@ Auf einigen Routen und Regionen gelten keine FIP Vergünstigungen, obwohl die Ve
267267

268268
Für eine Übersicht der Gültigkeit kann die Übersichtskarte hier verwendet werden. Ausführlichere Informationen finden sich in der Detailkarte und den konkreten Regelungen in den folgenden Abschnitten zu [ČD Kommerzielle Verbindungen (zuschlagspflichtig)](#čd-kommerzielle-verbindungen-zuschlagspflichtig) und [Verbindungen der ČD ohne FIP](#verbindungen-der-čd-ohne-fip).
269269

270-
<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
271-
<figure style="flex:1; margin:0;">
272-
<img src="/en/operator/cd/cd-fip-map-overview-26.webp" alt="FIP Gültigkeitskarte Überblick für Tschechien" style="width:100%; height:auto; display:block;" />
273-
<hr aria-hidden="true" />
274-
<figcaption><a href="/en/operator/cd/cd-fip-map-overview-26.webp">Überblick FIP Gültigkeitskarte (Vollbild)</a> für Tschechien (© Petr Duda)</figcaption>
275-
</figure>
276-
<figure style="flex:1; margin:0;">
277-
<img src="/en/operator/cd/cd-fip-map-detail-26.webp" alt="FIP Gültigkeitskarte Detail für Tschechien" style="width:100%; height:auto; display:block;" />
278-
<hr aria-hidden="true" />
279-
<figcaption><a href="/en/operator/cd/cd-fip-map-detail-26.webp">Detail FIP Gültigkeitskarte (Vollbild)</a> für Tschechien (© Petr Duda)</figcaption>
280-
</figure>
281-
</div>
270+
{{% columns %}}
271+
{{% column width="50%" %}}
272+
![[Überblick FIP Gültigkeitskarte (Vollbild)](/de/operator/cd/cd-fip-map-overview-26.webp) für Tschechien (© Petr Duda)](cd-fip-map-overview-26.webp)
273+
{{% /column %}}
274+
{{% column width="50%" %}}
275+
![[Detail FIP Gültigkeitskarte (Vollbild)](/de/operator/cd/cd-fip-map-detail-26.webp) für Tschechien (© Petr Duda)](cd-fip-map-detail-26.webp)
276+
{{% /column %}}
277+
{{% /columns %}}
282278

283279
### ČD Kommerzielle Verbindungen (zuschlagspflichtig)
284280

content/operator/cd/index.en.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,18 +267,14 @@ On some routes and in some regions, FIP benefits are not valid, even if the serv
267267

268268
For an overview of validity, the overview map can be used here. More detailed information can be found in the detailed map and the specific rules in the following sections on [ČD Commercial Services (Surcharge Required)](#čd-commercial-services-surcharge-required) and [ČD Services Without FIP](#čd-services-without-fip).
269269

270-
<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
271-
<figure style="flex:1; margin:0;">
272-
<img src="/en/operator/cd/cd-fip-map-overview-26.webp" alt="FIP validity map overview for Czechia" style="width:100%; height:auto; display:block;" />
273-
<hr aria-hidden="true" />
274-
<figcaption><a href="/en/operator/cd/cd-fip-map-overview-26.webp">Overview FIP validity map (full view)</a> for Czechia (© Petr Duda)</figcaption>
275-
</figure>
276-
<figure style="flex:1; margin:0;">
277-
<img src="/en/operator/cd/cd-fip-map-detail-26.webp" alt="FIP validity map detail for Czechia" style="width:100%; height:auto; display:block;" />
278-
<hr aria-hidden="true" />
279-
<figcaption><a href="/en/operator/cd/cd-fip-map-detail-26.webp">Detailed FIP validity map (full view)</a> for Czechia (© Petr Duda)</figcaption>
280-
</figure>
281-
</div>
270+
{{% columns %}}
271+
{{% column width="50%" %}}
272+
![[Overview FIP validity map (full view)](/en/operator/cd/cd-fip-map-overview-26.webp) for Czechia (© Petr Duda)](cd-fip-map-overview-26.webp)
273+
{{% /column %}}
274+
{{% column width="50%" %}}
275+
![[Detailed FIP validity map (full view)](/en/operator/cd/cd-fip-map-detail-26.webp) for Czechia (© Petr Duda)](cd-fip-map-detail-26.webp)
276+
{{% /column %}}
277+
{{% /columns %}}
282278

283279
### ČD Commercial Services (Surcharge Required)
284280

content/operator/cd/index.fr.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,18 +267,14 @@ Sur certaines lignes et dans certaines régions, les avantages FIP ne sont pas v
267267

268268
Pour un aperçu de la validité, la carte de vue d’ensemble peut être consultée ici. Des informations plus détaillées sont disponibles dans la carte détaillée et les règles spécifiques dans les sections suivantes sur les [Liaisons commerciales ČD (supplément obligatoire)](#liaisons-commerciales-čd-supplément-obligatoire) et les [Services ČD sans FIP](#services-čd-sans-fip).
269269

270-
<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
271-
<figure style="flex:1; margin:0;">
272-
<img src="/en/operator/cd/cd-fip-map-overview-26.webp" alt="Carte de validité FIP vue d’ensemble pour la Tchéquie" style="width:100%; height:auto; display:block;" />
273-
<hr aria-hidden="true" />
274-
<figcaption><a href="/en/operator/cd/cd-fip-map-overview-26.webp">Carte de validité FIP vue d’ensemble (vue complète)</a> pour la Tchéquie (© Petr Duda)</figcaption>
275-
</figure>
276-
<figure style="flex:1; margin:0;">
277-
<img src="/en/operator/cd/cd-fip-map-detail-26.webp" alt="Carte de validité FIP détaillée pour la Tchéquie" style="width:100%; height:auto; display:block;" />
278-
<hr aria-hidden="true" />
279-
<figcaption><a href="/en/operator/cd/cd-fip-map-detail-26.webp">Carte de validité FIP détaillée (vue complète)</a> pour la Tchéquie (© Petr Duda)</figcaption>
280-
</figure>
281-
</div>
270+
{{% columns %}}
271+
{{% column width="50%" %}}
272+
![[Carte de validité FIP vue d’ensemble (vue complète)](/fr/operator/cd/cd-fip-map-overview-26.webp) pour la Tchéquie (© Petr Duda)](cd-fip-map-overview-26.webp)
273+
{{% /column %}}
274+
{{% column width="50%" %}}
275+
![[Carte de validité FIP détaillée (vue complète)](/fr/operator/cd/cd-fip-map-detail-26.webp) pour la Tchéquie (© Petr Duda)](cd-fip-map-detail-26.webp)
276+
{{% /column %}}
277+
{{% /columns %}}
282278

283279
### Liaisons commerciales ČD (supplément obligatoire)
284280

layouts/_shortcodes/column.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="o-columns__column" style="flex-basis: {{ .Get "width" }};">
2+
{{ .Inner }}
3+
</div>

layouts/_shortcodes/columns.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div class="o-columns">{{ .Inner }}</div>

0 commit comments

Comments
 (0)