Skip to content

Commit 62bd13b

Browse files
committed
fix(toolbar): wp get title/button color from the contrast of toolbar background
BREAKING CHANGES: `$bar-button-wp-color` was renamed to `$toolbar-wp-button-color` `$bar-button-wp-border-radius` was renamed to `$toolbar-wp-button-border-radius` Added `$toolbar-wp-title-text-color` for better control of the title color Removed `$toolbar-wp-button-color` from the default themes references #6364
1 parent d12efea commit 62bd13b

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

ionic/components/toolbar/toolbar.wp.scss

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ $toolbar-wp-title-padding: 0 6px !default;
2222
$toolbar-wp-title-font-size: 1.5rem !default;
2323
$toolbar-wp-title-font-weight: bold !default;
2424
$toolbar-wp-title-text-transform: uppercase !default;
25+
$toolbar-wp-title-text-color: color-contrast($colors-wp, $toolbar-wp-background) !default;
26+
2527
$toolbar-wp-button-font-size: 1.4rem !default;
26-
$navbar-wp-height: $toolbar-wp-height !default;
28+
$toolbar-wp-button-color: color-contrast($colors-wp, $toolbar-wp-background) !default;
29+
$toolbar-wp-button-border-radius: 2px !default;
2730

28-
$bar-button-wp-color: $toolbar-wp-button-color !default;
29-
$bar-button-wp-border-radius: 2px !default;
31+
$navbar-wp-height: $toolbar-wp-height !default;
3032

3133

3234
.toolbar {
@@ -66,7 +68,7 @@ ion-navbar-section {
6668
font-size: $toolbar-wp-title-font-size;
6769
font-weight: $toolbar-wp-title-font-weight;
6870
text-transform: $toolbar-wp-title-text-transform;
69-
color: $toolbar-wp-text-color;
71+
color: $toolbar-wp-title-text-color;
7072
}
7173

7274
@mixin wp-toolbar-theme($color-name, $color-base, $color-contrast) {
@@ -146,7 +148,7 @@ ion-buttons[right] {
146148
height: 32px;
147149

148150
border: 0;
149-
border-radius: $bar-button-wp-border-radius;
151+
border-radius: $toolbar-wp-button-border-radius;
150152
font-size: $toolbar-wp-button-font-size;
151153
font-weight: 500;
152154
text-transform: uppercase;
@@ -178,17 +180,17 @@ ion-buttons[right] {
178180
.bar-button-outline {
179181
border-width: 1px;
180182
border-style: solid;
181-
border-color: $bar-button-wp-color;
182-
color: $bar-button-wp-color;
183+
border-color: $toolbar-wp-button-color;
184+
color: $toolbar-wp-button-color;
183185
background-color: transparent;
184186

185187
&:hover:not(.disable-hover) {
186188
opacity: .4;
187189
}
188190

189191
&.activated {
190-
color: color-contrast($colors-wp, $bar-button-wp-color);
191-
background-color: $bar-button-wp-color;
192+
color: color-contrast($colors-wp, $toolbar-wp-button-color);
193+
background-color: $toolbar-wp-button-color;
192194
}
193195
}
194196

@@ -213,16 +215,16 @@ ion-buttons[right] {
213215
// --------------------------------------------------
214216

215217
.bar-button-solid {
216-
color: color-contrast($colors-wp, $bar-button-wp-color);
217-
background-color: $bar-button-wp-color;
218+
color: color-contrast($colors-wp, $toolbar-wp-button-color);
219+
background-color: $toolbar-wp-button-color;
218220

219221
&:hover:not(.disable-hover) {
220-
color: color-contrast($colors-wp, $bar-button-wp-color);
222+
color: color-contrast($colors-wp, $toolbar-wp-button-color);
221223
}
222224

223225
&.activated {
224-
color: color-contrast($colors-wp, $bar-button-wp-color);
225-
background-color: color-shade($bar-button-wp-color);
226+
color: color-contrast($colors-wp, $toolbar-wp-button-color);
227+
background-color: color-shade($toolbar-wp-button-color);
226228
}
227229
}
228230

@@ -330,7 +332,7 @@ ion-buttons[right] {
330332
// Windows Toolbar Color Generation
331333
// --------------------------------------------------
332334

333-
@include wp-bar-button-default(default, $bar-button-wp-color, color-contrast($colors-wp, $bar-button-wp-color));
335+
@include wp-bar-button-default(default, $toolbar-wp-button-color, color-contrast($colors-wp, $toolbar-wp-button-color));
334336

335337
@each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
336338
@include wp-toolbar-theme($color-name, $color-base, $color-contrast);

ionic/themes/dark.wp.scss

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

3332
// Windows Card
3433
// --------------------------------------------------

ionic/themes/default.wp.scss

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

2928

3029
// Windows List

0 commit comments

Comments
 (0)