fix(card): make it use up proper width with margin

Closes #247
angular · Sep 8, 2014 · f33185f · f33185f
1 parent 528d0db
commit f33185f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/components/card/_card.scss b/src/components/card/_card.scss
@@ -1,18 +1,15 @@
 material-card {
   display: block;
+  @include box-sizing(border-box);
 
   box-shadow: $card-box-shadow;
-
-  padding: $card-padding;
   margin: $card-margin;
-
+  padding: $card-padding;
   border-radius: $card-border-radius;
 
   .material-card-image {
-    min-width: 100%;
-    @include calc(width, "100% + #{$card-padding}*2");
-    margin-left: -10px;
-    margin-top: -10px;
+    display: block;
+    width: 100%;
     border-radius: $card-border-radius $card-border-radius 0 0;
   }
 

diff --git a/src/theme/_variables.scss b/src/theme/_variables.scss
@@ -109,20 +109,14 @@ $item-padding-bottom: 0px;
 
 $card-border-radius: 2px;
 $card-border: 1px solid #eee;
-$card-padding: 10px;
-$card-margin: 10px;
+$card-padding: 8px;
+$card-margin: 8px;
 $card-box-shadow: $whiteframe-shadow-z1;
 
 // Tabs
 $tabs-paginator-width: $baseline-grid * 4 !default;
 $tabs-tab-width: $baseline-grid * 12 !default;
 
-// Tiles
-
-$tile-border-radius: 2px;
-$tile-padding: 10px;
-$tile-margin: 10px;
-
 // Forms and inputs
 
 $input-font-size: 0.85em;