Skip to content

Commit b2b0d55

Browse files
authored
Merge pull request #30 from fipguide/feat/robert
Feat/robert
2 parents d142a3f + e325b89 commit b2b0d55

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+343
-144
lines changed

assets/images/close.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

assets/images/expand-more.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

assets/images/menu.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

assets/sass/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ body {
1616
--border-radius-m: .8rem;
1717
--border-radius-l: 1.2rem;
1818
--pagefind-ui-border-radius: var(--border-radius-l);
19+
--pagefind-ui-border: #000;
1920
}

assets/sass/expander.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ details > summary::-webkit-details-marker {
3434
}
3535

3636
summary::before {
37-
content: '\e145' / '';
38-
font-family: "material icons round";
37+
content: url($icon-add);
3938
font-weight: normal;
4039
width: 2.4rem;
4140
height: 2.4rem;
@@ -46,7 +45,7 @@ summary::before {
4645
}
4746

4847
details[open] > summary::before {
49-
content: '\e15b' / '';
48+
content: url($icon-remove);
5049
}
5150

5251
details[open] > summary {

assets/sass/footer.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
justify-content: normal;
99
flex-flow: column;
1010

11-
@include media-breakpoint-up(md) {
11+
@include media-breakpoint-up(lg) {
1212
justify-content: flex-end;
1313
flex-flow: row;
1414
}
@@ -26,7 +26,7 @@
2626
color: var(--link-hovered);
2727
}
2828

29-
@include media-breakpoint-up(md) {
29+
@include media-breakpoint-up(lg) {
3030
margin-left: 1.6rem;
3131
margin-right: 0;
3232
}

assets/sass/headings.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ h4 {
3232
font-weight: 700;
3333
text-wrap: balance;
3434
scroll-margin-top: 7rem;
35+
}
36+
37+
sup {
38+
scroll-margin-top: 7rem;
3539
}

assets/sass/main.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
$icon-add: '{{(resources.Get "svg/default/add.svg" | fingerprint "md5").RelPermalink}}';
2+
$icon-remove: '{{(resources.Get "svg/default/remove.svg" | fingerprint "md5").RelPermalink}}';
3+
14
@import "_variables.scss";
25
@import "node_modules/bootstrap/scss/bootstrap.scss";
3-
@import 'node_modules/@material-design-icons/font/round.scss';
46
@import "styles.scss";
57
@import "fonts.scss";
68
@import "navigation.scss";

assets/sass/navigation.scss

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,14 @@
137137
}
138138
}
139139

140-
.o-nav__menu-button-text {
141-
142-
}
143-
144-
.o-header__expand-button i,
145-
.o-nav__menu-button i,
146-
.o-nav__close-button i {
140+
.o-header__expand-button svg,
141+
.o-nav__menu-button svg,
142+
.o-nav__close-button svg {
147143
margin-left: .8rem;
148144
align-self: center;
149145
}
150146

151-
.o-header__expand-button:has(~ .o-header__item-countries--open) i {
147+
.o-header__expand-button:has(~ .o-header__item-countries--open) svg {
152148
transform: rotate(180deg);
153149
}
154150

@@ -196,7 +192,7 @@
196192
position: fixed;
197193
top: 0;
198194
right: 0;
199-
width: 60%;
195+
width: 70%;
200196
height: 100%;
201197
z-index: 4;
202198
background-color: white;
@@ -211,6 +207,7 @@
211207
menu {
212208
flex-direction: column;
213209
align-items: flex-end;
210+
padding-left: 0;
214211
}
215212

216213
menu li:first-child {

assets/sass/sidemenu.scss

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,8 @@
1919
display: none;
2020
}
2121

22-
.o-single__relatedLink {
23-
display: flex;
24-
align-items: center;
25-
26-
i {
27-
margin-right: .4rem;
28-
}
29-
30-
span {
31-
align-self: center;
32-
}
22+
.o-single__container {
23+
margin-bottom: 1.6rem;
3324
}
3425

3526
//TODO: Bessere Benamung

assets/sass/stage.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
outline: .2rem solid orange;
4141
outline-offset: .1rem;
4242
}
43+
44+
&::placeholder {
45+
color: var(--color-onLight);
46+
opacity: .5;
47+
}
4348
}
4449

4550
.pagefind-ui__search-clear {

assets/sass/styles.scss

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ a:not(.m-teaser) {
2323
}
2424
}
2525

26+
a:has(i) {
27+
display: inline-flex;
28+
align-items: center;
29+
30+
> :first-child {
31+
margin-right: .4rem;
32+
}
33+
}
34+
2635
a.m-teaser {
2736
.m-teaser__headline {
2837
color: var(--link-default);
@@ -71,16 +80,29 @@ img {
7180
border-radius: var(--border-radius-m);
7281
}
7382

83+
.o-list__picture {
84+
width: 15rem;
85+
margin-right: 1.2rem;
86+
}
87+
88+
.o-list__link {
89+
display: flex;
90+
align-items: center;
91+
margin-bottom: 2.4rem;
92+
}
93+
7494
p {
7595
margin-bottom: 3.2rem;
7696
text-align: justify;
7797
}
7898

79-
p:has( + ul) {
99+
p:has( + ul),
100+
p:has( + ol) {
80101
margin-bottom: 1rem;
81102
}
82103

83-
article p:last-child {
104+
article p:last-child,
105+
section p:last-child {
84106
margin-bottom: 0;
85107
}
86108

@@ -118,5 +140,6 @@ article p:last-child {
118140
background-color: var(--bg-default);
119141
padding: 2rem;
120142
border-radius: var(--border-radius-l);
143+
margin-bottom: 2.4rem;
121144
}
122145

assets/sass/teaser.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@
1111

1212
.m-teaser--listview {
1313
margin-bottom: 2.4rem;
14+
display: flex;
15+
16+
@include media-breakpoint-down(md) {
17+
flex-flow: wrap;
18+
}
19+
}
20+
21+
.m-teaser__image {
22+
margin-right: 1.6rem;
1423
}
1524

1625
.m-teaser img {

assets/sass/textHighlight.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
padding: 1.2rem;
44
margin-bottom: 1.2rem;
55
border-radius: var(--border-radius-m);
6-
border-left: var() solid 1rem;
6+
border-left: var(--bg-neutral) solid 1rem;
77
}
88

99
.m-text-highlight--tip {

assets/svg/default/add.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/arrow_back.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/arrow_outward.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/close.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/edit_square.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/list.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/menu.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/remove.svg

Lines changed: 1 addition & 0 deletions
Loading

assets/svg/default/view_cozy.svg

Lines changed: 1 addition & 0 deletions
Loading

content/_index.de.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
## Willkommen beim FIP Guide!
22

3-
Die Community-Website für alle Informationen zu FIP (Groupement pour les facilités de circulation internationales du personnel des chemins de fer) - Die Vereinigung für die internationalen Fahrvergünstigungen des Eisenbahnpersonals.
4-
Mit dieser internationalen Ermäßigungskarte für Eisenbahnpersonal können Mitarbeiterinnen und Mitarbeiter zu vergünstigten Konditionen in Europa beispielsweise Züge, Schiffe und Busse nutzen.
5-
In diesem Projekt sind Informationen und Nutzungshinweise zu FIP sowie Besonderheiten zu den jeweiligen beteiligten Bahngesellschaften aufgeführt.
3+
Die Community-Website für alle Informationen zu FIP (internationale Fahrvergünstigungen für Eisenbahnpersonal).
4+
In diesem Projekt sind Informationen und Nutzungshinweise zu FIP sowie Besonderheiten zu den jeweiligen beteiligten Bahngesellschaften aufgeführt.
65

7-
Momentan gibt es die Infos für die Länder **Belgien** und **Slowakei**.
8-
9-
Der aktuellen Bearbeitungsstand der Informationen für Betreiber ist hier zu finden: [Content Status](https://github.com/orgs/fipguide/projects/3)
6+
* [Grundlegende Informationen zu FIP]({{< ref "generalinformation" >}})
7+
* [Übersicht der Länder]({{< ref "country" >}})
108

119
### Unterstütze uns
1210
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.

content/_index.en.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
## Welcome to the FIP Guide!
22

3-
The community website for all information about FIP (Groupement pour les facilités de circulation internationales du personnel des chemins de fer) - The association for international travel benefits for railway staff.
4-
With this international discount card for railway staff, employees can use trains, ships, and buses in Europe at reduced rates.
5-
This project includes information and usage instructions for FIP as well as special features of the respective participating railway companies.
3+
The community website for all information about FIP.
4+
This project includes information and usage instructions for FIP as well as special features of the respective participating railway companies.
65

7-
Currently, information for the countries **Belgium** and **Slovakia** are available.
8-
9-
You can see the current information status for operators here: [Content Status](https://github.com/orgs/fipguide/projects/3)
6+
* [Basic information about FIP]({{< ref "generalinformation" >}})
7+
* [Overview of countries]({{< ref "country" >}})
108

119
### Support Us
1210
Would you like to share your knowledge about FIP regulations? Visit our [GitHub Repository](https://github.com/fipguide/fipguide.github.io) to contribute content.

content/country/belgium/image.webp

6.72 KB
Binary file not shown.
10.4 KB
Binary file not shown.

content/country/slovakia/image.webp

12.5 KB
Binary file not shown.

content/generalInformation.de.md

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,31 @@
11
---
2-
date: "2024-10-17"
2+
date: "2025-03-25"
33
title: "Übergreifende Infos"
44
---
55

6-
Willkommen auf unserer Webseite! Hier finden Sie alle wichtigen Informationen rund um unser Projekt.
6+
Hier findest du übergreifende Informationen zum FIP Guide.
77

8-
## Über uns
8+
## Was ist FIP?
99

10-
Wir sind ein engagiertes Team, das sich zum Ziel gesetzt hat, hochwertige Inhalte und Ressourcen bereitzustellen. Unser Fokus liegt auf der Bereitstellung von nützlichen Informationen für unsere Nutzer.
10+
FIP steht für _Groupement pour les facilités de circulation internationales du personnel des chemins de fer_. Es ist die Vereinigung für die internationalen Fahrvergünstigungen des Eisenbahnpersonals.
11+
Mit dieser internationalen Ermäßigungskarte für Eisenbahnpersonal können Mitarbeiterinnen und Mitarbeiter zu vergünstigten Konditionen in Europa beispielsweise Züge, Schiffe und Busse nutzen.
12+
In diesem Projekt sind Informationen und Nutzungshinweise zu FIP sowie Besonderheiten zu den jeweiligen beteiligten Bahngesellschaften aufgeführt.
13+
14+
## Welche Vergünstigungen erhalte ich durch FIP?
15+
16+
Es gibt zwei Möglichkeiten zur Nutzung:
17+
1. **FIP-Card:** die FIP-Card ist drei Jahre gültig und berechtigt zum unlimitierten Kauf von vergünstigten Bahntickets im Ausland.
18+
2. **FIP-Coupons:** pro Jahr und FIP-Mitglied kannst du FIP-Coupons erhalten, welche für bis zu acht Tage ermöglichen.
19+
20+
Die genauen Regelungen findest du auf den Unterseiten der [Betreiber]({{< ref "operator" >}}).
21+
22+
## Wie kann ich FIP in Anspruch nehmen?
23+
24+
Mitarbeiterinnen und Mitarbeiter eines FIP-Mitglieds sind nach 12 Monaten Betriebszugehörigkeit berechtigt, FIP-Einrichtungen zu nutzen.
25+
Bitte wende dich für die Beantragung und Inanspruchnahme an deine Personalabteilung.
26+
27+
## Wer steckt hinter dem FIP Guide?
28+
29+
Wir sind ein engagiertes Team von Bahn-Mitarbeitenden, welche selbst regelmäßig FIP nutzen.
30+
Unser Ziel ist, eine schnell und einfach nutzbare Übersicht zur Nutzung von FIP bereitzustellen.
31+
Unser Fokus liegt auf der Bereitstellung von nützlichen Informationen für die Nutzerinnen und Nutzer.

content/generalInformation.en.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,31 @@
11
---
2-
date: "2024-10-17"
2+
date: "2025-03-25"
33
title: "General Information"
44
---
55

6-
Welcome to our website! Here you will find all the important information about our project.
6+
Here you will find comprehensive information about the FIP Guide.
77

8-
## About Us
8+
## What is FIP?
99

10-
We are a dedicated team committed to providing high-quality content and resources. Our focus is on delivering useful information to our users.
10+
FIP stands for _Groupement pour les facilités de circulation internationales du personnel des chemins de fer_. It is the association for international travel concessions for railway personnel.
11+
With this international discount card for railway personnel, employees can use trains, ships, and buses in Europe at reduced rates.
12+
This project provides information and usage instructions for FIP as well as specifics about the participating railway companies.
1113

14+
## What discounts do I get through FIP?
15+
16+
There are two ways to use it:
17+
1. **FIP Card:** The FIP Card is valid for three years and entitles the holder to unlimited purchase of discounted train tickets abroad.
18+
2. **FIP Coupons:** Each year, FIP members can receive FIP Coupons, which allow for up to eight days of travel.
19+
20+
You can find the exact regulations on the subpages of the [operators]({{< ref "operator" >}}).
21+
22+
## How can I take advantage of FIP?
23+
24+
Employees of a FIP member are eligible to use FIP facilities after 12 months of employment.
25+
Please contact your HR department for application and usage.
26+
27+
## Who is behind the FIP Guide?
28+
29+
We are a dedicated team of railway employees who regularly use FIP ourselves.
30+
Our goal is to provide a quick and easy-to-use overview for using FIP.
31+
Our focus is on providing useful information for users.

hugo.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ module:
1919
mounts:
2020
- source: "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
2121
target: "assets/js/bootstrap.bundle.min.js"
22-
- source: "node_modules/@material-design-icons/font/material-icons-round.woff2"
23-
target: "static/css/material-icons-round.woff2"
2422
- source: "assets"
2523
target: "assets"
2624
- source: "static"

i18n/de.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ related: Verwandte Seiten
2424
toc_name: Inhalt
2525
_operator__nearby: Angrenzende Betreiber
2626
toc-backlink: Zurück zu
27-
editPage: Seite bearbeiten
27+
editPage: Seite bearbeiten
28+
list-disclaimer: Momemtan sind noch nicht für alle Länder und Betreiber Informationen verfügbar. Den aktuellen Bearbeitungsstand findest du auf
29+
list-disclaimer-link: GitHub

0 commit comments

Comments
 (0)