Skip to content

Commit

Permalink
Merge branch 'carbon-design-system:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviaflory authored Mar 14, 2024
2 parents f17057f + 4071bdf commit 2107f2c
Show file tree
Hide file tree
Showing 38 changed files with 675 additions and 111 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/publish-v1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: publish (Publish production site)

on:
push:
branches:
- v1

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
publish:
if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom-website'
runs-on: ubuntu-20.04
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'yarn'
- name: Install dependencies
run: yarn install
- name: Build website
run: |
echo "PATH_PREFIX=/standards/carbon/v1" >> .env.production
echo "GATSBY_CPU_COUNT=1" >> .env.production
yarn build
- name: Publish to COS (Carbon for IBM.com Web Components)
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
env:
AWS_S3_BUCKET: ${{ secrets.COS_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.COS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.COS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.COS_REGION }}
AWS_S3_ENDPOINT: https://${{ secrets.COS_ENDPOINT }}
SOURCE_DIR: 'public'
DEST_DIR: 'standards/carbon/v1'
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
47 changes: 47 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: publish-v2 (Publish production site v2)

on:
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
publish:
if: github.repository == 'carbon-design-system/carbon-for-ibm-dotcom-website'
runs-on: ubuntu-20.04
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
steps:
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'yarn'
- name: Install dependencies
run: yarn install
- name: Build website
run: |
echo "PATH_PREFIX=/standards/carbon" >> .env.production
echo "GATSBY_CPU_COUNT=1" >> .env.production
yarn build
- name: Publish to COS (Carbon for IBM.com Web Components)
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks
env:
AWS_S3_BUCKET: ${{ secrets.COS_BUCKET }}
AWS_ACCESS_KEY_ID: ${{ secrets.COS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.COS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.COS_REGION }}
AWS_S3_ENDPOINT: https://${{ secrets.COS_ENDPOINT }}
SOURCE_DIR: 'public'
DEST_DIR: 'standards/carbon'
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
if: failure()
20 changes: 19 additions & 1 deletion src/data/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
"Horizontal rule": {
"url": "/components/horizontal-rule",
"designLink": "https://ibm.box.com/s/ladjc15eyxg61c5wqbshggm3e4zgrnp5",
"description": "The horizontal rule component is utilized for thematic breaks within the content.",
"description": "The horizontal rule component is used for thematic breaks between content.",
"storybook": {
"webcomponents": "http://www.ibm.com/standards/carbon/web-components/?path=/story/components-horizontal-rule--default",
"reactwrapper": "http://www.ibm.com/standards/carbon/web-components/react/?path=/story/components-horizontal-rule--default"
Expand Down Expand Up @@ -453,6 +453,24 @@
"notAvailable": false
}
},
"Content block": {
"url": "/components/content-block",
"designLink": "https://ibm.box.com/s/uaq0ovswviefwbv7gd4jn13llvqb23f8",
"description": "Content block is one of the main layout components that can be used to build web experiences on IBM.com. It includes a large heading, subheading, body copy and CTA, and can accept many child components to enable customization and flexibility.",
"storybook": {
"webcomponents": "https://www.ibm.com/standards/carbon/web-components/?path=/story/components-content-block--default",
"reactwrapper": "https://www.ibm.com/standards/carbon/web-components/react/?path=/story/components-content-block--default"
},
"webcomponents": {
"stable": true,
"experimental": false,
"new": false,
"updated": false,
"deprecated": false,
"underConstruction": false,
"notAvailable": false
}
},
"Content group": {
"url": "/components/content-group",
"designLink": "https://ibm.box.com/s/5n0sj6b3kkicnwimxmgnwb5owm46g8wz",
Expand Down
4 changes: 4 additions & 0 deletions src/data/nav-items.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
path: /about-carbon-for-ibm.com/about
- title: Adopting the system
path: /about-carbon-for-ibm.com/adopting
- title: Releases
path: /about-carbon-for-ibm.com/releases

- title: What’s happening
pages:
Expand Down Expand Up @@ -76,6 +78,8 @@
path: /components/card-group
- title: Carousel
path: /components/carousel
- title: Content block
path: /components/content-block
- title: Content group
path: /components/content-group
- title: Content item
Expand Down
2 changes: 1 addition & 1 deletion src/gatsby-theme-carbon/components/Footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const CustomFooter = () => {
!
</p>
<p>
Last updated Dec 13, 2023
Last updated Mar 07, 2024
<br />
Copyright &copy; 2022 IBM
</p>
Expand Down
3 changes: 1 addition & 2 deletions src/gatsby-theme-carbon/templates/Homepage.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import React from 'react';
import { Column } from 'gatsby-theme-carbon';
import HomepageTemplate from 'gatsby-theme-carbon/src/templates/Homepage';
import { ArrowDown32 } from '@carbon/icons-react';
import { leadspaceText } from './Homepage.module.scss';

const LeadSpaceText = () => (
<p className={leadspaceText}>
Carbon for IBM.com is the design system for the IBM website, providing
components, resources, and guidelines for everyone creating IBM.com pages.
<ArrowDown32 />
<span style={{ paddingTop: '1.25rem', display: 'flex' }}></span>
</p>
);

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
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.
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.
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.
Binary file not shown.
Binary file not shown.
108 changes: 108 additions & 0 deletions src/pages/about-carbon-for-ibm.com/releases.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
---
title: Releases
description: Learn about our latest updates, our release history, and what the team has planned for the future of Carbon for IBM.com.
---

<PageDescription>

Learn about our latest updates, our release history, and what the team has planned for the future of Carbon for IBM.com.

</PageDescription>

## Releases

Each Carbon for IBM.com release includes package releases that are independently versioned following the industry-standard semantic versioning specification.

Carbon for IBM.com follows a bi-weekly release schedule, with patch releases when necessary.

A primary focus of Carbon for IBM.com is always using the latest version of the Carbon Design System. This allows simplifying our content authoring and number of pre-constructed components, adding flexibility to our content components, and accessibility improvements.

<Row className="resource-card-group">
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Storybook"
title="Web Components"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/web-components/"
>

![Storybook icon](../../images/icon/web-components-icon.svg)

</ResourceCard>
</Column>
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Storybook"
title="Web Components: React Wrappers"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/web-components/react/"
>

![Storybook icon](../../images/icon/react-icon.svg)

</ResourceCard>
</Column>
</Row>

### Carbon for IBM.com v1

Carbon for IBM.com v1 implemented Carbon Design System v10 and our newly-updated brand expression (IBM Design Language) into our components.

<Row className="resource-card-group">
<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Storybook"
title="Web Components"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/v1/web-components/"
>

![Storybook icon](../../images/icon/web-components-icon.svg)

</ResourceCard>
</Column>
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Storybook"
title="Web Components: React Wrappers"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/v1/web-components/react/"
>

![Storybook icon](../../images/icon/react-icon.svg)

</ResourceCard>
</Column>

<Column colMd={4} colLg={4} noGutterSm>
<ResourceCard
subTitle="Storybook"
title="React"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/react/"
>

![Storybook icon](../../images/icon/react-icon.svg)

</ResourceCard>
</Column>
<Column colLg={4} colMd={4} noGutterSm>
<ResourceCard
subTitle="Website"
title="V1 Documentation site"
actionIcon="launch"
target="_blank"
href="https://www.ibm.com/standards/carbon/v1/"
>

![Storybook icon](../../images/icon/bee_icon.svg)

</ResourceCard>
</Column>

</Row>
Loading

0 comments on commit 2107f2c

Please sign in to comment.