Skip to content

Commit 0e6a88a

Browse files
committed
Fixed markup of global consent buttons
Also, we're mutualizing styles of all button lists. We're not removing the now unused `orejime-Banner-actionItem` classes, as to not break any user styles. Fixes #149
1 parent e13e3d3 commit 0e6a88a

3 files changed

Lines changed: 31 additions & 27 deletions

File tree

src/ui/themes/standard/Banner.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const Banner: BannerComponent = ({
7474
)}
7575

7676
<ul className="orejime-Banner-actions orejime-ButtonList">
77-
<li className="orejime-Banner-actionItem orejime-Banner-actionItem--save">
77+
<li className="orejime-ButtonList-item orejime-Banner-actionItem orejime-Banner-actionItem--save">
7878
<button
7979
className="orejime-Button orejime-Button--save orejime-Banner-button orejime-Banner-saveButton"
8080
type="button"
@@ -85,7 +85,7 @@ const Banner: BannerComponent = ({
8585
{t.banner.accept}
8686
</button>
8787
</li>
88-
<li className="orejime-Banner-actionItem orejime-Banner-actionItem--decline">
88+
<li className="orejime-ButtonList-item orejime-Banner-actionItem orejime-Banner-actionItem--decline">
8989
<button
9090
className="orejime-Button orejime-Button--decline orejime-Banner-button orejime-Banner-declineButton"
9191
type="button"
@@ -96,7 +96,7 @@ const Banner: BannerComponent = ({
9696
{t.banner.decline}
9797
</button>
9898
</li>
99-
<li className="orejime-Banner-actionItem orejime-Banner-actionItem--info">
99+
<li className="orejime-ButtonList-item orejime-Banner-actionItem orejime-Banner-actionItem--info">
100100
<button
101101
type="button"
102102
className="orejime-Button orejime-Button--info orejime-Banner-learnMoreButton"

src/ui/themes/standard/GlobalConsent.tsx

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,31 @@ const GlobalConsent: GlobalConsentComponent = ({
1010
const t = useTranslations();
1111

1212
return (
13-
<div className="orejime-PurposeToggles orejime-ButtonList">
14-
<button
15-
type="button"
16-
className="orejime-Button orejime-Button--info orejime-PurposeToggles-button orejime-PurposeToggles-enableAll"
17-
aria-disabled={isEnabled}
18-
onClick={acceptAll}
19-
data-testid="orejime-modal-enable-all"
20-
>
21-
{t.modal.acceptAll}
22-
</button>
13+
<ul className="orejime-PurposeToggles orejime-ButtonList">
14+
<li className="orejime-ButtonList-item">
15+
<button
16+
type="button"
17+
className="orejime-Button orejime-Button--info orejime-PurposeToggles-button orejime-PurposeToggles-enableAll"
18+
aria-disabled={isEnabled}
19+
onClick={acceptAll}
20+
data-testid="orejime-modal-enable-all"
21+
>
22+
{t.modal.acceptAll}
23+
</button>
24+
</li>
2325

24-
<button
25-
type="button"
26-
className="orejime-Button orejime-Button--info orejime-PurposeToggles-button orejime-PurposeToggles-disableAll"
27-
aria-disabled={isDisabled}
28-
onClick={declineAll}
29-
data-testid="orejime-modal-disable-all"
30-
>
31-
{t.modal.declineAll}
32-
</button>
33-
</div>
26+
<li className="orejime-ButtonList-item">
27+
<button
28+
type="button"
29+
className="orejime-Button orejime-Button--info orejime-PurposeToggles-button orejime-PurposeToggles-disableAll"
30+
aria-disabled={isDisabled}
31+
onClick={declineAll}
32+
data-testid="orejime-modal-disable-all"
33+
>
34+
{t.modal.declineAll}
35+
</button>
36+
</li>
37+
</ul>
3438
);
3539
};
3640

src/ui/themes/standard/index.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@
8686
gap: 0.5ch;
8787
}
8888

89+
.orejime-ButtonList-item {
90+
display: inline-block;
91+
}
92+
8993
.orejime-Banner {
9094
position: fixed;
9195
z-index: 1000;
@@ -132,10 +136,6 @@
132136
margin-top: var(--orejime-space-s);
133137
}
134138

135-
.orejime-Banner-actionItem {
136-
display: inline;
137-
}
138-
139139
.orejime-Banner-learnMoreButton {
140140
display: inline-block;
141141
}

0 commit comments

Comments
 (0)