Skip to content

Commit

Permalink
Merge branch 'release/update-carbon-deps' of github.com:carbon-design…
Browse files Browse the repository at this point in the history
…-system/carbon-website into release/update-carbon-deps
  • Loading branch information
andreancardona committed Nov 7, 2023
2 parents 17309f7 + b75cecc commit 3a140ba
Show file tree
Hide file tree
Showing 293 changed files with 8,499 additions and 14,245 deletions.
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1 +1 @@
BACKEND_URI=https://carbondesignsystem.vercel.app/api/survey
BACKEND_URI=https://carbondesignsystem.vercel.app/api/survey
29 changes: 8 additions & 21 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,32 +1,19 @@
# Default to system one design and one dev
* @carbon-design-system/developers-system @carbon-design-system/design

*.conf @vpicone

# Vikki Paterson is code owner for Experimental IDE patterns
src/pages/community/patterns/create-flows/* @vikkipaterson
src/pages/community/patterns/delete-pattern/* @vikkipaterson
src/pages/community/patterns/export-pattern/* @vikkipaterson
src/pages/community/patterns/generate-an-api-key/* @vikkipaterson
src/pages/community/patterns/import-pattern/* @vikkipaterson
src/pages/community/patterns/remove-pattern/* @vikkipaterson

# Vincent Snagg is code owner for Experimental Watson Health patterns
src/pages/community/patterns/chatbot/* @vincentsnagg
* @carbon-design-system/developers-system @carbon-design-system/design

# Adriana Morales is code owner for Experimental Cloud PAL patterns
src/pages/community/patterns/order-summary-template/* @adrianamorales
src/pages/community/patterns/cards/* @adrianamorales
src/pages/community/patterns/dashboard-widgets/* @adrianamorales
# Diana Tran is the owner for Sustainability Software Patterns

# Chris Reckling is the code owner for Experimental IoT patterns
src/pages/community/patterns/login-pattern/* @lukefirth
src/pages/community/patterns/login-pattern/* @dianatran18 @lukefirth

# Eliad Moosavi and Natasha Decoste are the code owners for Data Visualization

src/pages/data-visualization/* @theiliad @natashadecoste

# Cal Smith for Angular tutorial
# Zvonimir Fras for Angular tutorial

/src/pages/tutorial/angular/* @zvonimirfras

# Lee Chase for Vue tutorial
/src/pages/tutorial/vue/* @lee-chase

/src/pages/tutorial/vue/* @lee-chase
92 changes: 92 additions & 0 deletions .github/ISSUE_TEMPLATE/component-accessibility-deliverables.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
name: Component accessibility deliverables
description: Submit the accessibility portion of your component
title: '[Component name] component – accessibility '
labels: 'accessibility'
body:
- type: markdown
attributes:
value: |
Complete the following deliverables for Carbon to review the accessibility portion of the [component contribution process](https://carbondesignsystem.com/contributing/component/). To see examples, view the component accessibility guidelines on [Github](https://github.com/carbon-design-system/carbon/wiki/Component-Accessibility-Guidelines) or on [figma](https://www.figma.com/file/PmSOwLS3ldpSQtUf4xlaLD/component-accessibility-guidelines?type=design&node-id=434-4103&mode=design&t=qQ2DqDAiNaOLPlBC-0).
1. Define component
2. Document keyboard interactions
3. Provide visual states
4. Repeat steps 2 – 3 for each variant, if any
5. Repeat step 3 for each child/subcomponent, if any
- type: markdown
attributes:
value: '## 1. Define component'

- type: checkboxes
id: type
attributes:
label: Component type
description:
variants are only when the interaction differs from default component,
not when there are only visual differences
options:
- label: Variant of existing component
- label: New component with no variants
- label: New component with variants
required: false

- type: checkboxes
id: subcomponent
attributes:
label: Can it be opened/expanded to reveal a child/subcomponent?
description:
if the child/subcomponent is non-interactive, visual states may not be
needed
options:
- label: Yes, it can
- label: No, it cannot
required: false

- type: markdown
attributes:
value: '## 2. Document keyboard interactions'

- type: checkboxes
id: keyboard
attributes:
label: Select all that apply
description:
options:
- label: '"Tab" moves between interactive components'
- label: Arrow keys move between component and subcomponent
- label: '"Enter" activates'
- label: '"Space" selects'
- label: '"Esc" closes'
required: false

- type: textarea
id: visual-examples
attributes:
label: Create keyboard interaction visual examples
description:
'Provide screenshots or a figma link. In the early stages of
contribution, only low fidelity visuals are required, but high fidelity
visuals should be created by the time the component is ready to be
published. Duplicate the [figma
file](https://www.figma.com/file/PmSOwLS3ldpSQtUf4xlaLD/lo-fi-keyboard-interaction-visual?type=design&node-id=434-4103&t=kO1MZkuNTKMIAj0h-0)
to see examples and use the provided assets.'
validations:
required: true

- type: markdown
attributes:
value: '## 3. Provide visual states'
- type: textarea
id: visual-states
attributes:
label:
Focused and non-focused states for default, selected, error (if any) and
error + selected (if any)
description:
'Provide screenshots or a figma link. This is in addition to what Carbon
may require. Duplicate the [figma
file](https://www.figma.com/file/PmSOwLS3ldpSQtUf4xlaLD/lo-fi-keyboard-interaction-visual?type=design&node-id=434-4103&t=kO1MZkuNTKMIAj0h-0)
to see examples and use the provided template.'
validations:
required: true
29 changes: 0 additions & 29 deletions .github/workflows/platform-content-sync.yml

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/update-carbon-gatsby-deps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Update Carbon and gatsby-theme-carbon deps

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

on:
workflow_dispatch:

jobs:
carbon-website:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- uses: actions/checkout@v3
with:
repository: carbon-design-system/carbon-website
ref: main
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
- name: Update dependencies
run: |
yarn upgrade \
@carbon/react@next \
@carbon/elements@next \
@carbon/pictograms@next \
@carbon/pictograms-react@next \
@carbon/icons@next \
@carbon/icons-react@next \
gatsby-theme-carbon@latest \
- name: Generate token
uses: tibdex/github-app-token@v1
id: generate_token
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
branch: 'release/update-carbon-deps'
commit-message: 'chore(release): update carbon and gatsby-theme-carbon deps'
delete-branch: true
title: 'chore(release): update carbon and gatsby-theme-carbon deps'
token: ${{ steps.generate_token.outputs.token }}
body: |
Automated pull request to update Carbon and gatsby-theme-carbon on the website
**Checklist**
- [ ] Verify package version bumps are accurate
- [ ] Verify CI passes as expected
- [ ] Verify no regressions on the website in the deploy preview
6 changes: 5 additions & 1 deletion conf.d/rewrite.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ rewrite /get-started/design/(.*) /designing/get-started/kits/\$1 permanent;

# Contributions rewrites
rewrite /how-to-contribute/(.*) /contributing/\$1 permanent;
rewrite /contributing/overview /contributing/get-started permanent;

# What's happening
rewrite /updates/whats-new /whats-happening/releases permanent;
Expand All @@ -51,4 +52,7 @@ rewrite /whats-happening/v11-release /migrating/guide/\$1 permanent;

#Icon and pictogram contribution
rewrite /guidelines/icons/contribute/ /contributing/contribute-icons/ permanent;
rewrite /guidelines/pictograms/contribute/ /contributing/contribute-pictograms/ permanent;
rewrite /guidelines/pictograms/contribute/ /contributing/contribute-pictograms/ permanent;

#Grid
rewrite /guidelines/2x-grid/implementation/ /guidelines/2x-grid/usage/ permanent;
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"nohoist": []
},
"scripts": {
"dev": "gatsby develop -H 0.0.0.0",
"dev": "NODE_OPTIONS='--max-old-space-size=8192' gatsby develop -H 0.0.0.0",
"dev:clean": "gatsby clean && yarn dev",
"clean": "gatsby clean",
"build": "node --max-old-space-size=8192 ./node_modules/.bin/gatsby build",
Expand Down Expand Up @@ -40,11 +40,12 @@
"dependencies": {
"@babel/core": "^7.15.8",
"@carbon/charts-react": "0.55.0",
"@carbon/elements": "^11.27.0-rc.0",
"@carbon/icons-react": "^11.24.0-rc.0",
"@carbon/pictograms": "^12.21.0-rc.0",
"@carbon/pictograms-react": "^11.47.0-rc.0",
"@carbon/react": "^1.35.0-rc.0",
"@carbon/elements": "^11.32.2",
"@carbon/icons": "^11.29.2",
"@carbon/icons-react": "^11.29.2",
"@carbon/pictograms": "^12.25.2",
"@carbon/pictograms-react": "^11.51.2",
"@carbon/react": "^1.41.2",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
Expand All @@ -57,7 +58,7 @@
"gatsby": "^4.25.7",
"gatsby-image": "^3.7.1",
"gatsby-plugin-image": "^2.9.0",
"gatsby-theme-carbon": "^3.1.4",
"gatsby-theme-carbon": "^3.1.27",
"lodash-es": "^4.17.15",
"markdown-it": "^12.3.2",
"nanoid": "^2.1.11",
Expand Down Expand Up @@ -115,7 +116,6 @@
]
},
"resolutions": {
"webpack": "^5.59.0",
"@carbon/react": "1.35.0-rc.0"
"webpack": "^5.59.0"
}
}
4 changes: 3 additions & 1 deletion src/components/ColorPalette/ColorPalette.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@
}

.palette-switcher
:global(.cds--content-switcher-btn:not(.cds--content-switcher--selected):hover) {
:global(
.cds--content-switcher-btn:not(.cds--content-switcher--selected):hover
) {
background-color: $hover-ui;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ const IconCategory = ({ category, pictograms, columnCount }) => {
pictogram.name === 'ibm--z' ||
pictogram.name === 'ibm--z--partition' ||
pictogram.name === 'ibm--z-and-linuxone-multi-frame' ||
pictogram.name === 'ibm--z-and-linuxone-single-frame'
pictogram.name === 'ibm--z-and-linuxone-single-frame' ||
pictogram.name === 'watsonx--ai' ||
pictogram.name === 'watsonx--data' ||
pictogram.name === 'watsonx--governance'
) {
return false;
}
Expand Down
Loading

0 comments on commit 3a140ba

Please sign in to comment.