Skip to content

Commit 310f870

Browse files
MoritzWeber0MoritzWeber0
committed
fix: Apply review comments
1 parent 2d855be commit 310f870

File tree

9 files changed

+64
-61
lines changed

9 files changed

+64
-61
lines changed

‎assets/sass/print.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
.a-anchorlink__link,
3333
picture,
3434
.icon-arrow_outward,
35-
.sidemenu,
35+
.o-aside,
3636
.o-list__picture,
3737
.o-header__wrapper,
3838
.o-footer__links,

‎assets/sass/sidemenu.scss

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
.sidemenu {
2-
display: flex;
3-
flex-direction: column;
4-
gap: 1rem;
5-
flex-wrap: wrap;
6-
}
7-
81
.o-aside {
92
position: sticky;
103
top: 8rem;
@@ -17,6 +10,12 @@
1710

1811
z-index: 3;
1912

13+
display: flex;
14+
flex-direction: column;
15+
gap: 1.5rem;
16+
flex-wrap: wrap;
17+
height: fit-content;
18+
2019
@media (min-width: #{$breakpoint-lg}) {
2120
margin-bottom: 0;
2221
}
@@ -38,10 +37,10 @@
3837
padding-left: 0;
3938
}
4039

41-
.sidemenu a {
40+
.o-aside a {
4241
text-decoration-line: none;
4342
display: flex;
44-
align-items: center;
43+
align-items: flex-start;
4544
gap: .5rem;
4645
}
4746

@@ -79,12 +78,12 @@
7978
}
8079
}
8180

82-
.news-list {
81+
.o-news__list {
8382
list-style-type: none;
8483
list-style-position: outside;
8584
padding-left: 0;
86-
}
8785

88-
.news-date {
89-
padding-left: 2.5rem;
86+
&__date {
87+
padding-left: 2.5rem;
88+
}
9089
}

‎assets/sass/styles.scss

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,20 @@ img {
142142
padding: 0;
143143
background-color: inherit;
144144
}
145+
146+
&__content {
147+
display: flex;
148+
flex-direction: column;
149+
gap: 1.5rem;
150+
}
151+
152+
&__news_image {
153+
margin-bottom: 1.6rem;
154+
155+
@media (min-width: #{$breakpoint-lg}) {
156+
display: none;
157+
}
158+
}
145159
}
146160

147161
.o-single__header {
@@ -181,9 +195,3 @@ img {
181195
.pagefind-highlight {
182196
padding: 0px;
183197
}
184-
185-
.content {
186-
display: flex;
187-
flex-direction: column;
188-
gap: 1.5rem;
189-
}

‎i18n/de.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ highlight-important: Wichtige Information
1515
highlight-inofficial: Inoffizielle Information
1616
highlight-tip: Persönlicher Tipp
1717
news-headline: Was gibt's Neues?
18-
news-other: Weitere Neuigkeiten
18+
news-other: Weitere News
1919
_operator__list_title: Betreiber mit FIP
2020
updateDate: Zuletzt aktualisiert
2121
related: Verwandte Seiten

‎layouts/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="o-single__header">
44
<h2 data-pagefind-meta="title">404 - Page Not Found</h2>
55
</div>
6-
<div class="content" data-pagefind-body="">
6+
<div class="o-single__content" data-pagefind-body="">
77
<p>Oops! The page you’re looking for is unavailable or has been moved.</p>
88
<p>Here's what you can do next:</p>
99
<ul>

‎layouts/_default/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2 data-pagefind-meta="title">{{ .Title }}</h2>
55
{{ partial "updateDate.html" . }}
66
</div>
77

8-
<div class="content" data-pagefind-body>
8+
<div class="o-single__content" data-pagefind-body>
99
{{ .Content }}
1010
</div>
1111
</article>

‎layouts/country/single.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33

44
<div class="curtain" aria-hidden="true"></div>
55
<article class="container o-single o-single--with-sidemenu">
6-
<div class="sidemenu">
7-
{{ partial "sidemenu.html" . }}
8-
</div>
9-
10-
<div class="content" data-pagefind-body>
6+
{{ partial "sidemenu" . }}
7+
<div class="o-single__content" data-pagefind-body>
118
<div class="o-single__container content_with_heading">
129
<div class="o-single__header">
1310
<div class="o-single__header__title">
@@ -27,7 +24,7 @@ <h1 data-pagefind-meta="title">{{ .Title }}</h1>
2724
</div>
2825
<div class="o-single__container">
2926
<h3 id="related">{{ T "_operator__list_title"}} in {{ .Title }}</h3>
30-
<ul class="o-list__link-wrapper">
27+
<ul class="o-list__link-wrapper" aria-labelledby="related">
3128
{{ range $related }}
3229
<li class="col-12 col-lg-3 col-sm-6">
3330
{{ partial "operator-list-item" . }}

‎layouts/news/single.html

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
{{ define "main" }}
22
<div class="curtain" aria-hidden="true"></div>
33
<article class="container o-single o-single--with-sidemenu">
4-
<div class="sidemenu">
4+
<aside id="aside" class="o-aside">
55
{{ partial "image" (partial "helper/contentImage" . ) }}
6-
<aside id="aside" class="o-aside">
7-
<div class="o-single__container">
8-
<h3>{{ T "news-other" }}</h3>
9-
<ul class="news-list">
10-
{{ $current := . }}
11-
{{ range first 5 (where (where site.RegularPages "Section" "news") "Permalink" "ne" $current.Permalink) }}
12-
<li>
13-
{{ partial "internal_link"
14-
(dict
15-
"Destination" .RelPermalink
16-
"Text" ((print (partial "icon" "newspaper" ) (.Title)) | .Page.RenderString)
17-
)
18-
}}
19-
<span class="news-date">({{ .Date | time.Format ":date_long"}})</span>
20-
</li>
21-
{{ end }}
22-
</ul>
23-
<hr>
24-
{{ partial "link"
25-
(dict
26-
"Destination" (print .Site.Params.githubDevUrl "blob/main/content" .Path "/index." .Language ".md")
27-
"Text" ((print (partial "icon" "edit_square" ) (T "editPage")) | .Page.RenderString)
28-
)
29-
}}
30-
</div>
31-
</aside>
32-
</div>
6+
<div class="o-single__container">
7+
<h3 id="other-news-list-title">{{ T "news-other" }}</h3>
8+
<ul class="o-news__list" aria-labelledby="other-news-list-title">
9+
{{ $current := . }}
10+
{{ range first 5 (where (where site.RegularPages "Section" "news") "Permalink" "ne" $current.Permalink) }}
11+
<li>
12+
{{ partial "internal_link"
13+
(dict
14+
"Destination" .RelPermalink
15+
"Text" ((print (partial "icon" "newspaper" ) (.Title)) | .Page.RenderString)
16+
)
17+
}}
18+
<span class="o-news__list__date">{{ .Date | time.Format ":date_long"}}</span>
19+
</li>
20+
{{ end }}
21+
</ul>
22+
<hr>
23+
{{ partial "link"
24+
(dict
25+
"Destination" (print .Site.Params.githubDevUrl "blob/main/content" .Path "/index." .Language ".md")
26+
"Text" ((print (partial "icon" "edit_square" ) (T "editPage")) | .Page.RenderString)
27+
)
28+
}}
29+
</div>
30+
</aside>
3331
<div class="o-single__container content_with_heading" data-pagefind-body>
3432
<div class="o-single__header">
3533
<h2 data-pagefind-meta="title">{{ .Title }}</h2>
3634
{{ partial "updateDate.html" . }}
3735
</div>
36+
<div class="o-single__news_image">
37+
{{ partial "image" (partial "helper/contentImage" . ) }}
38+
</div>
3839
<div data-pagefind-body>
3940
{{ .Content }}
4041
</div>

‎layouts/operator/single.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
{{ define "main" }}
22
<div class="curtain" aria-hidden="true"></div>
33
<article class="container o-single o-single--with-sidemenu">
4-
<div class="sidemenu">
5-
{{ partial "sidemenu.html" . }}
6-
</div>
7-
<div class="content" data-pagefind-body>
4+
{{ partial "sidemenu" . }}
5+
<div class="o-single__content" data-pagefind-body>
86
<div class="o-single__container content_with_heading">
97
<div class="o-single__header">
108
<div class="o-single__header__title">

0 commit comments

Comments
 (0)