Skip to content

Commit a6f7a0e

Browse files
Merge pull request #160 from jeffreylauwers/fix/page-header-inverse-popover-dotbadge
fix(PageHeader): herstel Popover kleuren en DotBadge contrast bij inverse colorScheme
2 parents 7ba9f3b + d6f0a75 commit a6f7a0e

2 files changed

Lines changed: 92 additions & 6 deletions

File tree

packages/components-html/src/dot-badge/dot-badge.css

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,29 @@
3737
inset-inline-end: var(--dsn-dot-badge-inset-inline-end);
3838
}
3939

40-
/* Variant kleuren */
40+
/* Variant kleuren — inverse-bg-default: de gevulde dot is een achtergrond-element,
41+
geen tekst. inverse-bg-default is de vivid kleur die zowel op lichte als donkere
42+
achtergronden leesbaar is als dot. In een inverse context (zie page-header.css)
43+
wordt overgeschakeld naar bg-default (lichte pastelkleur) voor hoog contrast op
44+
donkere achtergronden. */
4145
.dsn-dot-badge--negative {
42-
--dsn-dot-badge-color: var(--dsn-color-negative-color-default);
46+
--dsn-dot-badge-color: var(--dsn-color-negative-inverse-bg-default);
4347
}
4448

4549
.dsn-dot-badge--positive {
46-
--dsn-dot-badge-color: var(--dsn-color-positive-color-default);
50+
--dsn-dot-badge-color: var(--dsn-color-positive-inverse-bg-default);
4751
}
4852

4953
.dsn-dot-badge--warning {
50-
--dsn-dot-badge-color: var(--dsn-color-warning-color-default);
54+
--dsn-dot-badge-color: var(--dsn-color-warning-inverse-bg-default);
5155
}
5256

5357
.dsn-dot-badge--info {
54-
--dsn-dot-badge-color: var(--dsn-color-info-color-default);
58+
--dsn-dot-badge-color: var(--dsn-color-info-inverse-bg-default);
5559
}
5660

5761
.dsn-dot-badge--neutral {
58-
--dsn-dot-badge-color: var(--dsn-color-neutral-color-default);
62+
--dsn-dot-badge-color: var(--dsn-color-neutral-inverse-bg-default);
5963
}
6064

6165
/* Pulse-effect via ::before pseudo-element — geen extra DOM-nodes nodig */

packages/components-html/src/page-header/page-header.css

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,56 @@
341341
--dsn-logo-color-label: var(--dsn-color-accent-1-inverse-bg-default);
342342
}
343343

344+
/* DotBadge op een inverse achtergrond: omschakelen naar lichte bg-default kleuren
345+
voor hoog contrast op de donkere achtergrond.
346+
Scoped op de donkere vlakken (small-layout, navbar, compact-inner) — de masthead
347+
blijft op neutrale achtergrond en heeft de standaard inverse-bg-default kleuren. */
348+
.dsn-page-header--inverse
349+
.dsn-page-header__small-layout
350+
.dsn-dot-badge--negative,
351+
.dsn-page-header--inverse .dsn-page-header__navbar .dsn-dot-badge--negative,
352+
.dsn-page-header--inverse
353+
.dsn-page-header__compact-inner
354+
.dsn-dot-badge--negative {
355+
--dsn-dot-badge-color: var(--dsn-color-negative-bg-default);
356+
}
357+
358+
.dsn-page-header--inverse
359+
.dsn-page-header__small-layout
360+
.dsn-dot-badge--positive,
361+
.dsn-page-header--inverse .dsn-page-header__navbar .dsn-dot-badge--positive,
362+
.dsn-page-header--inverse
363+
.dsn-page-header__compact-inner
364+
.dsn-dot-badge--positive {
365+
--dsn-dot-badge-color: var(--dsn-color-positive-bg-default);
366+
}
367+
368+
.dsn-page-header--inverse
369+
.dsn-page-header__small-layout
370+
.dsn-dot-badge--warning,
371+
.dsn-page-header--inverse .dsn-page-header__navbar .dsn-dot-badge--warning,
372+
.dsn-page-header--inverse
373+
.dsn-page-header__compact-inner
374+
.dsn-dot-badge--warning {
375+
--dsn-dot-badge-color: var(--dsn-color-warning-bg-default);
376+
}
377+
378+
.dsn-page-header--inverse .dsn-page-header__small-layout .dsn-dot-badge--info,
379+
.dsn-page-header--inverse .dsn-page-header__navbar .dsn-dot-badge--info,
380+
.dsn-page-header--inverse .dsn-page-header__compact-inner .dsn-dot-badge--info {
381+
--dsn-dot-badge-color: var(--dsn-color-info-bg-default);
382+
}
383+
384+
.dsn-page-header--inverse
385+
.dsn-page-header__small-layout
386+
.dsn-dot-badge--neutral,
387+
.dsn-page-header--inverse .dsn-page-header__navbar .dsn-dot-badge--neutral,
388+
.dsn-page-header--inverse
389+
.dsn-page-header__compact-inner
390+
.dsn-dot-badge--neutral {
391+
--dsn-dot-badge-color: var(--dsn-color-neutral-bg-default);
392+
}
393+
344394
/* Masthead blijft op neutrale achtergrond — logo kleuren resetten naar standaard */
345395
.dsn-page-header--inverse .dsn-page-header__masthead {
346396
--dsn-logo-color-primary: var(--dsn-color-accent-1-inverse-bg-default);
@@ -364,6 +414,38 @@
364414
);
365415
}
366416

417+
/* Menu-items en knoppen in een Popover erven de inverse kleuren via CSS-cascading.
418+
De Popover heeft altijd een lichte achtergrond — reset naar standaard component-kleuren. */
419+
.dsn-page-header--inverse .dsn-popover {
420+
--dsn-menu-item-color: var(--dsn-color-action-2-color-default);
421+
--dsn-menu-item-hover-color: var(--dsn-color-action-2-color-hover);
422+
--dsn-menu-item-hover-background-color: var(--dsn-color-action-2-bg-hover);
423+
--dsn-menu-item-active-color: var(--dsn-color-action-2-color-active);
424+
--dsn-menu-item-active-background-color: var(--dsn-color-action-2-bg-active);
425+
--dsn-menu-link-current-color: var(--dsn-color-action-2-color-default);
426+
--dsn-menu-link-current-background-color: var(--dsn-color-action-2-bg-active);
427+
--dsn-menu-link-current-indicator-color: var(
428+
--dsn-color-action-2-color-default
429+
);
430+
--dsn-menu-link-current-hover-color: var(--dsn-color-action-2-color-default);
431+
--dsn-menu-link-current-hover-background-color: var(
432+
--dsn-color-action-2-bg-active
433+
);
434+
--dsn-menu-link-current-active-color: var(--dsn-color-action-2-color-default);
435+
--dsn-menu-link-current-active-background-color: var(
436+
--dsn-color-action-2-bg-active
437+
);
438+
--dsn-button-subtle-color: var(--dsn-color-action-1-color-default);
439+
--dsn-button-subtle-hover-color: var(--dsn-color-action-1-color-hover);
440+
--dsn-button-subtle-hover-background-color: var(
441+
--dsn-color-action-1-bg-hover
442+
);
443+
--dsn-button-subtle-active-color: var(--dsn-color-action-1-color-active);
444+
--dsn-button-subtle-active-background-color: var(
445+
--dsn-color-action-1-bg-active
446+
);
447+
}
448+
367449
/* Menu-items + expand-buttons + zoekknop in de inverse navbar en compacte navigatie */
368450
.dsn-page-header--inverse .dsn-page-header__navbar,
369451
.dsn-page-header--inverse .dsn-page-header__compact-primary-nav,

0 commit comments

Comments
 (0)