Skip to content

Commit f0de6e0

Browse files
committed
fix(tab-bar): use correct colors
1 parent 8af89c3 commit f0de6e0

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

core/src/components/tab-bar/tab-bar.ios.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// default color / background
99
--background: var(--ion-components-ion-tabbar-bg);
1010
--background-focused: #{$tabbar-ios-background-focused};
11-
--border: #{$hairlines-width solid var(--ion-components-ion-tabbar-border-color)};
11+
--border: #{$hairlines-width solid (var(--ion-tab-bar-border-color, var(--ion-components-ion-tab-bar-border-color)))};
1212
--color: #{$tab-button-ios-text-color};
1313
--color-selected: #{$tabbar-ios-color-selected};
1414

core/src/components/tab-bar/tab-bar.md.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// default color / background
77
--background: #{$tabbar-md-background};
88
--background-focused: #{$tabbar-md-background-focused};
9-
--border: #{1px solid var(--ion-components-ion-tabbar-border-color)};
9+
--border: #{1px solid (var(--ion-tab-bar-border-color, var(--ion-components-ion-tab-bar-border-color)))};
1010
--color: #{$tab-button-md-text-color};
1111
--color-selected: #{$tabbar-md-color-selected};
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ export const defaultTheme: DefaultTheme = {
119119
},
120120
IonTabbar: {
121121
bg: 'var(--ion-tab-bar-background-color, var(--ion-color-gray-50))',
122-
borderColor: 'var(--ion-tab-bar-border-color, var(--ion-border-color, var(--ion-color-gray-150)))',
122+
borderColor: 'var(--ion-border-color, var(--ion-color-gray-150))',
123123
},
124124
IonToolbar: {
125125
activatedButtonColor: 'var(--ion-toolbar-background, var(--background), ion-color(primary, contrast))',
126126
bg: 'var(--ion-color-gray-50)',
127-
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, var(--ion-color-gray-150)))',
127+
borderColor: 'var(--ion-border-color, var(--ion-color-gray-150))',
128128
},
129129
},
130130
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ export const lightTheme: LightTheme = {
4848
},
4949
IonTabbar: {
5050
bg: 'var(--ion-tab-bar-background-color, #f7f7f7)',
51-
borderColor: 'var(--ion-tab-bar-border-color, var(--ion-border-color, rgba(0, 0, 0, 0.2)))',
51+
borderColor: 'var(--ion-border-color, rgba(0, 0, 0, 0.2))',
5252
},
5353
IonToolbar: {
5454
bg: '#f7f7f7',
55-
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, rgba(0, 0, 0, 0.2)))',
55+
borderColor: 'var(--ion-border-color, rgba(0, 0, 0, 0.2))',
5656
},
5757
},
5858
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ export const defaultTheme: DefaultTheme = {
110110
nativeSpinnerBg: 'var(--ion-color-gray-250)', // Available only in md
111111
},
112112
IonTabBar: {
113-
borderColor: 'var(--ion-tab-bar-border-color, var(--ion-border-color, var(--ion-color-gray-150)))',
113+
borderColor: 'var(--ion-border-color, var(--ion-color-gray-150))',
114114
},
115115
IonToolbar: {
116116
activatedButtonBg: 'var(--ion-toolbar-background, var(--color))',
117117
bg: '#1f1f1f',
118-
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, var(--ion-color-gray-150)))',
118+
borderColor: 'var(--ion-border-color, var(--ion-color-gray-150))',
119119
},
120120
},
121121
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ export const lightTheme: LightTheme = {
2828
nativeSpinnerBg: defaultColors.white, // Available only in md
2929
},
3030
IonTabBar: {
31-
borderColor: 'var(--ion-tab-bar-border-color, var(--ion-border-color, rgba(0, 0, 0, 0.07)))',
31+
borderColor: 'var(--ion-border-color, rgba(0, 0, 0, 0.07))',
3232
},
3333
IonToolbar: {
3434
bg: `var(--ion-background-color, ${defaultColors.white})`,
35-
borderColor: 'var(--ion-toolbar-border-color, var(--ion-border-color, #c1c4cd))',
35+
borderColor: 'var(--ion-border-color, #c1c4cd)',
3636
},
3737
},
3838
};

core/src/themes/native/native.theme.default.ios.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $tabbar-ios-color-selected: var(--ion-tab-bar-color-selected, ion-color(primary,
1717
// iOS Toolbar
1818
// --------------------------------------------------
1919
$toolbar-ios-background: var(--ion-toolbar-background, var(--ion-components-ion-toolbar-bg));
20-
$toolbar-ios-border-color: var(--ion-components-ion-toolbar-border-color);
20+
$toolbar-ios-border-color: var(--ion-toolbar-border-color, var(--ion-components-ion-toolbar-border-color));
2121
$toolbar-ios-color: var(--ion-toolbar-color, $text-color);
2222

2323
// iOS List & List Items

core/src/themes/native/native.theme.default.md.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $tabbar-md-color-selected: var(--ion-tab-bar-color-selected, ion-color(primary,
1919
// Material Design Toolbar
2020
// --------------------------------------------------
2121
$toolbar-md-background: var(--ion-toolbar-background, var(--ion-components-ion-toolbar-bg));
22-
$toolbar-md-border-color: var(--ion-components-ion-toolbar-border-color);
22+
$toolbar-md-border-color: var(--ion-tab-bar-border-color, var(--ion-components-ion-toolbar-border-color));
2323
$toolbar-md-color: var(--ion-toolbar-color, var(--ion-text-color, #424242));
2424

2525
// Material Design List & List Items

0 commit comments

Comments
 (0)