Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
3192b29
feat(tokens): add gray colors
thetaPC Nov 19, 2025
0cc323a
refactor(tokens): remove comment
thetaPC Nov 19, 2025
d4a05e5
feat(tokens): add gray colors for dark
thetaPC Nov 19, 2025
444c56a
feat(action-sheet): replace stepped variables with gray
thetaPC Nov 19, 2025
0b4b461
refactor(action-sheet): revert disabled
thetaPC Nov 19, 2025
6c31996
feat(alert): use gray tokens
thetaPC Nov 20, 2025
15870a9
feat(card): use gray tokens
thetaPC Nov 20, 2025
3902e5d
feat(checkbox): use gray tokens
thetaPC Nov 20, 2025
db67416
feat(datetime): use gray tokens
thetaPC Nov 20, 2025
fc40c77
feat(core): update dark tokens
thetaPC Nov 21, 2025
9b0782c
feat(tokens): update md and add default primitives
thetaPC Nov 21, 2025
50998a3
feat(tokens): use gray on datetime
thetaPC Nov 22, 2025
44aa9e8
refactor(token): remove comments
thetaPC Nov 22, 2025
42a1ecd
chore(themes): update gray tokens
thetaPC Nov 26, 2025
e20c7c0
fix(dark): use correct hex order
thetaPC Nov 26, 2025
c0b9385
feat(breadcrumb): use gray tokens
thetaPC Nov 26, 2025
1ac2ba8
feat(datetime-button): use gray tokens
thetaPC Nov 26, 2025
fdefbe6
feat(ionic): use gray token for separator color
thetaPC Nov 26, 2025
10d1e63
feat(infinite-scroll-content): use gray token
thetaPC Nov 26, 2025
2637605
feat(input): use gray tokens
thetaPC Nov 26, 2025
73b9b4f
feat(input-otp): use gray tokens
thetaPC Nov 27, 2025
5e5e883
feat(item, item-divider, list-header): use gray tokens
thetaPC Nov 27, 2025
e979f0e
feat(label): use gray tokens
thetaPC Nov 27, 2025
9b2adaa
feat(loading): use gray tokens
thetaPC Nov 27, 2025
46dd76c
feat(modal): use gray tokens
thetaPC Dec 1, 2025
eda4918
feat(note): use gray tokens
thetaPC Dec 1, 2025
a4cabf8
feat(note): use gray tokens
thetaPC Dec 1, 2025
f330164
feat(picker): use gray tokens
thetaPC Dec 1, 2025
52b7eda
feat(popover): use gray tokens
thetaPC Dec 1, 2025
7a53b6d
feat(progress-bar): use gray tokens
thetaPC Dec 1, 2025
98df565
feat(radio-group): use gray tokens
thetaPC Dec 1, 2025
048a263
feat(range): use gray tokens
thetaPC Dec 1, 2025
c9cddad
feat(refresher): use gray tokens
thetaPC Dec 1, 2025
826a7e4
feat(searchbar): use gray tokens
thetaPC Dec 1, 2025
16a10dd
feat(segment-button): use gray tokens
thetaPC Dec 1, 2025
307afa1
feat(select): use gray tokens
thetaPC Dec 1, 2025
cedab14
feat(textarea): use gray tokens
thetaPC Dec 1, 2025
1fae450
feat(toast): use gray tokens
thetaPC Dec 1, 2025
6ea3c81
feat(toggle): use gray tokens
thetaPC Dec 1, 2025
5be9526
feat(ionic-swiper): use gray tokens
thetaPC Dec 1, 2025
e692469
refactor(angular): remove step tokens
thetaPC Dec 1, 2025
fb011cc
refactor(steps): update test page
thetaPC Dec 2, 2025
527af98
feat(many): use gray tokens
thetaPC Dec 2, 2025
8149f95
test(steps): revert removal
thetaPC Dec 2, 2025
a51ea42
Merge branch 'ionic-modular' of github.com:ionic-team/ionic-framework…
thetaPC Dec 2, 2025
10e091b
chore(steps): run lint
thetaPC Dec 2, 2025
16f91ab
feat(many): use text color tokens
thetaPC Dec 3, 2025
ec0bf01
chore(scripts): revert
thetaPC Dec 3, 2025
00448f6
docs(scripts): add todo
thetaPC Dec 3, 2025
c3345d1
test(alert): remove only
thetaPC Dec 3, 2025
10eac37
fix(alert): use correct variable
thetaPC Dec 3, 2025
70a1892
test(toast): remove only
thetaPC Dec 3, 2025
71fff87
refactor(datetime): cleaner Sass variable
thetaPC Dec 3, 2025
a884809
chore(toast): revert
thetaPC Dec 3, 2025
161b46a
feat(many): remove last bit of steps
thetaPC Dec 4, 2025
eb3c5a9
test(toast): skip high constrast for now
thetaPC Dec 4, 2025
383d24c
chore(many): run lint
thetaPC Dec 4, 2025
0ce2e76
test(theme): update tests
thetaPC Dec 4, 2025
4b149a9
fix(item): remove wrong var setup
thetaPC Dec 4, 2025
a193f0d
feat(light): add action sheet button bg selected fallback
thetaPC Dec 4, 2025
08e8349
feat(toolbar): use components variable
thetaPC Dec 4, 2025
b243e73
chore(toolbar): revert
thetaPC Dec 4, 2025
d1c5da7
fix(toolbar): use correct color for md
thetaPC Dec 4, 2025
c53560e
refactor(themes): clean up colors
thetaPC Dec 4, 2025
ee1d755
refactor(themes): remove colors usage before initiating
thetaPC Dec 4, 2025
5732df1
fix(toolbar): add bg for md light
thetaPC Dec 4, 2025
75da67f
fix(toolbar): use correct colors on activated buttons
thetaPC Dec 4, 2025
4652c37
test(set-content): use customTheme for palettes
thetaPC Dec 5, 2025
91d4483
refactor(many): use Sass variables again
thetaPC Dec 5, 2025
968782a
chore(thene): run lint
thetaPC Dec 5, 2025
f0ee0b3
docs(set-content): add comment
thetaPC Dec 5, 2025
86972ec
test(toolbar): remove only
thetaPC Dec 5, 2025
cecc2a8
test(toolbar): update screenshots
thetaPC Dec 5, 2025
a926cd5
fix(toolbar): use correct setup
thetaPC Dec 5, 2025
8af89c3
test(toolbar): remove only
thetaPC Dec 5, 2025
f0de6e0
fix(tab-bar): use correct colors
thetaPC Dec 5, 2025
0f4d7aa
test(tab-bar): update snapshots
thetaPC Dec 5, 2025
fc94a0a
fix(tab-bar): use PascalCase
thetaPC Dec 5, 2025
729566f
test(tab-bar): use container
thetaPC Dec 5, 2025
7db9e9c
test(tab-bar): lessen container padding
thetaPC Dec 5, 2025
4586638
test(modal, scripts): use config palette in scripts
thetaPC Dec 5, 2025
6fe4734
chore(): add updated snapshots
Ionitron Dec 6, 2025
cd4f3fd
chore(): add updated snapshots
Ionitron Dec 6, 2025
d299976
refactor(many): add back Sass variables
thetaPC Dec 6, 2025
b36d02d
Merge branch 'FW-6751' of github.com:ionic-team/ionic-framework into …
thetaPC Dec 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions core/scripts/testing/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,15 @@ const DEFAULT_THEME = 'md';
* Values can be `light`, `dark`, `high-contrast`,
* or `high-contrast-dark`. Default to `light` for tests.
*/
const paletteQuery = window.location.search.match(/palette=([a-z]+)/);
const paletteHash = window.location.hash.match(/palette=([a-z]+)/);
const configDarkMode = window.Ionic?.config?.customTheme?.palette?.dark?.enabled === 'always' ? 'dark' : null;
const configHighContrastMode = window.Ionic?.config?.customTheme?.palette?.highContrast?.enabled === 'always' ? 'high-contrast' : null;
const configHighContrastDarkMode = window.Ionic?.config?.customTheme?.palette?.highContrastDark?.enabled === 'always' ? 'high-contrast-dark' : null;
const configPalette = configDarkMode || configHighContrastMode || configHighContrastDarkMode;
const paletteQuery = window.location.search.match(/palette=([a-z-]+)/);
const paletteHash = window.location.hash.match(/palette=([a-z-]+)/);
const darkClass = document.body?.classList.contains('ion-palette-dark') ? 'dark' : null;

const paletteName = paletteQuery?.[1] || paletteHash?.[1] || darkClass || 'light';
const paletteName = configPalette || paletteQuery?.[1] || paletteHash?.[1] || darkClass || 'light';

// Load theme tokens if the theme is valid
const validThemes = ['ionic', 'ios', 'md'];
Expand All @@ -111,8 +115,15 @@ const DEFAULT_THEME = 'md';

// If a specific palette is requested, modify the palette structure
// to set the enabled property to 'always'
// TODO(FW-4004): Implement dark mode
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this so we can revisit this at the time of implementation. We might stick with this but still good to give it a second look.

if (paletteName === 'dark' && theme.palette?.dark) {
theme.palette.dark.enabled = 'always';
// TODO(FW-4005): Implement high contrast mode
} else if (paletteName === 'high-contrast' && theme.palette?.highContrast) {
theme.palette.highContrast.enabled = 'always';
// TODO(FW-4005): Implement high contrast dark mode
} else if (paletteName === 'high-contrast-dark' && theme.palette?.highContrastDark) {
theme.palette.highContrastDark.enabled = 'always';
}

// Apply the theme tokens to Ionic config
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/action-sheet/action-sheet.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--button-background-selected: #{$action-sheet-ios-button-background-selected};
--button-background-selected-opacity: 1;
--button-color: #{$action-sheet-ios-button-text-color};
--button-color-disabled: #{$text-color-step-150};
--button-color-disabled: var(--ion-color-text-850);
--color: #{$action-sheet-ios-title-color};

text-align: $action-sheet-ios-text-align;
Expand Down
7 changes: 2 additions & 5 deletions core/src/components/action-sheet/action-sheet.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $action-sheet-ios-title-padding-bottom: 13px;
$action-sheet-ios-title-padding-start: $action-sheet-ios-title-padding-end;

/// @prop - Color of the action sheet title
$action-sheet-ios-title-color: $text-color-step-600;
$action-sheet-ios-title-color: var(--ion-color-text-400);

/// @prop - Font size of the action sheet title
$action-sheet-ios-title-font-size: dynamic-font-min(1, 13px);
Expand Down Expand Up @@ -115,10 +115,7 @@ $action-sheet-ios-button-background: linear-gradient(
$action-sheet-ios-button-background-activated: $text-color;

/// @prop - Background color of the selected action sheet button
$action-sheet-ios-button-background-selected: var(
--ion-color-step-150,
var(--ion-background-color-step-150, $background-color)
);
$action-sheet-ios-button-background-selected: var(--ion-components-ion-action-sheet-button-bg-selected);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created a component variable here because the value changes based on palette. Light uses $background-color while the other palettes used --ion-background-color-step-150. Granted as long as --ion-color-step-150 wasn't provided. So the new theme structure has it where light has --ion-components-ion-action-sheet-button-bg-selected set to the background color and the other palettes are using the gray-150 variable.

The same reasoning is applied to any other component variables seen in the other files.


/// @prop - Destructive text color of the action sheet button
$action-sheet-ios-button-destructive-text-color: ion-color(danger, base);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ $action-sheet-md-sub-title-padding-start: $action-sheet-md-sub-title-padding-end
$action-sheet-md-button-height: 52px;

/// @prop - Text color of the action sheet button
$action-sheet-md-button-text-color: $text-color-step-150;
$action-sheet-md-button-text-color: var(--ion-color-text-850);

/// @prop - Font size of the action sheet button
$action-sheet-md-button-font-size: dynamic-font(16px);
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/alert/alert.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $alert-ios-title-font-weight: 600;
$alert-ios-sub-title-font-size: dynamic-font-min(1, 14px);

/// @prop - Text color of the alert sub title
$alert-ios-sub-title-text-color: $text-color-step-400;
$alert-ios-sub-title-text-color: var(--ion-color-text-600);

/// @prop - Padding top of the alert message
$alert-ios-message-padding-top: 0;
Expand Down Expand Up @@ -114,7 +114,7 @@ $alert-ios-input-padding-start: $alert-ios-input-padding-end;
$alert-ios-input-placeholder-color: $placeholder-text-color;

/// @prop - Border color of the alert input
$alert-ios-input-border-color: $background-color-step-250;
$alert-ios-input-border-color: var(--ion-color-gray-250);

/// @prop - Border of the alert input
$alert-ios-input-border: $hairlines-width solid $alert-ios-input-border-color;
Expand Down
12 changes: 6 additions & 6 deletions core/src/components/alert/alert.md.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ $alert-md-message-padding-start: $alert-md-message-padding-end;
$alert-md-message-font-size: dynamic-font(16px);

/// @prop - Text color of the alert message
$alert-md-message-text-color: $text-color-step-450;
$alert-md-message-text-color: var(--ion-color-text-550);

/// @prop - Padding top of the alert empty message
$alert-md-message-empty-padding-top: 0;
Expand All @@ -104,7 +104,7 @@ $alert-md-input-border-width: 1px;
$alert-md-input-border-style: solid;

/// @prop - Border color of the alert input
$alert-md-input-border-color: $background-color-step-150;
$alert-md-input-border-color: var(--ion-color-gray-150);

/// @prop - Text color of the alert input
$alert-md-input-text-color: $text-color;
Expand Down Expand Up @@ -209,7 +209,7 @@ $alert-md-radio-border-style: solid;
$alert-md-radio-border-radius: 50%;

/// @prop - Border color of the alert radio when off
$alert-md-radio-border-color-off: $background-color-step-550;
$alert-md-radio-border-color-off: var(--ion-color-gray-550);

/// @prop - Border color of the alert radio when on
$alert-md-radio-border-color-on: $alert-md-button-text-color;
Expand Down Expand Up @@ -254,7 +254,7 @@ $alert-md-radio-label-padding-start: $alert-md-radio-label-padding-end + 26px;
$alert-md-radio-label-font-size: dynamic-font(16px);

/// @prop - Text color of the label for the radio alert
$alert-md-radio-label-text-color: $text-color-step-150;
$alert-md-radio-label-text-color: var(--ion-color-text-850);

/// @prop - Text color of the label for the checked radio alert
$alert-md-radio-label-text-color-checked: $alert-md-radio-label-text-color;
Expand All @@ -281,7 +281,7 @@ $alert-md-checkbox-border-style: solid;
$alert-md-checkbox-border-radius: 2px;

/// @prop - Border color of the checkbox in the alert when off
$alert-md-checkbox-border-color-off: $background-color-step-550;
$alert-md-checkbox-border-color-off: var(--ion-color-gray-550);

/// @prop - Border color of the checkbox in the alert when on
$alert-md-checkbox-border-color-on: $alert-md-button-text-color;
Expand Down Expand Up @@ -323,7 +323,7 @@ $alert-md-checkbox-label-padding-bottom: $alert-md-checkbox-label-padding-top;
$alert-md-checkbox-label-padding-start: $alert-md-checkbox-label-padding-end + 27px;

/// @prop - Text color of the label for the checkbox in the alert
$alert-md-checkbox-label-text-color: $text-color-step-150;
$alert-md-checkbox-label-text-color: var(--ion-color-text-850);

/// @prop - Font size of the label for the checkbox in the alert
$alert-md-checkbox-label-font-size: dynamic-font(16px);
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/alert/alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@

.alert-button.ion-focused,
.alert-tappable.ion-focused {
background: $background-color-step-100;
background: var(--ion-color-gray-100);
}

.alert-button-inner {
Expand Down
17 changes: 7 additions & 10 deletions core/src/components/breadcrumb/breadcrumb.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,22 @@
// --------------------------------------------------

/// @prop - Color of the breadcrumb
$breadcrumb-ios-color: var(--ion-color-step-850, var(--ion-text-color-step-150, #2d4665));
$breadcrumb-ios-color: var(--ion-components-ion-breadcrumb-color);

/// @prop - Color of the active breadcrumb
$breadcrumb-ios-color-active: var(--ion-text-color, #03060b);

/// @prop - Background color of the focused breadcrumb
$breadcrumb-ios-background-focused: var(
--ion-color-step-50,
var(--ion-background-color-step-50, rgba(233, 237, 243, 0.7))
);
$breadcrumb-ios-background-focused: var(--ion-components-ion-breadcrumb-bg-focused);

/// @prop - Color of the breadcrumb icon
$breadcrumb-ios-icon-color: var(--ion-color-step-400, var(--ion-text-color-step-600, #92a0b3));
$breadcrumb-ios-icon-color: var(--ion-components-ion-breadcrumb-icon-color);

/// @prop - Color of the breadcrumb icon when active
$breadcrumb-ios-icon-color-active: var(--ion-color-step-850, var(--ion-text-color-step-150, #242d39));
$breadcrumb-ios-icon-color-active: var(--ion-components-ion-breadcrumb-icon-color-active);

/// @prop - Color of the breadcrumb icon when focused
$breadcrumb-ios-icon-color-focused: var(--ion-color-step-750, var(--ion-text-color-step-250, #445b78));
$breadcrumb-ios-icon-color-focused: var(--ion-components-ion-breadcrumb-icon-color-focused);

/// @prop - Color of the breadcrumb separator
$breadcrumb-ios-separator-color: $breadcrumb-separator-color;
Expand All @@ -31,7 +28,7 @@ $breadcrumb-ios-separator-color: $breadcrumb-separator-color;
$breadcrumb-ios-indicator-color: $breadcrumb-ios-separator-color;

/// @prop - Background color of the breadcrumb indicator
$breadcrumb-ios-indicator-background: var(--ion-color-step-100, var(--ion-background-color-step-100, #e9edf3));
$breadcrumb-ios-indicator-background: var(--ion-components-ion-breadcrumb-indicator-bg);

/// @prop - Background color of the breadcrumb indicator when focused
$breadcrumb-ios-indicator-background-focused: var(--ion-color-step-150, var(--ion-background-color-step-150, #d9e0ea));
$breadcrumb-ios-indicator-background-focused: var(--ion-components-ion-breadcrumb-indicator-bg-focused);
14 changes: 7 additions & 7 deletions core/src/components/breadcrumb/breadcrumb.md.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
// --------------------------------------------------

/// @prop - Color of the breadcrumb
$breadcrumb-md-color: var(--ion-color-step-600, var(--ion-text-color-step-400, #677483));
$breadcrumb-md-color: var(--ion-components-ion-breadcrumb-color);

/// @prop - Color of the active breadcrumb
$breadcrumb-md-color-active: var(--ion-text-color, #03060b);

/// @prop - Color of the focused breadcrumb
$breadcrumb-md-color-focused: var(--ion-color-step-800, var(--ion-text-color-step-200, #35404e));
$breadcrumb-md-color-focused: var(--ion-components-ion-breadcrumb-color-focused);

/// @prop - Background color of the focused breadcrumb
$breadcrumb-md-background-focused: var(--ion-color-step-50, var(--ion-background-color-step-50, #fff));
$breadcrumb-md-background-focused: var(--ion-components-ion-breadcrumb-bg-focused);

/// @prop - Color of the breadcrumb icon
$breadcrumb-md-icon-color: var(--ion-color-step-550, var(--ion-text-color-step-450, #7d8894));
$breadcrumb-md-icon-color: var(--ion-components-ion-breadcrumb-icon-color);

/// @prop - Color of the breadcrumb icon when active
$breadcrumb-md-icon-color-active: var(--ion-color-step-850, var(--ion-text-color-step-150, #222d3a));
$breadcrumb-md-icon-color-active: var(--ion-components-ion-breadcrumb-icon-color-active);

/// @prop - Margin top of the breadcrumb separator
$breadcrumb-md-separator-margin-top: -1px;
Expand All @@ -40,7 +40,7 @@ $breadcrumb-md-separator-color: $breadcrumb-separator-color;
$breadcrumb-md-indicator-color: $breadcrumb-md-separator-color;

/// @prop - Background color of the breadcrumb indicator
$breadcrumb-md-indicator-background: var(--ion-color-step-100, var(--ion-background-color-step-100, #eef1f3));
$breadcrumb-md-indicator-background: var(--ion-components-ion-breadcrumb-indicator-bg);

/// @prop - Background color of the breadcrumb indicator when focused
$breadcrumb-md-indicator-background-focused: var(--ion-color-step-150, var(--ion-background-color-step-150, #dfe5e8));
$breadcrumb-md-indicator-background-focused: var(--ion-components-ion-breadcrumb-indicator-bg-focused);
2 changes: 1 addition & 1 deletion core/src/components/breadcrumb/breadcrumb.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ $breadcrumb-baseline-font-size: 16px;
$breadcrumb-font-size: dynamic-font($breadcrumb-baseline-font-size);

/// @prop - Color of the breadcrumb separator
$breadcrumb-separator-color: var(--ion-color-step-550, var(--ion-text-color-step-450, #73849a));
$breadcrumb-separator-color: var(--ion-components-ion-breadcrumb-separator-color);
2 changes: 1 addition & 1 deletion core/src/components/button/button.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ ion-ripple-effect {

:host(.button-solid.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
background: #{var(--ion-toolbar-color, var(--background))};
color: #{var(--ion-toolbar-background, var(--color))};
color: #{var(--ion-toolbar-background, var(--ion-components-ion-toolbar-bg, (var(--color))))};
}

// Button Badge
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/button/button.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -291,5 +291,5 @@

:host(.button-outline.ion-activated.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
background: var(--ion-toolbar-color, var(--color));
color: #{var(--ion-toolbar-background, var(--background), ion-color(primary, contrast))};
color: var(--ion-components-ion-toolbar-activated-button-color);
}
2 changes: 2 additions & 0 deletions core/src/components/button/button.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,5 @@ $button-ios-clear-opacity-hover: 0.6;

/// @prop - Font weight of the strong button
$button-ios-strong-font-weight: 600;

$test: $item-ios-background;
2 changes: 1 addition & 1 deletion core/src/components/button/button.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,6 @@
// --------------------------------------------------

:host(.button-outline.ion-activated.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
background: var(--ion-toolbar-background, var(--color));
background: var(--ion-components-ion-toolbar-activated-bg);
color: #{var(--ion-toolbar-color, var(--background), ion-color(primary, contrast))};
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ $card-ios-subtitle-margin-bottom: 4px;
$card-ios-subtitle-margin-start: $card-ios-subtitle-margin-end;

/// @prop - Color of the card subtitle
$card-ios-subtitle-color: $text-color-step-400;
$card-ios-subtitle-color: var(--ion-color-text-600);
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ $card-md-subtitle-margin-bottom: 0;
$card-md-subtitle-margin-start: $card-md-subtitle-margin-end;

/// @prop - Color of the card subtitle
$card-md-subtitle-color: $text-color-step-450;
$card-md-subtitle-color: var(--ion-color-text-550);
2 changes: 1 addition & 1 deletion core/src/components/card-title/card-title.md.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ $card-md-title-margin-bottom: $card-md-title-margin-top;
$card-md-title-margin-start: $card-md-title-margin-end;

/// @prop - Color of the card title
$card-md-title-text-color: $text-color-step-150;
$card-md-title-text-color: var(--ion-color-text-850);
2 changes: 1 addition & 1 deletion core/src/components/checkbox/checkbox.native.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
}

.checkbox-bottom .helper-text {
color: $text-color-step-300;
color: var(--ion-color-text-700);
}

// Label Placement - Start
Expand Down
2 changes: 0 additions & 2 deletions core/src/components/checkbox/test/validation/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
font-size: 12px;
font-weight: normal;

color: var(--ion-color-step-600);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't being used.


margin-top: 10px;
margin-bottom: 5px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
}

:host button.ion-activated {
color: $text-color-step-400;
color: var(--ion-color-text-600);
}
2 changes: 1 addition & 1 deletion core/src/components/datetime-button/datetime-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

border: none;

background: var(--ion-color-step-300, var(--ion-background-color-step-300, #edeef0));
background: var(--ion-components-ion-datetime-button-bg);

color: $text-color;

Expand Down
10 changes: 5 additions & 5 deletions core/src/components/datetime/datetime.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:host {
--background: #{ion-color(light, base)};
--background-rgb: #{ion-color(light, base, null, true)};
--title-color: #{$text-color-step-400};
--title-color: var(--ion-color-text-600);
}

:host(.datetime-presentation-date-time:not(.datetime-prefer-wheel)),
Expand All @@ -22,7 +22,7 @@
:host .datetime-header {
@include padding($datetime-ios-padding, $datetime-ios-padding, $datetime-ios-padding, $datetime-ios-padding);

border-bottom: $datetime-ios-border-color;
border-bottom: $datetime-ios-border;

font-size: dynamic-font-max(14px, 1.6);
}
Expand Down Expand Up @@ -72,7 +72,7 @@
:host .calendar-days-of-week {
@include padding(0, $datetime-ios-padding * 0.5, 0, $datetime-ios-padding * 0.5);

color: $text-color-step-700;
color: var(--ion-color-text-300);

font-size: dynamic-font-max(12px, 1.6);

Expand Down Expand Up @@ -280,7 +280,7 @@
}

:host .calendar-day.calendar-day-adjacent-day {
color: $text-color-step-700;
color: var(--ion-color-text-300);
}

// Time / Header
Expand All @@ -305,7 +305,7 @@
$datetime-ios-padding * 0.5
);

border-top: $datetime-ios-border-color;
border-top: $datetime-ios-border;
}

:host .datetime-buttons ::slotted(ion-buttons),
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/datetime/datetime.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// iOS Datetime
// --------------------------------------------------

/// @prop - Border color for dividers between header and footer
$datetime-ios-border-color: 0.55px solid globals.$background-color-step-200;
/// @prop - Border for dividers between header and footer
$datetime-ios-border: 0.55px solid var(--ion-color-gray-200);

/// @prop - Padding for content
$datetime-ios-padding: 16px;
Expand Down
Loading
Loading