Skip to content

Commit

Permalink
Merge branch 'main' into tab_styles
Browse files Browse the repository at this point in the history
  • Loading branch information
alisonjoseph authored Oct 8, 2024
2 parents d6ea658 + 9861873 commit e817c9f
Show file tree
Hide file tree
Showing 42 changed files with 348 additions and 186 deletions.
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,16 @@
"doc"
]
},
{
"login": "Neues",
"name": "Noah Sgorbati",
"avatar_url": "https://avatars.githubusercontent.com/u/9409245?v=4",
"profile": "https://github.com/Neues",
"contributions": [
"code",
"doc"
]
},
{
"login": "divya-281",
"name": "Divya G",
Expand Down
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/ACCESSIBILITY_ISSUE.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Accessibility Issue ♿
description: Report an accessibility or usability issue.
title: '[a11y]: '
labels: 'type: a11y ♿'
type: 'bug'
labels: ['type: a11y ♿', 'type: bug 🐛']
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Bug report 🐛
description:
Something not working as expected? This is the place to report your issue.
title: '[Bug]: '
type: 'bug'
labels: 'type: bug 🐛'
body:
- type: markdown
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/DESIGN_DEFECT.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Design defect 🎨
description: Report a visual design issue
title: '[Bug]: '
type: 'bug'
labels: 'type: bug 🐛'
body:
- type: markdown
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/FEATURE_REQUEST_OR_ENHANCEMENT.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Feature request or enhancement 💡
description: Suggest an idea for this project.
title: '[Feature Request]: '
type: 'enhancement'
labels: 'type: enhancement 💡'
body:
- type: markdown
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/QUESTION.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ body:
value: '- `#carbon-design-system` for questions about the Design System.'
- type: markdown
attributes:
value: '- `#carbon-components` for questions about component styles.'
value: '- `#carbon-react` for questions about `@carbon/react`.'
- type: markdown
attributes:
value: '- `#carbon-react` for questions about our React components'
value: '- `#carbon-web-components` for questions about `@carbon/web-components`.'
- type: markdown
attributes:
value:
Expand Down
56 changes: 0 additions & 56 deletions .github/ISSUE_TEMPLATE/USER_STORY.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/deploy-web-components-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- name: Use Node.js 20.x
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b #v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: '20.x'
- name: Install dependencies
Expand Down
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,32 @@

## Getting started

If you're just getting started, check out [`@carbon/react`](./packages/react).
If you're just getting started, check out [`@carbon/react`](./packages/react) or
[`@carbon/web-components`](./packages/web-components).

We also have community-contributed components for the following technologies:

- [Angular](https://github.com/IBM/carbon-components-angular)
- [Svelte](https://github.com/IBM/carbon-components-svelte)
- [Vue](https://github.com/carbon-design-system/carbon-components-vue)
- [Web Components](https://github.com/carbon-design-system/carbon-web-components)

If you're trying to find something specific, here's a full list of packages that
we support!

| Package name | Description |
| --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [`@carbon/react`](./packages/react) | React components and styles |
| [`@carbon/styles`](./packages/styles) | Sass styles for components |
| [`@carbon/elements`](./packages/elements) | IBM Design Language elements like colors, type, iconography, and more |
| [`@carbon/colors`](./packages/colors) | Work with IBM Design Language colors |
| [`@carbon/grid`](./packages/grid) | Build layouts using the new 16 column grid system |
| [`@carbon/icons`](./packages/icons) | Iconography assets. We also offer support in: [React](./packages/icons-react), [Angular](https://github.com/carbon-design-system/carbon-icons-angular), [Vue](./packages/icons-vue), and [Svelte](https://github.com/IBM/carbon-icons-svelte) |
| [`@carbon/pictograms`](./packages/pictograms) | Pictogram assets. We also offer support in: [React](./packages/pictograms-react) and [Svelte](https://github.com/IBM/carbon-pictograms-svelte) |
| [`@carbon/layout`](./packages/layout) | Layout-based units and spacing scale |
| [`@carbon/motion`](./packages/motion) | Productive and expressive motion curves |
| [`@carbon/themes`](./packages/themes) | Color tokens available in the Carbon Design System, like `$interactive-01` |
| [`@carbon/type`](./packages/type) | New type tokens used alongside IBM Plex |
| Package name | Description |
| ----------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [`@carbon/react`](./packages/react) | React components and styles |
| [`@carbon/web-components`](./packages/web-components) | Web Components |
| [`@carbon/styles`](./packages/styles) | Sass styles for components |
| [`@carbon/elements`](./packages/elements) | IBM Design Language elements like colors, type, iconography, and more |
| [`@carbon/colors`](./packages/colors) | Work with IBM Design Language colors |
| [`@carbon/grid`](./packages/grid) | Build layouts using the new 16 column grid system |
| [`@carbon/icons`](./packages/icons) | Iconography assets. We also offer support in: [React](./packages/icons-react), [Angular](https://github.com/carbon-design-system/carbon-icons-angular), [Vue](./packages/icons-vue), and [Svelte](https://github.com/IBM/carbon-icons-svelte) |
| [`@carbon/pictograms`](./packages/pictograms) | Pictogram assets. We also offer support in: [React](./packages/pictograms-react) and [Svelte](https://github.com/IBM/carbon-pictograms-svelte) |
| [`@carbon/layout`](./packages/layout) | Layout-based units and spacing scale |
| [`@carbon/motion`](./packages/motion) | Productive and expressive motion curves |
| [`@carbon/themes`](./packages/themes) | Color tokens available in the Carbon Design System, like `$interactive-01` |
| [`@carbon/type`](./packages/type) | New type tokens used alongside IBM Plex |

## :books: Documentation

Expand Down Expand Up @@ -305,6 +306,7 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
<tr>
<td align="center"><a href="https://github.com/NabeelAyubee"><img src="https://avatars.githubusercontent.com/u/64087875?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Md Nabeel Ayubee</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=NabeelAyubee" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/pamrulla"><img src="https://avatars.githubusercontent.com/u/4942741?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Patan Amrulla Khan</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=pamrulla" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=pamrulla" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Neues"><img src="https://avatars.githubusercontent.com/u/9409245?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Sgorbati</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Code">💻</a> <a href="https://github.com/carbon-design-system/carbon/commits?author=Neues" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/divya-281"><img src="https://avatars.githubusercontent.com/u/72991264?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Divya G</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=divya-281" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/soumyaraju"><img src="https://avatars.githubusercontent.com/u/41182657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Soumya Raju</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=soumyaraju" title="Code">💻</a></td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions examples/class-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "class-prefix",
"private": true,
"version": "0.64.0",
"version": "0.65.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.69.0",
"version": "0.70.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite"
Expand All @@ -11,6 +11,6 @@
"vite": "^4.3.8"
},
"dependencies": {
"@carbon/styles": "^1.66.0"
"@carbon/styles": "^1.67.0-rc.0"
}
}
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "custom-theme",
"private": true,
"version": "0.65.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/id-prefix/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "id-prefix",
"private": true,
"version": "0.64.0",
"version": "0.65.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/light-dark-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-light-dark",
"private": true,
"version": "0.65.0",
"version": "0.66.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "examples-nextjs",
"private": true,
"version": "0.67.0",
"version": "0.68.0-rc.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"next": "14.1.1",
"react": "18.2.0",
"react-dom": "18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/v10-token-compat-in-v11/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "v10-token-compat-in-v11",
"private": true,
"version": "0.65.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "vite",
"private": true,
"version": "0.65.0",
"version": "0.66.0-rc.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/react": "^1.68.0-rc.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "carbon-components-react",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "8.67.0",
"version": "8.68.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -42,8 +43,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.67.0",
"@carbon/styles": "^1.66.0",
"@carbon/react": "^1.68.0-rc.0",
"@carbon/styles": "^1.67.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
5 changes: 3 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "carbon-components",
"private": true,
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences. This package reached end of support on September 30, 2024 and will not receive any more updates.",
"version": "11.66.0",
"version": "11.67.0-rc.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -43,7 +44,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.66.0",
"@carbon/styles": "^1.67.0-rc.0",
"@ibm/telemetry-js": "^1.5.0",
"chalk": "1.1.3"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/elements/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/elements",
"description": "A collection of design elements in code for the IBM Design Language",
"version": "11.54.0",
"version": "11.55.0-rc.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -40,10 +40,10 @@
"dependencies": {
"@carbon/colors": "^11.27.0",
"@carbon/grid": "^11.28.0",
"@carbon/icons": "^11.50.0",
"@carbon/icons": "^11.51.0-rc.0",
"@carbon/layout": "^11.27.0",
"@carbon/motion": "^11.23.0",
"@carbon/themes": "^11.41.0",
"@carbon/themes": "^11.42.0-rc.0",
"@carbon/type": "^11.32.0",
"@ibm/telemetry-js": "^1.5.0"
},
Expand Down
Loading

0 comments on commit e817c9f

Please sign in to comment.