Skip to content

Commit 9f54f16

Browse files
committed
fix(toolbar): md mode use the color contrast for toolbar button/title
BREAKING CHANGES: `$toolbar-md-button-color` no longer gets passed to the function that sets the contrast color for toolbar buttons, but it can still be used to set the default button color. `$bar-button-md-color` was renamed to `$toolbar-md-button-color` `$bar-button-md-border-radius` was renamed to `$toolbar-md-button-border-radius` references #6364
1 parent 132d8e9 commit 9f54f16

File tree

5 files changed

+40
-18
lines changed

5 files changed

+40
-18
lines changed

ionic/components/toolbar/test/colors/main.html

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@
44
</ion-toolbar>
55

66

7+
<ion-toolbar>
8+
<button menuToggle>
9+
<ion-icon name="menu"></ion-icon>
10+
</button>
11+
<ion-buttons start>
12+
<button>
13+
<ion-icon ios="contact"></ion-icon>
14+
</button>
15+
<button>
16+
<ion-icon name="search"></ion-icon>
17+
</button>
18+
</ion-buttons>
19+
<ion-buttons end>
20+
<button secondary>
21+
<ion-icon name="more"></ion-icon>
22+
</button>
23+
</ion-buttons>
24+
<ion-title>Default</ion-title>
25+
</ion-toolbar>
26+
27+
728
<ion-toolbar primary>
829
<ion-buttons start>
930
<button>

ionic/components/toolbar/toolbar.md.scss

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ $toolbar-order-md: (
1919
$toolbar-md-padding: 4px !default;
2020
$toolbar-md-height: 5.6rem !default;
2121
$toolbar-md-title-font-size: 2rem !default;
22+
$toolbar-md-title-text-color: color-contrast($colors-md, $toolbar-md-background, true) !default;
23+
2224
$toolbar-md-button-font-size: 1.4rem !default;
23-
$navbar-md-height: $toolbar-md-height !default;
2425

25-
$bar-button-md-color: $toolbar-md-button-color !default;
26-
$bar-button-md-border-radius: 2px !default;
26+
$toolbar-md-button-color: $toolbar-md-title-text-color !default;
27+
$toolbar-md-button-border-radius: 2px !default;
28+
29+
$navbar-md-height: $toolbar-md-height !default;
2730

2831

2932
.toolbar {
@@ -62,7 +65,7 @@ ion-navbar-section {
6265

6366
font-size: $toolbar-md-title-font-size;
6467
font-weight: 500;
65-
color: $toolbar-md-text-color;
68+
color: $toolbar-md-title-text-color;
6669
}
6770

6871
@mixin md-toolbar-theme($color-name, $color-base, $color-contrast) {
@@ -142,7 +145,7 @@ ion-buttons[right] {
142145
height: 32px;
143146

144147
border: 0;
145-
border-radius: $bar-button-md-border-radius;
148+
border-radius: $toolbar-md-button-border-radius;
146149
font-size: $toolbar-md-button-font-size;
147150
font-weight: 500;
148151
text-transform: uppercase;
@@ -174,17 +177,17 @@ ion-buttons[right] {
174177
.bar-button-outline {
175178
border-width: 1px;
176179
border-style: solid;
177-
border-color: $bar-button-md-color;
178-
color: $bar-button-md-color;
180+
border-color: $toolbar-md-button-color;
181+
color: $toolbar-md-button-color;
179182
background-color: transparent;
180183

181184
&:hover:not(.disable-hover) {
182185
opacity: .4;
183186
}
184187

185188
&.activated {
186-
color: color-contrast($colors-md, $bar-button-md-color);
187-
background-color: $bar-button-md-color;
189+
color: color-contrast($colors-md, $toolbar-md-button-color, true);
190+
background-color: $toolbar-md-button-color;
188191
}
189192
}
190193

@@ -209,16 +212,16 @@ ion-buttons[right] {
209212
// --------------------------------------------------
210213

211214
.bar-button-solid {
212-
color: color-contrast($colors-md, $bar-button-md-color);
213-
background-color: $bar-button-md-color;
215+
color: color-contrast($colors-md, $toolbar-md-button-color, true);
216+
background-color: $toolbar-md-button-color;
214217

215218
&:hover:not(.disable-hover) {
216-
color: color-contrast($colors-md, $bar-button-md-color);
219+
color: color-contrast($colors-md, $toolbar-md-button-color, true);
217220
}
218221

219222
&.activated {
220-
color: color-contrast($colors-md, $bar-button-md-color);
221-
background-color: color-shade($bar-button-md-color);
223+
color: color-contrast($colors-md, $toolbar-md-button-color, true);
224+
background-color: color-shade($toolbar-md-button-color);
222225
}
223226
}
224227

@@ -326,7 +329,7 @@ ion-buttons[right] {
326329
// Material Design Toolbar Color Generation
327330
// --------------------------------------------------
328331

329-
@include md-bar-button-default(default, $bar-button-md-color, color-contrast($colors-md, $bar-button-md-color));
332+
@include md-bar-button-default(default, $toolbar-md-button-color, color-contrast($colors-md, $toolbar-md-button-color, true));
330333

331334
@each $color-name, $color-base, $color-contrast in get-colors($colors-md) {
332335
@include md-toolbar-theme($color-name, $color-base, $color-contrast);

ionic/themes/dark.md.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $toolbar-md-border-color: $toolbar-border-color !default;
2828
$toolbar-md-text-color: #fff !default;
2929
$toolbar-md-active-color: $toolbar-active-color !default;
3030
$toolbar-md-inactive-color: $toolbar-inactive-color !default;
31-
$toolbar-md-button-color: #424242 !default;
3231

3332
// Material Design Card
3433
// --------------------------------------------------

ionic/themes/default.md.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ $toolbar-md-border-color: $toolbar-border-color !default;
2424
$toolbar-md-text-color: #424242 !default;
2525
$toolbar-md-active-color: $toolbar-active-color !default;
2626
$toolbar-md-inactive-color: $toolbar-inactive-color !default;
27-
$toolbar-md-button-color: #424242 !default;
2827

2928

3029
// Material Design List

ionic/util/functions.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
@function toolbar-button-inverse($color-value) {
32-
@return color-inverse($color-value, $dark: $toolbar-md-button-color, $light: #fff);
32+
@return color-inverse($color-value, $dark: #424242, $light: #fff);
3333
}
3434

3535

0 commit comments

Comments
 (0)