Skip to content

Commit

Permalink
Merge branch 'master' of github.com:carbon-design-system/gatsby-theme…
Browse files Browse the repository at this point in the history
…-carbon
  • Loading branch information
vpicone committed Nov 1, 2019
2 parents 17279e1 + 12561ea commit 81d914d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 11 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 24 additions & 6 deletions packages/example/src/pages/demo/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,38 @@ This page is meant to demonstrate some of the components in action. You can chec
</AnchorLinks>

<Row>
<Column colMd={4} colLg={4}>
<Column colMd={4} colLg={4} noGutterMdLeft>
<ArticleCard
title="Getting started"
href="/getting-started"
actionIcon="arrowRight"
>

![Grid Example](../components/images/Article_05.png)
![Dark article layout mockup](/images/article.png)

</ArticleCard>
</Column>
<Column colMd={4} colLg={4}>
<Column colMd={4} colLg={4} noGutterMdLeft>
<ArticleCard
title="Theme configuration"
href="/guides/configuration"
actionIcon="arrowRight"
>

![Grid Example](../components/images/Article_05.png)
![Dark article layout mockup](/images/article.png)

</ArticleCard>
</Column>
<Column colMd={4} colLg={4}>
<Column colMd={4} colLg={4} noGutterMdLeft>
<ArticleCard
title="Contributions"
href="/contributions"
actionIcon="arrowRight"
>

![Grid Example](../components/images/Article_05.png)
![Dark article layout mockup](/images/article.png)

</ArticleCard>
</Column>
</Row>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
margin-top: var(--space);
}

:global([class*='--col']) {
margin-top: 1.5rem; // IE fallback
}

.padded {
min-height: calc(100vh - 40rem);
padding-top: 80px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Card groups
// Card groups
// Set spacing to the right of the group
.resource-card-group .#{$prefix}--col-lg-4:nth-child(2n) {
@include carbon--breakpoint('lg') {
Expand Down

0 comments on commit 81d914d

Please sign in to comment.