Skip to content

Commit faeaf4f

Browse files
Merge branch 'main' into dsw-2307-pie-radio
2 parents b7064ce + 097cdfa commit faeaf4f

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

.changeset/late-beds-clap.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@justeattakeaway/pie-card": patch
3+
---
4+
5+
[Changed] - Update the background color of the inverse card from `$color-container-dark` to `$color-container-inverse`

.changeset/neat-pugs-learn.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@justeattakeaway/pie-chip": patch
3+
---
4+
5+
[Changed] - The loading state of the `Outline` variant should have a border.
6+
[Changed] - The disabled state of the `Ghost` variant should have a transparent background.

packages/components/pie-card/src/card.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@
7070
}
7171

7272
&.c-card--inverse {
73-
--card-bg-color: var(--dt-color-container-dark);
73+
--card-bg-color: var(--dt-color-container-inverse);
7474
--card-color: var(--dt-color-content-inverse);
7575

7676
box-shadow: var(--dt-elevation-dark-card);
7777

78-
@include card-interactive-states('--dt-color-container-dark', 'inverse');
78+
@include card-interactive-states('--dt-color-container-inverse', 'inverse');
7979
}
8080

8181
&.c-card--outline-inverse {
82-
--card-bg-color: var(--dt-color-container-dark);
82+
--card-bg-color: var(--dt-color-container-inverse);
8383
--card-color: var(--dt-color-content-inverse);
8484

8585
border-color: var(--dt-color-border-inverse);
8686

87-
@include card-interactive-states('--dt-color-container-dark', 'inverse');
87+
@include card-interactive-states('--dt-color-container-inverse', 'inverse');
8888
}
8989

9090
&.c-card--inverse.c-card--disabled,

packages/components/pie-chip/src/chip.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
// same as default styles
7676
}
7777

78-
&.c-chip--outline:not([disabled], .c-chip--selected, .is-loading) {
78+
&.c-chip--outline:not([disabled], .c-chip--selected) {
7979
--chip-border-color: var(--dt-color-border-strong);
8080
}
8181

@@ -129,6 +129,10 @@
129129
--chip-bg-color: var(--dt-color-disabled-01);
130130
--chip-color: var(--dt-color-content-disabled);
131131

132+
&.c-chip--ghost {
133+
--chip-bg-color: transparent;
134+
}
135+
132136
cursor: not-allowed;
133137
}
134138

0 commit comments

Comments
 (0)