From 73c6d8d75712ed32cee2b624356d191662f2553e Mon Sep 17 00:00:00 2001
From: Will Howell <will.s.howell@gmail.com>
Date: Fri, 4 Aug 2017 18:03:19 -0400
Subject: [PATCH] style(expansion): simplify vertical centering in header
 (#5950)

---
 src/lib/expansion/expansion-panel-header.scss | 10 +---------
 src/lib/expansion/expansion-panel-header.ts   |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/lib/expansion/expansion-panel-header.scss b/src/lib/expansion/expansion-panel-header.scss
index 0ead2249fd2..d501ceb2e3d 100644
--- a/src/lib/expansion/expansion-panel-header.scss
+++ b/src/lib/expansion/expansion-panel-header.scss
@@ -1,19 +1,11 @@
-$mat-expansion-panel-header-height: 48px;
-$mat-expansion-panel-header-height-expanded: 64px;
 
 .mat-expansion-panel-header {
   cursor: pointer;
   display: flex;
   flex-direction: row;
-  height: $mat-expansion-panel-header-height;
-  line-height: $mat-expansion-panel-header-height;
+  align-items: center;
   padding: 0 24px;
 
-  &.mat-expanded {
-    height: $mat-expansion-panel-header-height-expanded;
-    line-height: $mat-expansion-panel-header-height-expanded;
-  }
-
   &:focus,
   &:hover {
     outline: none;
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index 0234d8d6967..7f9d8ef96b7 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -64,8 +64,8 @@ import {Subscription} from 'rxjs/Subscription';
       transition('expanded <=> collapsed', animate(EXPANSION_PANEL_ANIMATION_TIMING)),
     ]),
     trigger('expansionHeight', [
-      state('collapsed', style({height: '48px', 'line-height': '48px'})),
-      state('expanded', style({height: '64px', 'line-height': '64px'})),
+      state('collapsed', style({height: '48px'})),
+      state('expanded', style({height: '64px'})),
       transition('expanded <=> collapsed', animate(EXPANSION_PANEL_ANIMATION_TIMING)),
     ]),
   ],