Skip to content

Commit 9ada7e1

Browse files
committed
fix(themes): do not fallback to base color for foreground
1 parent 0f242f0 commit 9ada7e1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

core/src/utils/test/theme.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ describe('generateGlobalThemeCSS', () => {
385385
--ion-color-contrast-rgb: var(--ion-color-primary-contrast-rgb, var(--ion-color-primary-bold-contrast-rgb)) !important;
386386
--ion-color-shade: var(--ion-color-primary-shade, var(--ion-color-primary-bold-shade)) !important;
387387
--ion-color-tint: var(--ion-color-primary-tint, var(--ion-color-primary-bold-tint)) !important;
388-
--ion-color-foreground: var(--ion-color-primary, var(--ion-color-primary-foreground, var(--ion-color-primary-bold-foreground))) !important;
388+
--ion-color-foreground: var(--ion-color-primary-foreground, var(--ion-color-primary-bold-foreground)) !important;
389389
390390
--ion-color-subtle-base: var(--ion-color-primary-subtle) !important;
391391
--ion-color-subtle-base-rgb: var(--ion-color-primary-subtle-rgb) !important;

core/src/utils/theme.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ export const generateColorClasses = (theme: any): string => {
187187

188188
// Generate CSS variables for bold variant
189189
// Includes base color variables without the bold modifier for
190-
// backwards compatibility. The foreground variables falls back to the
191-
// base color because it is new.
190+
// backwards compatibility.
192191
// TODO: Remove the fallbacks once the bold variables are the default
193192
if (colorVariants.bold) {
194193
cssVariableRules.push(
@@ -198,7 +197,7 @@ export const generateColorClasses = (theme: any): string => {
198197
`--ion-color-contrast-rgb: var(--ion-color-${colorName}-contrast-rgb, var(--ion-color-${colorName}-bold-contrast-rgb)) !important;`,
199198
`--ion-color-shade: var(--ion-color-${colorName}-shade, var(--ion-color-${colorName}-bold-shade)) !important;`,
200199
`--ion-color-tint: var(--ion-color-${colorName}-tint, var(--ion-color-${colorName}-bold-tint)) !important;`,
201-
`--ion-color-foreground: var(--ion-color-${colorName}, var(--ion-color-${colorName}-foreground, var(--ion-color-${colorName}-bold-foreground))) !important;`
200+
`--ion-color-foreground: var(--ion-color-${colorName}-foreground, var(--ion-color-${colorName}-bold-foreground)) !important;`
202201
);
203202
}
204203

0 commit comments

Comments
 (0)