Skip to content

Commit

Permalink
Merge branch 'main' into Menu
Browse files Browse the repository at this point in the history
  • Loading branch information
thyhmdo authored Oct 17, 2023
2 parents dc7d06b + f9f99f9 commit 28b5057
Show file tree
Hide file tree
Showing 8 changed files with 143 additions and 138 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"@carbon/elements": "^11.31.0",
"@carbon/icons": "^11.28.0",
"@carbon/icons-react": "^11.28.0",
"@carbon/pictograms": "^12.23.0",
"@carbon/pictograms-react": "^11.49.0",
"@carbon/react": "^1.39.0",
"@carbon/pictograms": "^12.24.0",
"@carbon/pictograms-react": "^11.50.0",
"@carbon/react": "^1.40.0",
"@loadable/component": "^5.15.2",
"@slack/web-api": "^5.11.0",
"babel-preset-env": "^1.7.0",
Expand All @@ -58,7 +58,7 @@
"gatsby": "^4.25.7",
"gatsby-image": "^3.7.1",
"gatsby-plugin-image": "^2.9.0",
"gatsby-theme-carbon": "^3.1.20",
"gatsby-theme-carbon": "^3.1.22",
"lodash-es": "^4.17.15",
"markdown-it": "^12.3.2",
"nanoid": "^2.1.11",
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
2 changes: 1 addition & 1 deletion src/pages/contributing/get-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ bandwidth.
This work involves enhancing our components in code, like adding new features or
variants. Designers are often responsible for researching UX and visual
solutions and then creating a design spec for developers.
[Here are issues](https://github.com/carbon-design-system/carbon/issues?q=is%3Aissue+is%3Aopen+label%3A%22proposal%3A+accepted%22+label%3A%22community+contribution%22+label%3A%22type%3A+enhancement+%F0%9F%92%A1%22+)
[Here are issues](https://github.com/carbon-design-system/carbon/issues?q=is%3Aopen+is%3Aissue+label%3A%22needs%3A+community+contribution%22+)
in our enhancement backlog that need design or development work.

### Design kits
Expand Down
Binary file modified static/videos/code-contribution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/videos/design-contribution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/videos/edit-this-page-contribution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/videos/inline-edit-contribution.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
266 changes: 134 additions & 132 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 28b5057

Please sign in to comment.