From ac8ed31d3659cdd2bfd80abef18f75c05495df57 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 30 Aug 2018 16:07:13 +0200
Subject: [PATCH] fix(expansion-panel): elevation transition not working
 (#12860)

Fixes the elevation transition being applied to the expansion panel and then being overridden immediately by the margin transition.
---
 src/lib/expansion/expansion-panel.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
index 086c202372a..08cce61bf1e 100644
--- a/src/lib/expansion/expansion-panel.scss
+++ b/src/lib/expansion/expansion-panel.scss
@@ -5,13 +5,13 @@
 .mat-expansion-panel {
   $border-radius: 4px;
 
-  @include mat-elevation-transition;
   @include mat-overridable-elevation(2);
   box-sizing: content-box;
   display: block;
   margin: 0;
-  transition: margin 225ms $mat-fast-out-slow-in-timing-function;
   border-radius: $border-radius;
+  transition: margin 225ms $mat-fast-out-slow-in-timing-function,
+      mat-elevation-transition-property-value();
 
   .mat-accordion & {
     &:not(.mat-expanded), &:not(.mat-expansion-panel-spacing) {