Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 83829a7

Browse files
devversionThomasBurleson
authored andcommitted
fix(toolbar): apply accent color to ripple and icons in toolbar.
The toolbar won't apply the accent colors to the ripple and the md-icon. Fixes #5341. Closes #5811. #breaking
1 parent 9b9e4a5 commit 83829a7

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

src/components/toolbar/toolbar-theme.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,23 @@ md-toolbar.md-THEME_NAME-theme:not(.md-menu-toolbar) {
44

55
md-icon {
66
color: '{{primary-contrast}}';
7+
fill: '{{primary-contrast}}';
78
}
89

910
&.md-accent {
1011
background-color: '{{accent-color}}';
1112
color: '{{accent-contrast}}';
13+
14+
.md-ink-ripple {
15+
color: '{{accent-contrast}}';
16+
}
17+
18+
md-icon {
19+
color: '{{accent-contrast}}';
20+
fill: '{{accent-contrast}}';
21+
}
1222
}
23+
1324
&.md-warn {
1425
background-color: '{{warn-color}}';
1526
color: '{{warn-contrast}}';

src/components/toolbar/toolbar.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ md-toolbar {
3030
min-height: $baseline-grid * 8;
3131
width: 100%;
3232

33+
transition: $swift-ease-in-out;
34+
transition-property: background-color, fill, color;
35+
3336
&.md-whiteframe-z1-add, &.md-whiteframe-z1-remove {
3437
transition: box-shadow $swift-ease-in-out-duration linear;
3538
}
@@ -111,6 +114,11 @@ md-toolbar {
111114
.md-button {
112115
margin-top: 0;
113116
margin-bottom: 0;
117+
118+
&, &.md-icon-button md-icon {
119+
transition: $swift-ease-in-out;
120+
transition-property: background-color, fill, color;
121+
}
114122
}
115123
&> .md-button:first-child {
116124
margin-left: $icon-button-margin-offset;

0 commit comments

Comments
 (0)