Skip to content

Commit

Permalink
Merge branch 'main' into text-area-style-audit
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Feb 23, 2022
2 parents 180ed53 + 8c5e1dc commit fe30070
Show file tree
Hide file tree
Showing 165 changed files with 1,841 additions and 1,248 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/rfdc-npm-1.1.4-3df7c90272-475a7936c4.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions config/eslint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "eslint-config-carbon",
"description": "ESLint configuration for Carbon",
"version": "2.10.0",
"version": "2.11.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -38,7 +38,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^25.3.0",
"eslint-plugin-jest": "^26.0.0",
"eslint-plugin-jsdoc": "^36.0.3",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
Expand Down
2 changes: 1 addition & 1 deletion config/stylelint-config-carbon/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "stylelint-config-carbon",
"description": "Stylelint configuration for Carbon",
"version": "1.7.0",
"version": "1.8.0-rc.0",
"license": "Apache-2.0",
"main": "index.js",
"repository": {
Expand Down
132 changes: 0 additions & 132 deletions docs/migration/11.x-color.md

This file was deleted.

55 changes: 55 additions & 0 deletions docs/migration/11.x-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Type

> **Note:** The Carbon v11 release is currently in beta release. Be on the
> lookout for the public preview release available in the coming months.
## Type tokens

**Status key:**

- **No change:** Token name has no change between versions.
- **Updated:** This is just a name change, the role remains the same between v10
and v11.
- **New:** A net new type token to the system in v11. It has no v10 counterpart.
- **Deprecated:** v10 token was removed in v11.

| Category | V10 token name | V11 token name | Status |
| -------------------- | ----------------------- | ------------------ | ---------- |
| Utility styles | code-01 | code-01 | No change |
| | code-02 | code-02 | No change |
| | label-01 | label-01 | No change |
| | label-02 | label-02 | No change |
| | helper-text-01 | helper-text-01 | No change |
| | helper-text-02 | helper-text-02 | No change |
| | | legal-01 | New |
| | | legal-02 | New |
| | caption-01 | | Deprecated |
| | caption-02 | | Deprecated |
| Body styles | | | |
| | body-short-01 | body-compact-01 | Updated |
| | body-short-02 | body-compact-02 | Updated |
| | body-long-01 | body-01 | Updated |
| | body-long-02 | body-02 | Updated |
| Fixed heading styles | | | |
| | productive-heading-01 | heading-compact-01 | Updated |
| | productive-heading-02 | heading-compact-02 | Updated |
| | expressive-heading-01 | heading-01 | Updated |
| | expressive-heading-02 | heading-02 | Updated |
| | productive-heading-03 | heading-03 | Updated |
| | productive-heading-04 | heading-04 | Updated |
| | productive-heading-05 | heading-05 | Updated |
| | productive-heading-06 | heading-06 | Updated |
| | productive-heading-07 | heading-07 | Updated |
| Fluid heading styles | | | |
| | expressive-heading-03 | fluid-heading-03 | Updated |
| | expressive-heading-04 | fluid-heading-04 | Updated |
| | expressive-heading-05 | fluid-heading-05 | Updated |
| | expressive-heading-06 | fluid-heading-06 | Updated |
| Fluid display styles | | | |
| | expressive-paragraph-01 | fluid-paragraph-01 | Updated |
| | quotation-01 | fluid-quotation-01 | Updated |
| | quotation-02 | fluid-quotation-02 | Updated |
| | display-01 | fluid-display-01 | Updated |
| | display-02 | fluid-display-02 | Updated |
| | display-03 | fluid-display-03 | Updated |
| | display-04 | fluid-display-04 | Updated |
Loading

0 comments on commit fe30070

Please sign in to comment.