From 041bc79c894f4f8e53eb409174865899f15627a6 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Wed, 17 Aug 2016 11:58:29 -0700 Subject: [PATCH] fix(card): remove unnecessary intermediate div --- src/components/card/card.html | 4 +--- src/components/card/card.scss | 10 +++++----- src/demo-app/card/card-demo.html | 4 ++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/card/card.html b/src/components/card/card.html index d8084700e762..6dbc74306383 100644 --- a/src/components/card/card.html +++ b/src/components/card/card.html @@ -1,3 +1 @@ -
- -
+ diff --git a/src/components/card/card.scss b/src/components/card/card.scss index 327eab5525ff..6d8683269b80 100644 --- a/src/components/card/card.scss +++ b/src/components/card/card.scss @@ -171,13 +171,13 @@ md-card-title-group { // top els in md-card-content and md-card can't have their default margin-tops (e.g.

tags) // or they'll incorrectly add to card's top padding -.md-card > :first-child, md-card-content > :first-child { +md-card > :first-child, md-card-content > :first-child { margin-top: 0; } // last els in md-card-content and md-card can't have their default margin-bottoms (e.g.

tags) // or they'll incorrectly add to card's bottom padding -.md-card > :last-child, md-card-content > :last-child { +md-card > :last-child, md-card-content > :last-child { margin-bottom: 0; } @@ -189,7 +189,7 @@ md-card-title-group { // actions panel on bottom should be 8px from bottom of card // so must strip 16px from default card padding of 24px -.md-card > md-card-actions:last-child { +md-card > md-card-actions:last-child { margin-bottom: -16px; padding-bottom: 0; } @@ -216,12 +216,12 @@ md-card-header md-card-subtitle:not(:first-child) { // xl image should always have 16px on top. // when it's the first el, it'll need to remove 8px from default card padding of 24px -.md-card > [md-card-xl-image]:first-child { +md-card > [md-card-xl-image]:first-child { margin-top: -8px; } // xl image should always have 16px on bottom // when it's the last el, it'll need to remove 8px from default card padding of 24px -.md-card > [md-card-xl-image]:last-child { +md-card > [md-card-xl-image]:last-child { margin-bottom: -8px; } diff --git a/src/demo-app/card/card-demo.html b/src/demo-app/card/card-demo.html index 12617c5f74d1..f0be370dd7e7 100644 --- a/src/demo-app/card/card-demo.html +++ b/src/demo-app/card/card-demo.html @@ -1,4 +1,8 @@

+ + Hello + + Card with title