From 4f4d8ba17dfdfb9e5b97f8a366655909be461287 Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Sun, 15 May 2022 00:26:02 +0300 Subject: [PATCH 1/3] Fix typo Fixes a typo. --- docs/migration/v11.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migration/v11.md b/docs/migration/v11.md index 893b77a2a5a7..36090c1e581a 100644 --- a/docs/migration/v11.md +++ b/docs/migration/v11.md @@ -1919,7 +1919,7 @@ const { white, g10, g90, g100 } = v10; | — | layer-accent-hover-02 | layer-accent-hover | New | | — | layer-accent-hover-03 | layer-accent-hover | New | -### Compatability +### Compatibility To make it easier to move between v10 and v11 of Carbon, we've introduced a compatability theme that includes the tokens from v10 and v11 so that you can From 63d02ff4581950a89d608be5254c36af8851378a Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Sun, 15 May 2022 11:10:57 +0300 Subject: [PATCH 2/3] More typo fixes --- docs/migration/v11.md | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/docs/migration/v11.md b/docs/migration/v11.md index 36090c1e581a..90b92641384d 100644 --- a/docs/migration/v11.md +++ b/docs/migration/v11.md @@ -1038,13 +1038,13 @@ compatibility and flexibility to layout. - The underlying element has been changed from a checkbox (``) to a switch button (` - + + + ); } ``` @@ -1212,13 +1212,13 @@ import { TooltipIcon } from 'carbon-components-react'; function ExampleComponent() { return ( - { - // ... - }} - renderIcon={Filter} - /> + { + // ... + }} + renderIcon={Filter} + /> ); } ``` @@ -1230,13 +1230,13 @@ import { IconButton } from '@carbon/react'; function ExampleComponent() { return ( - { - // ... - }}> - - + { + // ... + }}> + + ); } ``` @@ -1324,12 +1324,12 @@ import { Add32, Add24, Add20, Add16 } from '@carbon/icons-react'; function MyComponent() { return ( - <> - - - - - + <> + + + + + ); } ``` @@ -1341,12 +1341,12 @@ import { Add } from '@carbon/icons-react'; function MyComponent() { return ( - <> - - - - - + <> + + + + + ); } ``` @@ -1420,7 +1420,7 @@ In this situation, you will need to update your code to use `React.forwardRef`: ```jsx ( - + ))} />; @@ -1733,7 +1733,7 @@ For full documentation, visit the - This package now requires Dart Sass and uses Sass Modules - Variables, mixins, and functions with the `carbon--` prefix have been renamed - Design Tokens have been changed, however you can use the - [compatability docs](#compatability) to use v10 tokens along with v11 tokens + [compatibility docs](#compatibility) to use v10 tokens along with v11 tokens - The `theme` mixin now emits CSS Custom Properties by default for the given theme, `$emit-custom-properties` and `$emit-difference` are no longer needed @@ -1762,7 +1762,7 @@ For full documentation, visit the | | `$carbon--theme--g10` | Renamed to `$g10` | | | `$carbon--theme--g90` | Renamed to`$g90` | | | `$carbon--theme--g100` | Renamed `$g100` | -| `scss/_tokens.scss` | | Tokens have been changed, use the compatability theme or switch to the [new tokens](#designtokens) | +| `scss/_tokens.scss` | | Tokens have been changed, use the compatibility theme or switch to the [new tokens](#designtokens) | | `scss/themes.scss` | | Moved to `@carbon/themes` | | `scss/index.scss` | | Moved to `@carbon/themes` | @@ -1922,10 +1922,10 @@ const { white, g10, g90, g100 } = v10; ### Compatibility To make it easier to move between v10 and v11 of Carbon, we've introduced a -compatability theme that includes the tokens from v10 and v11 so that you can +compatibility theme that includes the tokens from v10 and v11 so that you can incrementally update your project. -You can use a "compatability theme" by setting the `$fallback` to a value from +You can use a "compatibility theme" by setting the `$fallback` to a value from `scss/compat/themes`. For example: ```scss @@ -1938,7 +1938,7 @@ You can use a "compatability theme" by setting the `$fallback` to a value from ``` In this code snippet, we set the current theme to `$g100` and include the -compatability theme for `$g100` as the `$fallback. +compatibility theme for `$g100` as the `$fallback. ## @carbon/type From 8ac4a55a094b39bca881e6b6e2d43f37bb962c77 Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Sun, 15 May 2022 11:18:18 +0300 Subject: [PATCH 3/3] Fixup --- docs/migration/v11.md | 94 +++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/docs/migration/v11.md b/docs/migration/v11.md index 90b92641384d..8338f2ca3982 100644 --- a/docs/migration/v11.md +++ b/docs/migration/v11.md @@ -1038,13 +1038,13 @@ compatibility and flexibility to layout. - The underlying element has been changed from a checkbox (``) to a switch button (` - + + + ); } ``` @@ -1212,13 +1212,13 @@ import { TooltipIcon } from 'carbon-components-react'; function ExampleComponent() { return ( - { - // ... - }} - renderIcon={Filter} - /> + { + // ... + }} + renderIcon={Filter} + /> ); } ``` @@ -1230,13 +1230,13 @@ import { IconButton } from '@carbon/react'; function ExampleComponent() { return ( - { - // ... - }}> - - + { + // ... + }}> + + ); } ``` @@ -1324,12 +1324,12 @@ import { Add32, Add24, Add20, Add16 } from '@carbon/icons-react'; function MyComponent() { return ( - <> - - - - - + <> + + + + + ); } ``` @@ -1341,12 +1341,12 @@ import { Add } from '@carbon/icons-react'; function MyComponent() { return ( - <> - - - - - + <> + + + + + ); } ``` @@ -1420,7 +1420,7 @@ In this situation, you will need to update your code to use `React.forwardRef`: ```jsx ( - + ))} />;