From 786221d9fa56fb42da9df74cabae94f393c7003b Mon Sep 17 00:00:00 2001
From: Topher Fangio <topher@profoundry.us>
Date: Wed, 4 Nov 2015 15:42:35 -0700
Subject: [PATCH] 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.
---
 .../toolbar/demoBasicUsage/index.html         | 22 +++++++++++++++++++
 src/components/toolbar/toolbar-theme.scss     |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/toolbar/demoBasicUsage/index.html b/src/components/toolbar/demoBasicUsage/index.html
index 4926e2d2b36..60778fdc353 100644
--- a/src/components/toolbar/demoBasicUsage/index.html
+++ b/src/components/toolbar/demoBasicUsage/index.html
@@ -3,6 +3,8 @@
 
   <md-content>
 
+    <br>
+
     <md-toolbar>
       <div class="md-toolbar-tools">
         <md-button class="md-icon-button" aria-label="Settings">
@@ -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>
diff --git a/src/components/toolbar/toolbar-theme.scss b/src/components/toolbar/toolbar-theme.scss
index 746f136dab4..cf9ca5cf879 100644
--- a/src/components/toolbar/toolbar-theme.scss
+++ b/src/components/toolbar/toolbar-theme.scss
@@ -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}}';
   }