From 4a6c10d28c9c1c21652dbb6373e4ed270084ed58 Mon Sep 17 00:00:00 2001
From: marcysutton
Date: Sun, 19 Apr 2015 14:41:20 -0700
Subject: [PATCH] fix(card): action bar spacing, remove order attrs
Card sections use DOM source order rather than flex order. This makes it so that an action bar can go in between content and the footer, and have any number of combinations.
Closes #2403
---
src/components/card/card.scss | 11 ++++++++---
src/components/card/demoBasicUsage/index.html | 4 ++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/components/card/card.scss b/src/components/card/card.scss
index 6ccf02601cb..3e78f9b8dba 100644
--- a/src/components/card/card.scss
+++ b/src/components/card/card.scss
@@ -12,16 +12,21 @@ md-card {
> img,
> :not(md-card-content) img {
- order: 0;
width: 100%;
}
md-card-content {
- order: 1;
padding: $card-padding;
}
+ md-action-bar {
+ margin: 0;
+
+ .md-button {
+ margin-bottom: $card-margin;
+ margin-top: $card-margin;
+ }
+ }
md-card-footer {
- order: 2;
padding: $card-padding;
}
}
diff --git a/src/components/card/demoBasicUsage/index.html b/src/components/card/demoBasicUsage/index.html
index d536b66580f..0ba4d740b5f 100644
--- a/src/components/card/demoBasicUsage/index.html
+++ b/src/components/card/demoBasicUsage/index.html
@@ -12,6 +12,10 @@ Paracosm
two most important words in Ernest Greene's musical language: feel it. It's a simple request, as well...
+
+ Action 1
+ Action 2
+