Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion core/src/components/buttons/buttons.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// --------------------------------------------------

::slotted(*) .button-clear {
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};
--background: transparent;
--background-activated: transparent;
--background-focused: transparent;
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/card-title/card-title.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// --------------------------------------------------

:host {
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};

@include globals.typography(globals.$ion-heading-h5-medium);
}
4 changes: 2 additions & 2 deletions core/src/components/card/card.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// --------------------------------------------------

:host {
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
--border-width: #{globals.$ion-border-size-025};
--border-color: #{globals.$ion-border-default};
--border-style: #{globals.$ion-border-style-solid};
--border-radius: #{globals.$ion-round-xl};
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};
min-width: globals.$ion-scale-2400;

border: var(--border-width) var(--border-style) var(--border-color);
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/checkbox/checkbox.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
--checkbox-background: #{globals.$ion-bg-input-default};
--checkbox-background-checked: #{globals.$ion-bg-primary-base-default};
--border-color-checked: #{globals.$ion-semantics-primary-base};
--checkmark-color: #{globals.$ion-primitives-base-white};
--checkmark-color: #{globals.$ion-bg-surface-default};
--transition: none;

z-index: 2;
Expand Down Expand Up @@ -60,7 +60,7 @@
}

.label-text-wrapper {
color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

:host(.in-item) .label-text-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/chip/chip.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@

:host(.chip-bold) {
--background: #{globals.$ion-bg-neutral-bold-default};
--color: #{globals.$ion-primitives-base-white};
--color: #{globals.$ion-bg-surface-default};
}

:host(.chip-outline.chip-bold) {
// TODO(FW-6450): this is a made up design choice based on a
// darker shade of the background color
border-color: globals.$ion-primitives-neutral-1200;
border-color: globals.$ion-text-default;
}

// Chip Colors
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/datetime/datetime.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @prop --focus-ring-color: The color of the ring around the focused element.
* @prop --focus-ring-width: The width of the ring around the focused element.
*/
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
--focus-ring-color: #{globals.$ion-border-focus-default};
--focus-ring-width: #{globals.$ion-border-radius-025};
}
Expand Down Expand Up @@ -140,7 +140,7 @@

height: globals.$ion-scale-1200;

color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

// Disabled Day
Expand Down Expand Up @@ -211,7 +211,7 @@
height: globals.$ion-scale-800;

background-color: globals.$ion-primitives-neutral-100;
color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

// Calendar / Footer / Action Buttons
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/datetime/test/custom/datetime.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
await expect(popover).toHaveScreenshot(screenshot(`datetime-custom-time-picker`));
await expect(timeButton).toHaveScreenshot(screenshot(`datetime-custom-time-button-active`));
});

test('should allow styling calendar days in grid style datetimes', async ({ page }) => {
// TODO (FW-6769): Enable test when its fixed
test.skip('should allow styling calendar days in grid style datetimes', async ({ page }) => {
const datetime = page.locator('#custom-calendar-days');

// Wait for calendar days to be rendered
Expand Down
6 changes: 4 additions & 2 deletions core/src/components/datetime/test/display/datetime.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ configs({ modes: ['ios', 'md', 'ionic-md'], directions: ['ltr'] }).forEach(({ ti
const datetime = page.locator('ion-datetime');
await expect(datetime).toHaveScreenshot(screenshot(`datetime-display-time-date`));
});
test('time should not have any visual regressions', async ({ page }) => {
// TODO (FW-6769): Enable test when its fixed
test.skip('time should not have any visual regressions', async ({ page }) => {
await page.setContent(
`
<ion-datetime value="2022-02-22T16:30:00" presentation="time"></ion-datetime>
Expand Down Expand Up @@ -84,7 +85,8 @@ configs({ modes: ['ios', 'md', 'ionic-md'], directions: ['ltr'] }).forEach(({ ti
const datetime = page.locator('ion-datetime');
await expect(datetime).toHaveScreenshot(screenshot(`datetime-display-cover-time-date`));
});
test('time should not have any visual regressions', async ({ page }) => {
// TODO (FW-6769): Enable test when its fixed
test.skip('time should not have any visual regressions', async ({ page }) => {
await page.setContent(
`
<ion-datetime size="cover" value="2022-02-22T16:30:00" presentation="time"></ion-datetime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ configs({ modes: ['ios', 'md', 'ionic-md'], directions: ['ltr'] }).forEach(({ ti
await expect(datetime).toHaveScreenshot(screenshot(`datetime-show-adjacent-days`));
});

test('should not have visual regressions with a custom styled calendar', async ({ page }) => {
// TODO (FW-6769): Enable test when its fixed
test.skip('should not have visual regressions with a custom styled calendar', async ({ page }) => {
await page.goto('/src/components/datetime/test/show-adjacent-days', config);
await page.locator('.datetime-ready').first().waitFor();
const datetime = page.locator('#custom-calendar-days');
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core/src/components/input/input.ionic.outline.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "../../themes/ionic/ionic.globals.scss" as globals;

:host(.input-fill-outline) {
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
--border-color: #{globals.$ion-primitives-neutral-500};
}
2 changes: 1 addition & 1 deletion core/src/components/input/input.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// --------------------------------------------------

:host {
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};
--border-width: #{globals.$ion-border-size-025};
--highlight-color-valid: #{globals.$ion-semantics-success-900};
--highlight-color-invalid: #{globals.$ion-border-danger-default};
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/item-options/item-options.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ion-item-options {
.item-options-ionic {
align-items: center;

background: #{globals.$ion-primitives-base-white};
background: #{globals.$ion-bg-surface-default};

gap: globals.$ion-space-100;
}
Expand Down
7 changes: 3 additions & 4 deletions core/src/components/item/item.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
// --------------------------------------------------

:host {
--background: #{globals.$ion-primitives-base-white};
--background-activated: #{globals.$ion-primitives-neutral-200};
--background: #{globals.$ion-bg-surface-default};
--background-activated: #{globals.$ion-bg-select-default};
--border-color: #{globals.$ion-primitives-neutral-300};
--border-style: #{globals.$ion-border-style-solid};
--border-width: #{0 0 globals.$ion-border-size-025 0};
--color: #{globals.$ion-primitives-neutral-1200};
--detail-icon-color: #{globals.$ion-primitives-neutral-800};
--color: #{globals.$ion-text-default};
--detail-icon-font-size: #{globals.$ion-scale-600};
--detail-icon-opacity: 1;
--min-height: #{globals.$ion-scale-1800};
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/list-header/list-header.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

:host {
--background: transparent;
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};

@include globals.typography(globals.$ion-body-md-medium);

Expand Down
6 changes: 3 additions & 3 deletions core/src/components/radio/radio.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

min-height: globals.$ion-scale-1200;

color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

// Radio Color
Expand Down Expand Up @@ -55,7 +55,7 @@
border-style: var(--border-style);
border-color: var(--color);

background-color: globals.$ion-primitives-base-white;
background-color: globals.$ion-bg-surface-default;
}

// Ionic Radio Inner Circle: Unchecked
Expand All @@ -67,7 +67,7 @@
width: calc(32% + var(--border-width));
height: calc(32% + var(--border-width));

background-color: globals.$ion-primitives-base-white;
background-color: globals.$ion-bg-surface-default;
}

// Ionic Radio Outer Circle: Checked
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/searchbar/searchbar.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--box-shadow: none;
--cancel-button-color: #{globals.$ion-primitives-neutral-800};
--clear-button-color: #{globals.$ion-primitives-neutral-1000};
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};
--icon-color: #{globals.$ion-icon-subtlest};
--placeholder-color: #{globals.$ion-text-subtlest};
--focus-ring-color: #{globals.$ion-border-focus-default};
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/segment/segment.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// --------------------------------------------------

:host {
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
}
4 changes: 2 additions & 2 deletions core/src/components/select/select.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// -------------------------------------------------

:host {
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
// TODO(ROU-10778, ROU-10875): Sync the color names to the design system of
// ios and md. This will allow us to have a single color map.
--border-color: #{globals.$ion-primitives-neutral-500};
Expand Down Expand Up @@ -162,7 +162,7 @@
*/
transition: opacity globals.$ion-transition-time-150 globals.$ion-transition-curve-expressive;

color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

:host(.select-label-placement-stacked) .native-wrapper,
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/textarea/textarea.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

:host {
--border-color: #{globals.$ion-primitives-neutral-500};
--color: #{globals.$ion-primitives-neutral-1200};
--color: #{globals.$ion-text-default};
--highlight-color-valid: #{globals.$ion-semantics-success-900};
--highlight-color-invalid: #{globals.$ion-semantics-danger-800};
--highlight-color-focused: #{globals.ion-color(primary, base)};
--placeholder-color: #{globals.$ion-primitives-neutral-800};
--placeholder-opacity: 1;
--background: #{globals.$ion-primitives-base-white};
--background: #{globals.$ion-bg-surface-default};
--padding-bottom: #{globals.$ion-space-200};

@include globals.typography(globals.$ion-body-md-regular);
Expand Down
8 changes: 4 additions & 4 deletions core/src/components/toggle/toggle.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
--border-radius: #{globals.$ion-border-radius-full};
--focus-ring-color: #{globals.$ion-border-focus-default};
--focus-ring-width: #{globals.$ion-border-size-050};
--handle-background: #{globals.$ion-primitives-base-white};
--handle-background-checked: #{globals.$ion-primitives-base-white};
--handle-background: #{globals.$ion-bg-surface-default};
--handle-background-checked: #{globals.$ion-bg-surface-default};
--handle-border-radius: #{globals.$ion-border-radius-full};
--handle-height: #{globals.$ion-scale-500};
--handle-max-height: #{globals.$ion-scale-500};
Expand Down Expand Up @@ -111,7 +111,7 @@
align-items: center;
justify-content: center;

color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

.toggle-inner .toggle-switch-icon {
Expand All @@ -137,7 +137,7 @@
* when the label sits at the start.
*/
@include globals.margin(null, globals.$ion-space-400, null, 0);
color: globals.$ion-primitives-neutral-1200;
color: globals.$ion-text-default;
}

// Toggle Label Placement - End
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/toolbar/toolbar.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// --------------------------------------------------

:host {
--background: #{globals.$ion-primitives-base-white};
--color: #{globals.$ion-primitives-neutral-1200};
--background: #{globals.$ion-bg-surface-default};
--color: #{globals.$ion-text-default};
--border-color: currentColor;
--padding-top: #{globals.$ion-space-200};
--padding-bottom: #{globals.$ion-space-200};
Expand Down
5 changes: 4 additions & 1 deletion core/src/css/ionic/core.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
@include globals.generate-color($color-name);
}
}

/* Default background color of all components to default background surface token */
--background: #{globals.$ion-bg-surface-default};
}

html {
Expand All @@ -24,7 +27,7 @@ html {

body {
background: var(--ion-background-color, #{globals.$ion-bg-body});
color: var(--ion-text-color);
color: var(--ion-text-color, #{globals.$ion-text-default});
}

body.backdrop-no-scroll {
Expand Down
4 changes: 2 additions & 2 deletions core/src/themes/ionic/ionic.theme.default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ $ionic-colors: (
// Ionic Tabs & Tab Bar
// --------------------------------------------------

$tabbar-ionic-background: var(--ion-tab-bar-background, globals.$ion-primitives-base-white);
$tabbar-ionic-background-activated: var(--ion-tab-bar-background-activated, globals.$ion-primitives-neutral-100);
$tabbar-ionic-background: var(--ion-tab-bar-background, globals.$ion-bg-surface-default);
$tabbar-ionic-background-activated: var(--ion-tab-bar-background-activated, globals.$ion-bg-select-default);
$tabbar-ionic-background-focused: var(--ion-tab-bar-background-focused, transparent);
$tabbar-ionic-color: var(--ion-tab-bar-color, globals.$ion-primitives-neutral-800);
$tabbar-ionic-color-selected: var(--ion-tab-bar-color-selected, globals.$ion-text-primary);
Expand Down
Loading