Skip to content

Commit

Permalink
Merge branch 'main' of github.com:carbon-design-system/carbon-website
Browse files Browse the repository at this point in the history
  • Loading branch information
andreancardona committed Jul 6, 2021
2 parents 1003fa1 + ef50618 commit 76479ca
Show file tree
Hide file tree
Showing 11 changed files with 182 additions and 99 deletions.
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,32 @@
"/node_modules/*"
],
"resolutions": {
"carbon-components": "^10.37.0",
"carbon-components-react": "^7.37.1",
"@carbon/elements": "^10.36.0",
"@carbon/icons": "^10.33.0",
"@carbon/icons-react": "^10.33.0",
"carbon-components": "^10.38.0",
"carbon-components-react": "^7.38.0",
"@carbon/elements": "^10.37.0",
"@carbon/icons": "^10.34.0",
"@carbon/icons-react": "^10.34.0",
"gatsby-remark-images": "^3.3.33"
},
"dependencies": {
"@carbon/charts-react": "0.41.65",
"@carbon/elements": "^10.36.0",
"@carbon/icons": "^10.33.0",
"@carbon/icons-react": "^10.33.0",
"@carbon/pictograms": "^11.11.0",
"@carbon/pictograms-react": "^11.11.0",
"@carbon/elements": "^10.37.0",
"@carbon/icons": "^10.34.0",
"@carbon/icons-react": "^10.34.0",
"@carbon/pictograms": "^11.12.0",
"@carbon/pictograms-react": "^11.12.0",
"@loadable/component": "^5.12.0",
"@slack/web-api": "^5.11.0",
"carbon-components": "^10.37.0",
"carbon-components-react": "^7.37.1",
"carbon-components": "^10.38.0",
"carbon-components-react": "^7.38.0",
"change-case": "^4.1.1",
"classnames": "^2.2.6",
"codesandbox": "^2.1.10",
"copy-to-clipboard": "^3.2.1",
"fuse.js": "^6.4.1",
"gatsby": "^2.19.8",
"gatsby-image": "^2.4.15",
"gatsby-theme-carbon": "^1.29.2",
"gatsby-theme-carbon": "^1.30.1",
"lodash-es": "^4.17.15",
"markdown-it": "^9.0.1",
"nanoid": "^2.1.11",
Expand Down
6 changes: 3 additions & 3 deletions src/components/TypesetStyle/TypesetExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ const TypesetExample = (props) => (
<br />
Size: {displaySpecs.fontSize}
<br />
Line-height: {displaySpecs.lineHeight}
Line height: {displaySpecs.lineHeight}
<br />
Weight:{' '}
<span style={{ textTransform: 'capitalize' }}>
{displaySpecs.fontWeight}
</span>
<br />
Letter-spacing: {displaySpecs.letterSpacing}px
Letter spacing: {displaySpecs.letterSpacing}px
{displaySpecs.warning != null ? (
<span>
<br />
Expand All @@ -164,7 +164,7 @@ const TypesetExample = (props) => (
<br />
)}
<div className={`${prefix}--typeset-example-code-style`}>
<CodeSnippet type="inline">
<CodeSnippet type="inline" feedback="Copied!" light>
${type.name.split(' ')[0]}
</CodeSnippet>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/components/TypesetStyle/typeset-example.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '~carbon-components/scss/components/copy-button/copy-button';

.bx--typeset-example-container {
margin-top: $spacing-05;
}
Expand Down
19 changes: 15 additions & 4 deletions src/pages/designing/design-resources/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ reflect IBM's spirit, beliefs, and design principles.

## Gatsby theme resources

The Gatsby Sketch kit has all the components, patterns, and sample layouts that
have been developed by teams within the IBM ecosystem. The Gatsby theme site
includes the components, guidelines, and everything you need to create and
contribute to Carbon sites.
The Gatsby Sketch kit has all the components, patterns, and sample layouts that have been developed by teams within the IBM ecosystem. The Gatsby theme site includes the components, guidelines, and everything you need to create and contribute to Carbon sites.

### Image production guidelines
For anyone interested in contributing to the Carbon Design System website, or making images for their own Pattern Asset Library (PAL), we follow a set of guidelines to ensure consistency across the content in the Gatsby ecosystem. The image production guidelines Sketch kit includes guidance, symbols and templates to help designers with every aspect of image creation and component specs.

<Row className="resource-card-group">

Expand All @@ -162,6 +162,7 @@ contribute to Carbon sites.
<MdxIcon name="sketch" />
</ResourceCard>
</Column>

<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Gatsby theme Carbon site"
Expand All @@ -172,6 +173,16 @@ contribute to Carbon sites.

</ResourceCard>
</Column>

<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Image production guidelines Sketch kit"
href="sketch://add-library/cloud/240226b0-f455-484d-b412-cfd13fb1bb39"
actionIcon="download">
<MdxIcon name="sketch" />
</ResourceCard>
</Column>

</Row>

## GitHub repos
Expand Down
1 change: 1 addition & 0 deletions src/pages/developing/get-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ question to you and will jump in to help you out.

- [#carbon-design-system](https://ibm-studios.slack.com/messages/C0M053VPT/)
- [#carbon-components](https://ibm-studios.slack.com/archives/C046Y0YUD)
- [#carbon-charts](https://peretz.slack.com/archives/CCA7L4MS9)
- [#carbon-react](https://ibm-studios.slack.com/archives/C2K6RFJ1G)
- [#carbon-ng](https://ibm-studios.slack.com/archives/CBZC0LM2N)
- [#carbon-vue](https://ibm-studios.slack.com/archives/CAM5P6NR1)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 12 additions & 3 deletions src/pages/whats-happening/v11-release/index.mdx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
title: The v11 release
description:
The Carbon v11 release includes great quality of life updates for designers
and developers, and with no brand updates, no product redesigns are required.
The Carbon v11 release includes quality of life updates for designers and
developers, and with no brand updates, no product redesigns are required.
---

<PageDescription>

The Carbon v11 release includes great quality of life updates for designers and
The Carbon v11 release includes quality of life updates for designers and
developers, and with no brand updates, no product redesigns are required.

</PageDescription>
Expand All @@ -23,6 +23,7 @@ lookout for the public preview release available in the coming months.

<AnchorLink>Overview</AnchorLink>
<AnchorLink>Read more in Medium</AnchorLink>
<AnchorLink>June 15th FEDucation</AnchorLink>
<AnchorLink>Release FAQs</AnchorLink>

</AnchorLinks>
Expand Down Expand Up @@ -83,6 +84,14 @@ brand-driven product redesigns.
</Column>
</Row>

## June 15th FEDucation

As part of IBM's front-end developer educational series, Josh Black introduces
the upcoming v11 release, its features, and how to get involved and provide
feedback.

<Video title="Carbon v11 video" vimeoId="567122059" />

## Release FAQs

### What are the benefits of Carbon v11 for me as a designer?
Expand Down
Loading

0 comments on commit 76479ca

Please sign in to comment.