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

Commit

Permalink
fix(toolbar): apply accent color to ripple and icons in toolbar.
Browse files Browse the repository at this point in the history
The toolbar won't apply the accent colors to the ripple and the md-icon.

Fixes #5341. Closes #5811.

  #breaking
  • Loading branch information
devversion authored and ThomasBurleson committed Feb 4, 2016
1 parent 9b9e4a5 commit 83829a7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
11 changes: 11 additions & 0 deletions src/components/toolbar/toolbar-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,23 @@ md-toolbar.md-THEME_NAME-theme:not(.md-menu-toolbar) {

md-icon {
color: '{{primary-contrast}}';
fill: '{{primary-contrast}}';
}

&.md-accent {
background-color: '{{accent-color}}';
color: '{{accent-contrast}}';

.md-ink-ripple {
color: '{{accent-contrast}}';
}

md-icon {
color: '{{accent-contrast}}';
fill: '{{accent-contrast}}';
}
}

&.md-warn {
background-color: '{{warn-color}}';
color: '{{warn-contrast}}';
Expand Down
8 changes: 8 additions & 0 deletions src/components/toolbar/toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ md-toolbar {
min-height: $baseline-grid * 8;
width: 100%;

transition: $swift-ease-in-out;
transition-property: background-color, fill, color;

&.md-whiteframe-z1-add, &.md-whiteframe-z1-remove {
transition: box-shadow $swift-ease-in-out-duration linear;
}
Expand Down Expand Up @@ -111,6 +114,11 @@ md-toolbar {
.md-button {
margin-top: 0;
margin-bottom: 0;

&, &.md-icon-button md-icon {
transition: $swift-ease-in-out;
transition-property: background-color, fill, color;
}
}
&> .md-button:first-child {
margin-left: $icon-button-margin-offset;
Expand Down

0 comments on commit 83829a7

Please sign in to comment.