fix(expansion-panel): inconsistent margin for nested panels (#11305)

crisbeto · tinayuangao · commit 1bf5c415173c · 2018-05-15T11:01:20.000-07:00
Fixes some inconsistent margin when expansion panels are nested inside other expansion panels. Fixes #11254.
diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
@@ -26,12 +26,12 @@
   margin: 16px 0;
 
   .mat-accordion > &:first-child,
-  .mat-accordion > *:first-child & {
+  .mat-accordion > *:first-child:not(.mat-expansion-panel) & {
     margin-top: 0;
   }
 
   .mat-accordion > &:last-child,
-  .mat-accordion > *:last-child & {
+  .mat-accordion > *:last-child:not(.mat-expansion-panel) & {
     margin-bottom: 0;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@`
`26`	`26`	`margin: 16px 0;`
`27`	`27`
`28`	`28`	`.mat-accordion > &:first-child,`
`29`		`- .mat-accordion > *:first-child & {`
	`29`	`+ .mat-accordion > *:first-child:not(.mat-expansion-panel) & {`
`30`	`30`	`margin-top: 0;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`.mat-accordion > &:last-child,`
`34`		`- .mat-accordion > *:last-child & {`
	`34`	`+ .mat-accordion > *:last-child:not(.mat-expansion-panel) & {`
`35`	`35`	`margin-bottom: 0;`
`36`	`36`	`}`
`37`	`37`	`}`