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

Commit

Permalink
fix(toolbar button): Fix color of raised buttons.
Browse files Browse the repository at this point in the history
Raised buttons inside of a toolbar had the incorrect text color
applied. Fix styles to not apply special toolbar styling to raised buttons.

Fixes #4845. Closes #5562.
  • Loading branch information
topherfangio authored and ThomasBurleson committed Nov 5, 2015
1 parent ce2f28d commit 0690e1b
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
22 changes: 22 additions & 0 deletions src/components/toolbar/demoBasicUsage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

<md-content>

<br>

<md-toolbar>
<div class="md-toolbar-tools">
<md-button class="md-icon-button" aria-label="Settings">
Expand All @@ -23,6 +25,26 @@ <h2>

<br>

<md-toolbar>
<div class="md-toolbar-tools">
<md-button aria-label="Go Back">
Go Back
</md-button>
<h2>
<span>Toolbar with Standard Buttons</span>
</h2>
<span flex></span>
<md-button class="md-raised" aria-label="Learn More">
Learn More
</md-button>
<md-button class="md-fab md-mini" aria-label="Favorite">
<md-icon md-svg-icon="img/icons/favorite.svg"></md-icon>
</md-button>
</div>
</md-toolbar>

<br>

<md-toolbar class="md-tall md-accent">
<h2 class="md-toolbar-tools">
<span>Toolbar: tall (md-accent)</span>
Expand Down
2 changes: 1 addition & 1 deletion src/components/toolbar/toolbar-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ md-toolbar.md-THEME_NAME-theme:not(.md-menu-toolbar) {
color: '{{primary-contrast}}';
}

.md-button {
.md-button:not(.md-raised) {
color: '{{primary-contrast}}';
}

Expand Down

0 comments on commit 0690e1b

Please sign in to comment.