Skip to content

Commit c189cdf

Browse files
committed
refactor: replace Footer __content __wrapper with rhc-page-footer-layout
1 parent c1c4f39 commit c189cdf

File tree

4 files changed

+49
-55
lines changed

4 files changed

+49
-55
lines changed

.changeset/stale-moose-wonder.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@rijkshuisstijl-community/components-react': patch
3+
'@rijkshuisstijl-community/components-css': patch
4+
'@rijkshuisstijl-community/components-angular': patch
5+
---
6+
7+
Use new Utrecht Page Footer CSS that provides `utrecht-page-footer__content`, which replaces `rhc-page-footer__content`.
8+
9+
Replace `rhc-page-footer__wrapper` new nested `rhc-page-footer-layout` div.

packages/components-angular/src/footer/footer.component.html

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@
77
}
88

99
<footer [class]="`utrecht-page-footer rhc-page-footer ${backgroundClass}`">
10-
<div class="rhc-page-footer__content rhc-page-footer__wrapper">
11-
@if (heading) {
12-
<h2 aria-hidden="true" hidden>{{ heading }}</h2>
13-
}
14-
@if (tagline) {
15-
<div class="rhc-page-footer__tagline">
16-
<rhc-heading [level]="2" [appearanceLevel]="appearanceLevel" role="presentation">{{ tagline }}</rhc-heading>
17-
</div>
18-
}
19-
<rhc-column-layout>
20-
<ng-content select="[columns]"></ng-content>
21-
</rhc-column-layout>
10+
<div class="utrecht-page-footer__content">
11+
<div class="rhc-page-footer-layout">
12+
@if (heading) {
13+
<h2 aria-hidden="true" hidden>{{ heading }}</h2>
14+
}
15+
@if (tagline) {
16+
<div class="rhc-page-footer__tagline">
17+
<rhc-heading [level]="2" [appearanceLevel]="appearanceLevel" role="presentation">{{ tagline }}</rhc-heading>
18+
</div>
19+
}
20+
<rhc-column-layout>
21+
<ng-content select="[columns]"></ng-content>
22+
</rhc-column-layout>
23+
</div>
2224
</div>
2325

2426
@if (subFooter) {

packages/components-css/library-css/src/footer/index.scss

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
border-block-start-width: var(--rhc-page-footer-border-block-start-width);
5252
}
5353

54-
.rhc-page-footer__content {
54+
.rhc-page-footer-layout {
5555
column-gap: var(--rhc-page-footer-column-gap);
5656
display: flex;
5757
flex: 1;
@@ -63,24 +63,14 @@
6363
}
6464
}
6565

66-
.rhc-page-footer__wrapper {
67-
box-sizing: border-box;
68-
inline-size: 100%;
69-
max-inline-size: var(--rhc-page-footer-content-max-inline-size);
70-
padding-block-end: var(--utrecht-page-footer-padding-block-end);
71-
padding-block-start: var(--utrecht-page-footer-padding-block-start);
72-
padding-inline-end: var(--utrecht-page-footer-padding-inline-end);
73-
padding-inline-start: var(--utrecht-page-footer-padding-inline-start);
74-
}
75-
7666
.rhc-page-footer__section,
7767
.rhc-page-footer__tagline {
7868
break-inside: avoid;
7969
line-height: var(--rhc-text-line-height-md, inherit);
8070
padding-block-end: var(--rhc-page-footer-padding-block-end);
8171
}
8272

83-
.rhc-page-footer__content > * {
73+
.rhc-page-footer-layout > * {
8474
flex: 1;
8575
}
8676

@@ -112,15 +102,6 @@
112102
}
113103
}
114104

115-
@media (width <= 780px) {
116-
.rhc-page-footer__wrapper {
117-
--utrecht-page-footer-padding-inline-end: var(--rhc-page-footer-padding-inline-end);
118-
--utrecht-page-footer-padding-inline-start: var(--rhc-page-footer-padding-inline-start);
119-
--utrecht-page-footer-padding-block-end: var(--rhc-page-footer-padding-block-end);
120-
--utrecht-page-footer-padding-block-start: var(--rhc-page-footer-padding-block-start);
121-
}
122-
}
123-
124105
.rhc-page-prefooter {
125106
display: flex;
126107
justify-content: center;

packages/components-react/library-react/src/Footer.tsx

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,30 +73,32 @@ export const Footer = ({
7373
className,
7474
)}
7575
>
76-
{heading ? (
77-
<Heading hidden aria-hidden="true" id={headingId} level={2}>
78-
{heading}
79-
</Heading>
80-
) : null}
81-
<div className="rhc-page-footer__content rhc-page-footer__wrapper">
82-
{tagline && (
83-
<div className="rhc-page-footer__tagline" key={'heading'}>
84-
<Heading appearanceLevel={appearanceLevel} level={2} role="presentation">
85-
{tagline}
86-
</Heading>
87-
</div>
88-
)}
89-
<ColumnLayout>
90-
{columns?.map(({ heading: columnHeading, children }: ColumnProps, index: number) => (
91-
<div className="rhc-page-footer__section" key={index}>
92-
<Heading appearanceLevel={appearanceLevel} level={heading ? 3 : 2}>
93-
{columnHeading}
76+
<div className="utrecht-page-footer__content">
77+
{heading ? (
78+
<Heading hidden aria-hidden="true" id={headingId} level={2}>
79+
{heading}
80+
</Heading>
81+
) : null}
82+
<div className="rhc-page-footer-layout">
83+
{tagline && (
84+
<div className="rhc-page-footer__tagline" key={'heading'}>
85+
<Heading appearanceLevel={appearanceLevel} level={2} role="presentation">
86+
{tagline}
9487
</Heading>
95-
{children}
9688
</div>
97-
))}
98-
{children}
99-
</ColumnLayout>
89+
)}
90+
<ColumnLayout>
91+
{columns?.map(({ heading: columnHeading, children }: ColumnProps, index: number) => (
92+
<div className="rhc-page-footer__section" key={index}>
93+
<Heading appearanceLevel={appearanceLevel} level={heading ? 3 : 2}>
94+
{columnHeading}
95+
</Heading>
96+
{children}
97+
</div>
98+
))}
99+
{children}
100+
</ColumnLayout>
101+
</div>
100102
</div>
101103
{(backtotop || subFooter) && (
102104
<div

0 commit comments

Comments
 (0)