Skip to content

Commit

Permalink
Merge branch 'main' into docs-status-indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
vpicone authored Jun 1, 2021
2 parents 941e177 + e7325c8 commit 2f5cdaf
Show file tree
Hide file tree
Showing 56 changed files with 809 additions and 103 deletions.
1 change: 0 additions & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = {
flags: {
PRESERVE_WEBPACK_CACHE: true,
FAST_DEV: true,
FAST_REFRESH: true,
},
plugins: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/components/ColorGrid/ColorGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import {
colors,
black100,
green50,
green60,
orange40,
red60,
white0,
Expand Down Expand Up @@ -34,7 +34,7 @@ export default function ColorGrid({ colorFamily, ...rest }) {
<ColorSwatch hex={red60} />
<ColorSwatch hex={orange40} />
<ColorSwatch hex={yellow20} />
<ColorSwatch hex={green50} />
<ColorSwatch hex={green60} />
</div>
);
}
Expand Down
17 changes: 6 additions & 11 deletions src/data/guidelines/color-tokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,7 @@ const colorTokens = {
},
},
'$button-separator': {
role: [
'3:1 aa element contrast',
'Fluid button separator',
],
role: ['3:1 aa element contrast', 'Fluid button separator'],
value: {
white: {
name: 'Gray 20',
Expand All @@ -290,9 +287,7 @@ const colorTokens = {
},
},
'$decorative-01': {
role: [
'“Light” variant elements',
],
role: ['“Light” variant elements'],
value: {
white: {
name: 'Gray 20',
Expand Down Expand Up @@ -678,12 +673,12 @@ const colorTokens = {
role: ['Success'],
value: {
white: {
name: 'Green 50',
hex: '#24a148',
name: 'Green 60',
hex: '#198038',
},
g10: {
name: 'Green 50',
hex: '#24a148',
name: 'Green 60',
hex: '#198038',
},
g90: {
name: 'Green 40',
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/callout-media.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Callout - with media
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/callout-with-media
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/callout-with-media
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CalloutWithMedia
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/callout.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Callout - quote
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/callout-quote
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/callout-quote
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CalloutQuote
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/card-link.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Card link
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/card-link
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/card-link
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CardLink
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/card-section-image.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Card section - images
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/card-section#card-section-images
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/card-section#card-section-images
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CardSectionImages
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/card-section.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Card section - simple
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/card-section#card-section-simple
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/card-section#card-section-simple
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CardSectionSimple
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-block-cards.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content block - with cards
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-block-with-cards
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-block-with-cards
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentBlockCards
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-block-media.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content block - with media
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-block-media
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-block-media
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentBlockMedia
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-block-segmented.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content block - segmented
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-block-segmented
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-block-segmented
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentBlockSegmented
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-block-simple.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content block - simple
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-block-simple
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-block-simple
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentBlockSimple
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-group-cards.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content group - with cards
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-group-with-cards
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-group-with-cards
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentGroupCards
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-group-horizontal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content group - horizontal
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-group-horizontal
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-group-horizontal
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentGroupHorizontal
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-group-pictogram.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content group - with pictograms
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-group-pictograms
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-group-pictograms
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentGroupPictograms
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/content-group-simple.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Content group - simple
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/content-group-simple
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/content-group-simple
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ContentGroupSimple
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/cta-section.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Call-to-action section
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/cta-section
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/cta-section
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/CTASection
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/digital-card.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Card
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/card
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/card
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/Card
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/expressive-modal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Expressive modal
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/expressive-modal
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/expressive-modal
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ExpressiveModal
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/feature-card-block-large.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature card block - large
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/feature-card-block#feature-card-block-large
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/feature-card-block#feature-card-block-large
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/FeatureCardBlockLarge
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/feature-card-block-medium.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature card block - medium
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/feature-card-block#feature-card-block-medium
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/feature-card-block#feature-card-block-medium
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/FeatureCardBlockMedium
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/feature-card.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Feature card
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/feature-card
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/feature-card
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/FeatureCard
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/footer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Footer
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/footer
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/footer
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/Footer
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/horizontal-rule.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Horizontal rule
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/horizontal-rule
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/horizontal-rule
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/HorizontalRule
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/image-with-caption.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Image with caption
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/image-with-caption
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/image-with-caption
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/ImageWithCaption
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/lead-space-block.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Lead space - block
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/lead-space-block
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/lead-space-block
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LeadSpaceBlock
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/lead-space.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Lead space
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/leadspace
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/leadspace
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LeadSpace
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/lightbox-media-viewer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Lightbox media viewer
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/lightbox-media-viewer
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/lightbox-media-viewer
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LightboxMediaViewer
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/link-list.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Link list
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/link-list
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/link-list
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LinkList
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/link-with-icon.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Link with icon
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/link-with-icon
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/link-with-icon
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LinkWithIcon
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/locale-modal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Locale modal
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/localemodal
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/localemodal
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LocaleModal
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/logo-grid.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Logo grid
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/logo-grid
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/logo-grid
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/LogoGrid
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/masthead.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Masthead
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/masthead
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/masthead
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/Masthead
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/table-of-contents.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Table of contents
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/table-of-contents
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/table-of-contents
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components/TableOfContents
maintainer: IBM.com
Expand Down
2 changes: 1 addition & 1 deletion src/data/index/dot-com/video-player.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Video player
website_url: >-
https://www.ibm.com/standards/web/ibm-dotcom-library/components/video-player
https://www.ibm.com/standards/web/carbon-for-ibm-dotcom/components/video-player
code_url: >-
https://github.com/carbon-design-system/ibm-dotcom-library/tree/master/packages/react/src/components
maintainer: IBM.com
Expand Down
6 changes: 4 additions & 2 deletions src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
pages:
- title: What is Carbon?
path: /all-about-carbon/what-is-carbon/
- title: How Carbon works
path: /all-about-carbon/how-carbon-works/
- title: Who uses Carbon?
path: /all-about-carbon/who-uses-carbon/
- title: The Carbon ecosystem
path: /all-about-carbon/the-carbon-ecosystem/
- title: The Carbon team
path: /all-about-carbon/the-team/
- title: Partners
Expand Down
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/bee.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/blog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/carbon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/chat-bot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/data--1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/all-about-carbon/images/ecosystem/ibm-cloud.svg
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

0 comments on commit 2f5cdaf

Please sign in to comment.