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

Commit 0690e1b

Browse files
topherfangioThomasBurleson
authored andcommitted
fix(toolbar button): Fix color of raised buttons.
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.
1 parent ce2f28d commit 0690e1b

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

src/components/toolbar/demoBasicUsage/index.html

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
<md-content>
55

6+
<br>
7+
68
<md-toolbar>
79
<div class="md-toolbar-tools">
810
<md-button class="md-icon-button" aria-label="Settings">
@@ -23,6 +25,26 @@ <h2>
2325

2426
<br>
2527

28+
<md-toolbar>
29+
<div class="md-toolbar-tools">
30+
<md-button aria-label="Go Back">
31+
Go Back
32+
</md-button>
33+
<h2>
34+
<span>Toolbar with Standard Buttons</span>
35+
</h2>
36+
<span flex></span>
37+
<md-button class="md-raised" aria-label="Learn More">
38+
Learn More
39+
</md-button>
40+
<md-button class="md-fab md-mini" aria-label="Favorite">
41+
<md-icon md-svg-icon="img/icons/favorite.svg"></md-icon>
42+
</md-button>
43+
</div>
44+
</md-toolbar>
45+
46+
<br>
47+
2648
<md-toolbar class="md-tall md-accent">
2749
<h2 class="md-toolbar-tools">
2850
<span>Toolbar: tall (md-accent)</span>

src/components/toolbar/toolbar-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ md-toolbar.md-THEME_NAME-theme:not(.md-menu-toolbar) {
66
color: '{{primary-contrast}}';
77
}
88

9-
.md-button {
9+
.md-button:not(.md-raised) {
1010
color: '{{primary-contrast}}';
1111
}
1212

0 commit comments

Comments
 (0)