Skip to content

Commit a73ee18

Browse files
committed
Merge branch 'FW-6252' into FW-6252-button
2 parents 9d9bb79 + 75421d3 commit a73ee18

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

core/src/css/palettes/dark.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,63 @@ $colors: (
1717
contrast: #000,
1818
shade: get-color-shade($primary),
1919
tint: get-color-tint($primary),
20+
foreground: $primary,
2021
),
2122
secondary: (
2223
base: $secondary,
2324
contrast: #000,
2425
shade: get-color-shade($secondary),
2526
tint: get-color-tint($secondary),
27+
foreground: $secondary,
2628
),
2729
tertiary: (
2830
base: $tertiary,
2931
contrast: #000,
3032
shade: get-color-shade($tertiary),
3133
tint: get-color-tint($tertiary),
34+
foreground: $tertiary,
3235
),
3336
success: (
3437
base: $success,
3538
contrast: #000,
3639
shade: get-color-shade($success),
3740
tint: get-color-tint($success),
41+
foreground: $success,
3842
),
3943
warning: (
4044
base: $warning,
4145
contrast: #000,
4246
shade: get-color-shade($warning),
4347
tint: get-color-tint($warning),
48+
foreground: $warning,
4449
),
4550
danger: (
4651
base: $danger,
4752
contrast: #000,
4853
shade: get-color-shade($danger),
4954
tint: get-color-tint($danger),
55+
foreground: $danger,
5056
),
5157
light: (
5258
base: $light,
5359
contrast: #fff,
5460
shade: get-color-shade($light),
5561
tint: get-color-tint($light),
62+
foreground: $light,
5663
),
5764
medium: (
5865
base: $medium,
5966
contrast: #000,
6067
shade: get-color-shade($medium),
6168
tint: get-color-tint($medium),
69+
foreground: $medium,
6270
),
6371
dark: (
6472
base: $dark,
6573
contrast: #000,
6674
shade: get-color-shade($dark),
6775
tint: get-color-tint($dark),
76+
foreground: $dark,
6877
),
6978
);
7079

@@ -77,6 +86,7 @@ $colors: (
7786
--ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list(map.get($value, contrast))};
7887
--ion-color-#{$color-name}-shade: #{map.get($value, shade)};
7988
--ion-color-#{$color-name}-tint: #{map.get($value, tint)};
89+
--ion-color-#{$color-name}-foreground: #{map.get($value, foreground)};
8090
}
8191
}
8292
}

core/src/css/palettes/high-contrast-dark.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,63 @@ $colors: (
1717
contrast: #000,
1818
shade: get-color-shade($primary),
1919
tint: get-color-tint($primary),
20+
foreground: $primary,
2021
),
2122
secondary: (
2223
base: $secondary,
2324
contrast: #000,
2425
shade: get-color-shade($secondary),
2526
tint: get-color-tint($secondary),
27+
foreground: $secondary,
2628
),
2729
tertiary: (
2830
base: $tertiary,
2931
contrast: #000,
3032
shade: get-color-shade($tertiary),
3133
tint: get-color-tint($tertiary),
34+
foreground: $tertiary,
3235
),
3336
success: (
3437
base: $success,
3538
contrast: #000,
3639
shade: get-color-shade($success),
3740
tint: get-color-tint($success),
41+
foreground: $success,
3842
),
3943
warning: (
4044
base: $warning,
4145
contrast: #000,
4246
shade: get-color-shade($warning),
4347
tint: get-color-tint($warning),
48+
foreground: $warning,
4449
),
4550
danger: (
4651
base: $danger,
4752
contrast: #000,
4853
shade: get-color-shade($danger),
4954
tint: get-color-tint($danger),
55+
foreground: $danger,
5056
),
5157
light: (
5258
base: $light,
5359
contrast: #fff,
5460
shade: get-color-shade($light),
5561
tint: get-color-tint($light),
62+
foreground: $light,
5663
),
5764
medium: (
5865
base: $medium,
5966
contrast: #000,
6067
shade: get-color-shade($medium),
6168
tint: get-color-tint($medium),
69+
foreground: $medium,
6270
),
6371
dark: (
6472
base: $dark,
6573
contrast: #000,
6674
shade: get-color-shade($dark),
6775
tint: get-color-tint($dark),
76+
foreground: $dark,
6877
),
6978
);
7079

@@ -104,6 +113,7 @@ $lightest-text-color: $text-color;
104113
--ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list(map.get($value, contrast))};
105114
--ion-color-#{$color-name}-shade: #{map.get($value, shade)};
106115
--ion-color-#{$color-name}-tint: #{map.get($value, tint)};
116+
--ion-color-#{$color-name}-foreground: #{map.get($value, foreground)};
107117
}
108118
}
109119
}

core/src/css/palettes/high-contrast.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,63 @@ $colors: (
1717
contrast: #fff,
1818
shade: get-color-shade($primary),
1919
tint: get-color-tint($primary),
20+
foreground: $primary,
2021
),
2122
secondary: (
2223
base: $secondary,
2324
contrast: #fff,
2425
shade: get-color-shade($secondary),
2526
tint: get-color-tint($secondary),
27+
foreground: $secondary,
2628
),
2729
tertiary: (
2830
base: $tertiary,
2931
contrast: #fff,
3032
shade: get-color-shade($tertiary),
3133
tint: get-color-tint($tertiary),
34+
foreground: $tertiary,
3235
),
3336
success: (
3437
base: $success,
3538
contrast: #fff,
3639
shade: get-color-shade($success),
3740
tint: get-color-tint($success),
41+
foreground: $success,
3842
),
3943
warning: (
4044
base: $warning,
4145
contrast: #fff,
4246
shade: get-color-shade($warning),
4347
tint: get-color-tint($warning),
48+
foreground: $warning,
4449
),
4550
danger: (
4651
base: $danger,
4752
contrast: #fff,
4853
shade: get-color-shade($danger),
4954
tint: get-color-tint($danger),
55+
foreground: $danger,
5056
),
5157
light: (
5258
base: $light,
5359
contrast: #000,
5460
shade: get-color-shade($light),
5561
tint: get-color-tint($light),
62+
foreground: $light,
5663
),
5764
medium: (
5865
base: $medium,
5966
contrast: #fff,
6067
shade: get-color-shade($medium),
6168
tint: get-color-tint($medium),
69+
foreground: $medium,
6270
),
6371
dark: (
6472
base: $dark,
6573
contrast: #fff,
6674
shade: get-color-shade($dark),
6775
tint: get-color-tint($dark),
76+
foreground: $dark,
6877
),
6978
);
7079

@@ -127,6 +136,7 @@ $lightest-text-color: #888888;
127136
--ion-color-#{$color-name}-contrast-rgb: #{color-to-rgb-list(map.get($value, contrast))};
128137
--ion-color-#{$color-name}-shade: #{map.get($value, shade)};
129138
--ion-color-#{$color-name}-tint: #{map.get($value, tint)};
139+
--ion-color-#{$color-name}-foreground: #{map.get($value, foreground)};
130140
}
131141
}
132142
}

0 commit comments

Comments
 (0)