Skip to content

Commit a926cd5

Browse files
committed
fix(toolbar): use correct setup
1 parent cecc2a8 commit a926cd5

16 files changed

+8
-13
lines changed

core/src/components/button/button.common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ ion-ripple-effect {
293293

294294
:host(.button-solid.in-toolbar:not(.ion-color):not(.in-toolbar-color)) .button-native {
295295
background: #{var(--ion-toolbar-color, var(--background))};
296-
color: #{var(--ion-components-ion-toolbar-bg, (var(--color)))};
296+
color: #{var(--ion-toolbar-background, var(--ion-components-ion-toolbar-bg, (var(--color))))};
297297
}
298298

299299
// Button Badge

core/src/components/toolbar/test/basic/toolbar.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ configs({ modes: ['ios', 'md', 'ionic-md'], palettes: ['light', 'dark'] }).forEa
8686
await expect(header).toHaveScreenshot(screenshot(`toolbar-basic-icon-buttons`));
8787
});
8888

89-
test('should not have visual regressions with buttons with icons and text', async ({ page, skip }) => {
89+
test.only('should not have visual regressions with buttons with icons and text', async ({ page, skip }) => {
9090
skip.browser('webkit', 'Safari does not consistently render overflowing text in a toolbar with icons and text.');
9191

9292
await page.setContent(
Loading
Loading
Loading
Loading
-1.88 KB
Loading
-1.86 KB
Loading

core/src/themes/ios/default.tokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const defaultTheme: DefaultTheme = {
123123
},
124124
IonToolbar: {
125125
activatedButtonColor: 'var(--ion-toolbar-background, var(--background), ion-color(primary, contrast))',
126-
bg: 'var(--ion-toolbar-background, var(--ion-color-gray-50))',
126+
bg: 'var(--ion-color-gray-50)',
127127
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, var(--ion-color-gray-150)))',
128128
},
129129
},

core/src/themes/ios/light.tokens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const lightTheme: LightTheme = {
5151
borderColor: 'var(--ion-tab-bar-border-color, var(--ion-border-color, rgba(0, 0, 0, 0.2)))',
5252
},
5353
IonToolbar: {
54-
bg: 'var(--ion-toolbar-background, #f7f7f7)',
54+
bg: '#f7f7f7',
5555
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, rgba(0, 0, 0, 0.2)))',
5656
},
5757
},

0 commit comments

Comments
 (0)