From 7f88e42340db099925acbbc9d6df8c80ec4af88e Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Fri, 21 Oct 2016 15:32:24 -0700
Subject: [PATCH 1/3] Set vertical alignment for md-button and md-raised-button
 so md-icon inside is correctly aligned

---
 src/demo-app/button/button-demo.html | 12 ++++++++++++
 src/lib/button/button.html           |  2 +-
 src/lib/button/button.scss           |  6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/demo-app/button/button-demo.html b/src/demo-app/button/button-demo.html
index e8d9b17ae78e..5fb68da3df3c 100644
--- a/src/demo-app/button/button-demo.html
+++ b/src/demo-app/button/button-demo.html
@@ -89,4 +89,16 @@
     <a href="http://www.google.com" md-raised-button color="primary">SEARCH</a>
     <button md-raised-button>DANCE</button>
   </section>
+  <section>
+    <button md-raised-button>More<md-icon>more_vert</md-icon></button>
+    <button md-raised-button>Check<md-icon>check</md-icon></button>
+    <button md-raised-button>Check<md-icon class="md-24">favorite</md-icon></button>
+    <button md-raised-button>Last<md-icon>navigate_before</md-icon></button>
+  </section>
+  <section>
+    <button md-button>More<md-icon>more_vert</md-icon></button>
+    <button md-button>Check<md-icon>check</md-icon></button>
+    <button md-button>Check<md-icon class="md-24">favorite</md-icon></button>
+    <button md-button>Last<md-icon>navigate_before</md-icon></button>
+  </section>
 </div>
diff --git a/src/lib/button/button.html b/src/lib/button/button.html
index a1636be45494..4226e4b476c2 100644
--- a/src/lib/button/button.html
+++ b/src/lib/button/button.html
@@ -1,4 +1,4 @@
-<span class="md-button-wrapper"><ng-content></ng-content></span>
+<div class="md-button-wrapper"><ng-content></ng-content></div>
 <div md-ripple *ngIf="isRippleEnabled()" class="md-button-ripple"
     [class.md-button-ripple-round]="isRoundButton()"
     [md-ripple-trigger]="getHostElement()"
diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 5f1a78b4755c..09c64fe60068 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -47,6 +47,12 @@
   }
 }
 
+[md-button], [md-raised-button] {
+  .md-button-wrapper > * {
+    vertical-align: middle;
+  }
+}
+
 // The ripple container should match the bounds of the entire button.
 .md-button-ripple {
   position: absolute;

From 8eaf6dc47ecabdd083e010b8b81e1f08187dfe6e Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Fri, 21 Oct 2016 15:54:55 -0700
Subject: [PATCH 2/3] revert the span change

---
 src/lib/button/button.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/button/button.html b/src/lib/button/button.html
index 4226e4b476c2..a1636be45494 100644
--- a/src/lib/button/button.html
+++ b/src/lib/button/button.html
@@ -1,4 +1,4 @@
-<div class="md-button-wrapper"><ng-content></ng-content></div>
+<span class="md-button-wrapper"><ng-content></ng-content></span>
 <div md-ripple *ngIf="isRippleEnabled()" class="md-button-ripple"
     [class.md-button-ripple-round]="isRoundButton()"
     [md-ripple-trigger]="getHostElement()"

From c3544aabd3a33289602cf0f8c1ad9c1f330c6564 Mon Sep 17 00:00:00 2001
From: Yuan Gao <tinagao@google.com>
Date: Tue, 25 Oct 2016 09:36:00 -0700
Subject: [PATCH 3/3] Add comments for style

---
 src/lib/button/button.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 09c64fe60068..6ac83e421285 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -47,6 +47,7 @@
   }
 }
 
+// The text and icon should be vertical aligned inside a button
 [md-button], [md-raised-button] {
   .md-button-wrapper > * {
     vertical-align: middle;