Skip to content

Commit

Permalink
fix: homepage typography updates, alt tag and asset updates
Browse files Browse the repository at this point in the history
  • Loading branch information
vpicone committed Jul 9, 2019
1 parent 92bcde7 commit b09ff9c
Show file tree
Hide file tree
Showing 20 changed files with 100 additions and 88 deletions.
30 changes: 19 additions & 11 deletions packages/example/src/gatsby-theme-carbon/templates/Homepage.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
import React from 'react';
import { HomepageBanner, HomepageCallout } from 'gatsby-theme-carbon';

// Component to be shadowed
import HomepageTemplate from 'gatsby-theme-carbon/src/templates/Homepage';
import { calloutLink } from './Homepage.module.scss';

import Carbon from '../../images/carbon.jpg';

const FirstLeftText = () => <p>Callout #1</p>;
const FirstLeftText = () => <p>Callout component</p>;

const FirstRightText = () => (
<p>
This is a callout component. You can edit the contents by updating the
pre-shadowed homepage template. You can provide a color and backgroundColor
props to suit your theme.
<br />
<a href="https://github.com/carbon-design-system/gatsby-theme-carbon/blob/master/packages/example/src/gatsby-theme-carbon/templates/Homepage.js">
pre-shadowed homepage template. You can provide <code>color</code> and{' '}
<code>backgroundColor</code> props to suit your theme.
<a
className={calloutLink}
href="https://github.com/carbon-design-system/gatsby-theme-carbon/blob/master/packages/example/src/gatsby-theme-carbon/templates/Homepage.js"
>
Homepage source →
</a>
</p>
);

const SecondLeftText = () => <p>Callout #2</p>;
const SecondLeftText = () => <p>Callout component</p>;

const SecondRightText = () => (
<p>
You can also not use these components at all by not providing the callout
props to the template or writing your own template.
<br />
<a href="https://github.com/carbon-design-system/gatsby-theme-carbon/blob/master/packages/example/src/gatsby-theme-carbon/templates/Homepage.js">
<a
className={calloutLink}
href="https://github.com/carbon-design-system/gatsby-theme-carbon/blob/master/packages/example/src/gatsby-theme-carbon/templates/Homepage.js"
>
Homepage source →
</a>
</p>
Expand All @@ -38,7 +41,12 @@ const BannerText = () => <h1>Banner component</h1>;
const customProps = {
Banner: <HomepageBanner renderText={BannerText} image={Carbon} />,
FirstCallout: (
<HomepageCallout leftText={FirstLeftText} rightText={FirstRightText} />
<HomepageCallout
backgroundColor="#030303"
color="white"
leftText={FirstLeftText}
rightText={FirstRightText}
/>
),
SecondCallout: (
<HomepageCallout
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.callout-link {
margin-top: $spacing-06;
display: block;
}
Binary file removed packages/example/src/images/Light_theme_01.png
Binary file not shown.
Binary file removed packages/example/src/images/blossom.jpg
Binary file not shown.
24 changes: 12 additions & 12 deletions packages/example/src/pages/components/ArticleCard.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
href="/"
>

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

</ArticleCard>
</Column>
Expand All @@ -33,7 +33,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="arrowRight"
>

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

</ArticleCard>
</Column>
Expand All @@ -44,7 +44,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
disabled
>

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

</ArticleCard>
</Column>
Expand All @@ -56,7 +56,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="download"
>

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

</ArticleCard>
</Column>
Expand All @@ -70,7 +70,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="email"
>

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

</ArticleCard>
</Column>
Expand All @@ -84,7 +84,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
disabled
>

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

</ArticleCard>
</Column>
Expand All @@ -105,7 +105,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
href="/"
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand All @@ -117,7 +117,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="arrowRight"
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand All @@ -128,7 +128,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
disabled
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand All @@ -140,7 +140,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="download"
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand All @@ -154,7 +154,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
actionIcon="email"
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand All @@ -168,7 +168,7 @@ The `<ArticleCard>` component should generally be used inside of a `<Row>` and `
disabled
>
![](/images/Article_05.png)
![Dark article layout mockup](/images/Article_05.png)
</ArticleCard>
</Column>
Expand Down
4 changes: 2 additions & 2 deletions packages/example/src/pages/components/DoDontExample.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The `<DoDontExample>` component will generally need to be placed inside `<Row>`

<DoDontExample type="do" captionTitle="Caption title" caption="Caption">

![Alt text](images/Light_theme_02.png)
![Alt text](./images/light-theme.png)

</DoDontExample>
</Column>
Expand Down Expand Up @@ -48,7 +48,7 @@ The `<DoDontExample>` component will generally need to be placed inside `<Row>`
```
<DoDontExample type="do" captionTitle="Caption title" caption="Caption">
![Alt text](images/Light_theme_02.png)
![Alt text](images/light-theme.png)
</DoDontExample>
```
Expand Down
44 changes: 22 additions & 22 deletions packages/example/src/pages/components/Grid.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4}>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4}>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4}>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
</Row>
Expand All @@ -99,17 +99,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} noGutterMdLeft>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4} noGutterMdLeft>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4} noGutterMdLeft>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
</Row>
Expand All @@ -119,17 +119,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} noGutterSm>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4} noGutterSm>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4} noGutterSm>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
</Row>
Expand All @@ -139,12 +139,12 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} offsetLg={4}>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
<Column colMd={4} colLg={4}>

![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)

</Column>
</Row>
Expand All @@ -155,17 +155,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4}>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4}>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4}>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
</Row>
Expand All @@ -177,17 +177,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} noGutterMdLeft>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4} noGutterMdLeft>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4} noGutterMdLeft>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
</Row>
Expand All @@ -199,17 +199,17 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} noGutterSm>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4} noGutterSm>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4} noGutterSm>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
</Row>
Expand All @@ -221,12 +221,12 @@ The `<Column>` component is used to define column widths for your content, you c
<Row>
<Column colMd={4} colLg={4} offsetLg={4}>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
<Column colMd={4} colLg={4}>
![Colors](images/Article_05.png)
![Grid Example](images/Article_05.png)
</Column>
</Row>
Expand Down
Loading

0 comments on commit b09ff9c

Please sign in to comment.