Skip to content

feat: Add columns / column shortcodes #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MoritzWeber0 wants to merge 1 commit into
base: fix/747-multi-float-images
Choose a base branch
from
Open

feat: Add columns / column shortcodes #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions assets/sass/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,20 @@ figure {
}
}

.o-columns {
display: flex;
gap: 1rem;
align-items: flex-start;

@media (max-width: #{$breakpoint-md}) {
flex-direction: column;

> .o-columns__column {
flex-basis: 100% !important;
}
}
}

.o-single {
padding: 2rem;
background-color: var(--bg-default);
Expand Down
20 changes: 8 additions & 12 deletions content/operator/cd/index.de.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,14 @@ Auf einigen Routen und Regionen gelten keine FIP Vergünstigungen, obwohl die Ve

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).

<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
<figure style="flex:1; margin:0;">
<img src="cd-fip-map-overview-26.webp" alt="FIP Gültigkeitskarte Überblick für Tschechien" style="width:100%; height:auto; display:block;" />
<hr aria-hidden="true" />
<figcaption><a href="/en/operator/cd/cd-fip-map-overview-26.webp">Überblick FIP Gültigkeitskarte (Vollbild)</a> für Tschechien (© Petr Duda)</figcaption>
</figure>
<figure style="flex:1; margin:0;">
<img src="cd-fip-map-detail-26.webp" alt="FIP Gültigkeitskarte Detail für Tschechien" style="width:100%; height:auto; display:block;" />
<hr aria-hidden="true" />
<figcaption><a href="/en/operator/cd/cd-fip-map-detail-26.webp">Detail FIP Gültigkeitskarte (Vollbild)</a> für Tschechien (© Petr Duda)</figcaption>
</figure>
</div>
{{% columns %}}
{{% column width="50%" %}}
![[Ü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)
{{% /column %}}
{{% column width="50%" %}}
![[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)
{{% /column %}}
{{% /columns %}}

### ČD Kommerzielle Verbindungen (zuschlagspflichtig)

Expand Down
20 changes: 8 additions & 12 deletions content/operator/cd/index.en.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,14 @@ On some routes and in some regions, FIP benefits are not valid, even if the serv

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).

<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
<figure style="flex:1; margin:0;">
<img src="cd-fip-map-overview-26.webp" alt="FIP validity map overview for Czechia" style="width:100%; height:auto; display:block;" />
<hr aria-hidden="true" />
<figcaption><a href="/en/operator/cd/cd-fip-map-overview-26.webp">Overview FIP validity map (full view)</a> for Czechia (© Petr Duda)</figcaption>
</figure>
<figure style="flex:1; margin:0;">
<img src="cd-fip-map-detail-26.webp" alt="FIP validity map detail for Czechia" style="width:100%; height:auto; display:block;" />
<hr aria-hidden="true" />
<figcaption><a href="/en/operator/cd/cd-fip-map-detail-26.webp">Detailed FIP validity map (full view)</a> for Czechia (© Petr Duda)</figcaption>
</figure>
</div>
{{% columns %}}
{{% column width="50%" %}}
![[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)
{{% /column %}}
{{% column width="50%" %}}
![[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)
{{% /column %}}
{{% /columns %}}

### ČD Commercial Services (Surcharge Required)

Expand Down
20 changes: 8 additions & 12 deletions content/operator/cd/index.fr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,18 +261,14 @@ Sur certaines lignes et dans certaines régions, les avantages FIP ne sont pas v

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).

<div style="display:flex; gap:1rem; align-items:flex-start; margin-bottom:1rem;">
<figure style="flex:1; margin:0;">
<img src="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;" />
<hr aria-hidden="true" />
<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>
</figure>
<figure style="flex:1; margin:0;">
<img src="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;" />
<hr aria-hidden="true" />
<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>
</figure>
</div>
{{% columns %}}
{{% column width="50%" %}}
![[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)
{{% /column %}}
{{% column width="50%" %}}
![[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)
{{% /column %}}
{{% /columns %}}

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

Expand Down
3 changes: 3 additions & 0 deletions layouts/shortcodes/column.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="o-columns__column" style="flex-basis: {{ .Get "width" }};">
{{ .Inner }}
</div>
1 change: 1 addition & 0 deletions layouts/shortcodes/columns.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="o-columns">{{ .Inner }}</div>
Loading