Skip to content

Commit

Permalink
Revert "Merge pull request #962 from Shopify/Card-padding"
Browse files Browse the repository at this point in the history
This reverts commit bdcbb7c, reversing
changes made to 8c80975.
  • Loading branch information
elileto committed Feb 20, 2019
1 parent 1cf3f2a commit 540a325
Showing 1 changed file with 5 additions and 12 deletions.
17 changes: 5 additions & 12 deletions src/components/Card/Card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
}

.Header {
padding: spacing() spacing() rem(12px) spacing();
padding: spacing() spacing() 0;

@include page-content-when-not-fully-condensed {
padding-right: spacing(loose);
padding-left: spacing(loose);
padding: spacing(loose) spacing(loose) 0;
}
}

.Section {
padding: spacing();

@include page-content-when-not-fully-condensed {
padding: spacing() spacing(loose);
padding: spacing(loose);
}

+ .Section {
Expand All @@ -43,7 +42,6 @@

.Section-subdued {
background-color: color('sky', 'lighter');
border-top: border-width() solid color('sky');
}

.SectionHeader {
Expand All @@ -63,14 +61,9 @@
.Footer {
display: flex;
justify-content: flex-end;
padding: rem(12px) spacing() spacing() spacing();
padding: 0 spacing() spacing();

@include page-content-when-not-fully-condensed {
padding-right: spacing(loose);
padding-left: spacing(loose);
}

.Section-subdued + & {
border-top: border-width() solid color('sky');
padding: 0 spacing(loose) spacing(loose);
}
}

0 comments on commit 540a325

Please sign in to comment.