Skip to content

Commit ee8dea8

Browse files
committed
Merge main & update to bikkelhart/internet-nl@45804654
git fetch bikkelhart git merge -X theirs internetnl/main git checkout --no-overlay bikkelhart/bikkelhart-redesign -- frontend interface/templates interface/static translations git checkout --no-overlay main -- interface/static/question@internet.nl_0x45028563.asc interface/templates/statistics.html convert -resize 48x48 interface/static/favicon.{png,ico} git add interface/static/favicon.ico git commit --amend -m "Merge main & update to bikkelhart/internet-nl@$(git rev-parse bikkelhart/bikkelhart-redesign | cut -c1-8)"
1 parent 1ca7826 commit ee8dea8

31 files changed

+1038
-704
lines changed

frontend/rollup.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const chunks = {
3434
base: [
3535
"src/js/base/header.js",
3636
"src/js/base/theme.js",
37-
"src/js/base/language-switch.js",
3837
"src/js/base/print.js",
3938
"src/js/lib/matomo.js",
4039
],

frontend/src/css/components.css

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,14 @@
230230
}
231231
}
232232

233+
[data-theme="dark"] {
234+
color-scheme: dark;
235+
236+
.card.large.knowledge-card {
237+
border: var(--card-border);
238+
}
239+
}
240+
233241
.card {
234242
border-radius: 0.5rem;
235243

@@ -262,25 +270,37 @@
262270

263271
&.news-card {
264272
background-color: var(--card-bg-color-news);
265-
273+
266274
a {
267275
color: var(--card-body-color-news);
268276
}
269277
}
270278

271279
&.knowledge-card {
272280
background-color: var(--card-bg-color-knowledge);
273-
281+
274282
a {
275283
color: var(--card-heading-color-knowledge);
276-
277284
}
278285
}
279286

280287

281288
&.large {
289+
&.knowledge-card {
290+
@media (prefers-color-scheme: dark) {
291+
border: var(--card-border);
292+
}
293+
294+
@media (prefers-color-scheme: light) {
295+
border: none;
296+
}
297+
}
298+
299+
&.news-card {
300+
border: var(--card-border);
301+
}
302+
282303
translate: 0 3rem;
283-
border: var(--card-border);
284304

285305
@media (width >= 56.25rem) {
286306
translate: 0 4rem;
@@ -484,4 +504,17 @@
484504
background-color: var(--accordion-heading-color);
485505
}
486506
}
507+
}
508+
509+
/* Overwrites for light theme */
510+
[data-theme="light"] {
511+
color-scheme: light;
512+
513+
.card.large.knowledge-card {
514+
border: none;
515+
}
516+
517+
.accordion {
518+
border: 1px solid var(--green-400);
519+
}
487520
}

frontend/src/css/contact-section.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
}
5252
}
5353

54+
[data-theme="light"] {
55+
color-scheme: light;
56+
57+
.faq-item {
58+
border: 1px solid var(--green-400);
59+
}
60+
}
61+
5462
.faq-item {
5563
margin-bottom: 0.5rem;
5664
background: var(--accordion-bg-color);

frontend/src/css/global.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@ video {
133133
padding-inline: 1rem;
134134
}
135135

136+
.center {
137+
display: flex;
138+
justify-content: center;
139+
}
140+
136141
.light-visible {
137142
display: var(--light-visible);
138143
}

0 commit comments

Comments
 (0)