Skip to content

Commit

Permalink
Merge pull request #1082 from Shopify/card-subdued-spacing
Browse files Browse the repository at this point in the history
[Card] Fix subdued section spacing issues
  • Loading branch information
ry5n authored Mar 1, 2019
2 parents d926b0f + acee905 commit dc91c87
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

- Fixed missing rounded corners on `Tag` button states ([#1078](https://github.com/Shopify/polaris-react/pull/1078))
- Removed reference to `window.Polaris`, which in some cases could be undefined ([#1104](https://github.com/Shopify/polaris-react/issues/1104))
- Added padding and margin to `subdued` sections for proper spacing between the header and footer ([#1082](https://github.com/Shopify/polaris-react/pull/1082))

### Documentation

Expand Down
10 changes: 10 additions & 0 deletions src/components/Card/Card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@

.Section-subdued {
background-color: color('sky', 'lighter');

.Header + & {
border-top: border-width() solid color('sky');
margin-top: spacing(loose);
}
}

.SectionHeader {
Expand All @@ -66,4 +71,9 @@
@include page-content-when-not-fully-condensed {
padding: 0 spacing(loose) spacing(loose);
}

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

0 comments on commit dc91c87

Please sign in to comment.