Skip to content

Commit

Permalink
Merge branch 'main' into readonlyTimePicker
Browse files Browse the repository at this point in the history
  • Loading branch information
lee-chase authored Nov 1, 2022
2 parents 4d3d1d5 + 9cb3ddb commit 79ed298
Show file tree
Hide file tree
Showing 99 changed files with 3,170 additions and 6,068 deletions.
36 changes: 36 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,42 @@
"contributions": [
"code"
]
},
{
"login": "torresga",
"name": "G. Torres",
"avatar_url": "https://avatars.githubusercontent.com/u/6892410?v=4",
"profile": "http://torresga.github.io/",
"contributions": [
"code"
]
},
{
"login": "FionaDL",
"name": "Fiona",
"avatar_url": "https://avatars.githubusercontent.com/u/28625558?v=4",
"profile": "https://github.com/FionaDL",
"contributions": [
"code"
]
},
{
"login": "kindoflew",
"name": "kindoflew",
"avatar_url": "https://avatars.githubusercontent.com/u/70274722?v=4",
"profile": "https://lewisdavanzo.com/",
"contributions": [
"code"
]
},
{
"login": "mgueyraud",
"name": "Mario Gueyraud",
"avatar_url": "https://avatars.githubusercontent.com/u/9916318?v=4",
"profile": "https://github.com/mgueyraud",
"contributions": [
"code"
]
}
],
"commitConvention": "none"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/QUESTION.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ body:
- type: markdown
attributes:
value:
"For non-IBMer's, you can ask a question on our [Github Discussions
"For non-IBMer's, you can ask a question on our [GitHub Discussions
board](https://github.com/carbon-design-system/carbon/discussions/new)
or join [our Discord server](https://discord.gg/KAECRaWdzE) to chat with
Carbon maintainers and fellow community members."
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,10 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/hannelevaltanen"><img src="https://avatars.githubusercontent.com/u/26527460?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hannele Valtanen</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=hannelevaltanen" title="Code">💻</a></td>
<td align="center"><a href="http://torresga.github.io/"><img src="https://avatars.githubusercontent.com/u/6892410?v=4?s=100" width="100px;" alt=""/><br /><sub><b>G. Torres</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=torresga" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/FionaDL"><img src="https://avatars.githubusercontent.com/u/28625558?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fiona</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=FionaDL" title="Code">💻</a></td>
<td align="center"><a href="https://lewisdavanzo.com/"><img src="https://avatars.githubusercontent.com/u/70274722?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kindoflew</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=kindoflew" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/mgueyraud"><img src="https://avatars.githubusercontent.com/u/9916318?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mario Gueyraud</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mgueyraud" title="Code">💻</a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion docs/experimental-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ to stable:
- [ ] All files have a copyright banner
- [ ] All components exported in `src/index.js` and should not be `unstable_`
prefixed
- [ ] Component has a label in the github repository
- [ ] Component has a label in the GitHub repository
- [ ] Component should be documented on the website
- [ ] Component should have a usage, style, and code tab
- [ ] Component may have a component demo
Expand Down
12 changes: 6 additions & 6 deletions docs/guides/setup/contributing-with-github-desktop.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Contributing to Carbon using Github Desktop
# Contributing to Carbon using GitHub Desktop

## Initial Setup

1. Download and install [Github Desktop](https://desktop.github.com/)
2. Run the Github Desktop application
1. Download and install [GitHub Desktop](https://desktop.github.com/)
2. Run the GitHub Desktop application
3. Click the button labeled 'Sign in to github.com'. This will open your browser
and take you to an authorization page.
4. Click the 'Authorize desktop' button, which may prompt you for your
Expand All @@ -18,22 +18,22 @@
create a copy of the repository and add it to your account. This is where
you'll make changes and later request the repository you forked pull those
changes from (more on that later).
9. Back in the Github Desktop application click the button labeled 'Clone a
9. Back in the GitHub Desktop application click the button labeled 'Clone a
repository from the internet...'
10. In the modal that pops up you can search your account for the fork you made.
Once you've selected the right repository click the blue button labeled
'Clone...' in the bottom right corner of the modal.
11. The _next_ modal is a confirmation screen where you can double check the URL
of your fork and select where on your computer you'd like to clone the
repository.
12. Once the Github Application is done cloning your repository select that you
12. Once the GitHub Application is done cloning your repository select that you
intend 'To contribute to the parent project' and then click the button
labeled 'Continue'. You are now ready to work.

## Basic workflow

1. First things first we need to create a "working" branch. At the top of the
Github Desktop application click the drop down labeled 'Current branch'
GitHub Desktop application click the drop down labeled 'Current branch'
2. Click the button labeled 'New branch' and then name your branch. Typically
this will be a general description of the work you're doing. Maybe
'updating-accessibility-docs' or 'adding-security-pictograms'. Then click
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ If they are, remove the question label, label as a `type: enhancement 💡` or
<details>
<summary>Is there a duplicate question?</summary>

We tend to recieve more questions through Slack than through Github so with any
We tend to recieve more questions through Slack than through GitHub so with any
incoming question issues, search in both places to see if it has already been
answered. If you can find an answer, point the author to where they can find it
and close the issue.
Expand Down Expand Up @@ -389,7 +389,7 @@ that can be particularly helpful:
### Alerting a team or subject matter expert

Sometimes an issue comes in that is highly technical or about subject matter
you're unfamiliar with. Nothing wrong with that! Using Github ping system you
you're unfamiliar with. Nothing wrong with that! Using GitHub ping system you
can alert specific sub-teams on Carbon:

- @carbon-design-system/design
Expand Down
2 changes: 1 addition & 1 deletion docs/migration/v11.md
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ const { white, g10, g90, g100 } = v10;
| inverse-01 | icon-inverse || Split |
| inverse-01 | focus-inset || Split |
| inverse-01 | text-inverse || Split |
| inverse-02 | "background-inverse " || Updated |
| inverse-02 | background-inverse || Updated |
| inverse-focus-ui | focus-inverse || Updated |
| inverse-hover-ui | background-inverse-hover || Updated |
| inverse-link | link-inverse || Updated |
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "codesandbox-styles",
"private": true,
"version": "0.19.0-rc.0",
"version": "0.19.0",
"scripts": {
"develop": "vite"
},
"devDependencies": {
"vite": "^2.8.0"
},
"dependencies": {
"@carbon/styles": "^1.16.0-rc.0",
"@carbon/styles": "^1.16.0",
"sass": "^1.51.0"
}
}
4 changes: 2 additions & 2 deletions examples/codesandbox-with-sass-compilation/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox-with-sass-compilation",
"version": "0.17.0-rc.0",
"version": "0.17.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codesandbox",
"version": "0.17.0-rc.0",
"version": "0.17.0",
"private": true,
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "custom-theme",
"private": true,
"version": "0.14.0-rc.0",
"version": "0.14.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/incremental-migration/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "incremental-migration",
"private": true,
"version": "0.16.0-rc.0",
"version": "0.16.0",
"scripts": {
"build": "next build",
"dev": "next dev",
Expand All @@ -13,7 +13,7 @@
},
"dependencies": {
"@carbon/icons-react": "^10.49.0",
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"carbon-components": "^10.57.0",
"carbon-components-react": "^7.57.0",
"carbon-icons": "^7.0.7",
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.14.0-rc.0",
"version": "0.14.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.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.16.0-rc.0",
"version": "0.16.0",
"scripts": {
"build": "next build",
"dev": "next dev",
"lint": "next lint",
"start": "next start"
},
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"next": "12.1.4",
"react": "18.0.0",
"react-dom": "18.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vite",
"private": true,
"version": "0.14.0-rc.0",
"version": "0.14.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"react": "^17.0.0",
"react-dom": "^17.0.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/carbon-components-react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components-react",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "8.16.0-rc.0",
"version": "8.16.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -39,8 +39,8 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/react": "^1.16.0-rc.0",
"@carbon/styles": "^1.16.0-rc.0",
"@carbon/react": "^1.16.0",
"@carbon/styles": "^1.16.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/carbon-components/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "carbon-components",
"description": "The Carbon Design System is IBM’s open-source design system for products and experiences.",
"version": "11.16.0-rc.0",
"version": "11.16.0",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -40,7 +40,7 @@
"sass": "^1.33.0"
},
"dependencies": {
"@carbon/styles": "^1.16.0-rc.0",
"@carbon/styles": "^1.16.0",
"@carbon/telemetry": "0.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/colors/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@carbon/colors",
"description": "Colors for digital and software products using the Carbon Design System",
"version": "11.7.0-rc.0",
"version": "11.7.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
8 changes: 4 additions & 4 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.13.0-rc.0",
"version": "11.13.0",
"license": "Apache-2.0",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down Expand Up @@ -35,13 +35,13 @@
"clean": "rimraf es lib umd"
},
"dependencies": {
"@carbon/colors": "^11.7.0-rc.0",
"@carbon/colors": "^11.7.0",
"@carbon/grid": "^11.7.0",
"@carbon/icons": "^11.10.0",
"@carbon/layout": "^11.7.0",
"@carbon/motion": "^11.5.0",
"@carbon/themes": "^11.11.0-rc.0",
"@carbon/type": "^11.11.0-rc.0"
"@carbon/themes": "^11.11.0",
"@carbon/type": "^11.11.0"
},
"devDependencies": {
"@carbon/cli": "^11.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ Array [
"moderate01",
"moderate02",
"motion",
"notificationTokens",
"orange",
"orange40",
"orange60",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/.storybook/Welcome/Welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const Welcome = () => {
href="https://github.com/carbon-design-system/carbon/tree/main/packages/react"
className="welcome__link"
renderIcon={ArrowRight}>
Github repo
GitHub repo
</Link>
</Stack>
</div>
Expand Down
5 changes: 5 additions & 0 deletions packages/react/.storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import React from 'react';
import { breakpoints } from '@carbon/layout';
import { GlobalTheme } from '../src/components/Theme';

import theme from './theme';

export const globalTypes = {
locale: {
name: 'Locale',
Expand Down Expand Up @@ -87,6 +89,9 @@ export const parameters = {
darkMode: {
current: 'light',
},
docs: {
theme,
},
// Small (<672)
// Medium (672 - 1056px)
// Large (1056 - 1312px)
Expand Down
Loading

0 comments on commit 79ed298

Please sign in to comment.