Merge branch 'main' into release/v10.44.0-rc.0

carbon-design-system · Sep 15, 2021 · 39c1124 · 39c1124
2 parents 2fc50ea + cbb8fa9
commit 39c1124
Show file tree

Hide file tree

Showing 6 changed files with 1,170 additions and 690 deletions.
diff --git a/packages/carbon-react/.storybook/styles.scss b/packages/carbon-react/.storybook/styles.scss
@@ -13,19 +13,19 @@
 @use '../scss/components/tag';
 
 :root {
-  @include styles.theme(styles.$white, button.$white, tag.$white);
+  @include styles.theme(styles.$white);
 }
 
 [data-carbon-theme='g10'] {
-  @include styles.theme(styles.$g10, button.$g10, tag.$g10);
+  @include styles.theme(styles.$g10);
 }
 
 [data-carbon-theme='g90'] {
-  @include styles.theme(styles.$g90, button.$g90, tag.$g90);
+  @include styles.theme(styles.$g90);
 }
 
 [data-carbon-theme='g100'] {
-  @include styles.theme(styles.$g100, button.$g100, tag.$g100);
+  @include styles.theme(styles.$g100);
 }
 
 body {

diff --git a/packages/styles/scss/components/__tests__/button-test.js b/packages/styles/scss/components/__tests__/button-test.js
@@ -39,10 +39,6 @@ Array [
   "button-padding-ghost-sm",
   "button-border-width",
   "button-outline-width",
-  "white",
-  "g10",
-  "g90",
-  "g100",
   "button-separator",
   "button-primary",
   "button-secondary",
@@ -58,6 +54,7 @@ Array [
   "button-secondary-hover",
   "button-tertiary-hover",
   "button-disabled",
+  "button-tokens",
 ]
 `);
   });

diff --git a/packages/styles/scss/components/button/_index.scss b/packages/styles/scss/components/button/_index.scss
@@ -8,6 +8,10 @@
 @forward 'vars';
 @forward 'button';
 @forward 'tokens';
+
+@use '../../theme';
 @use 'button';
+@use 'tokens';
 
+@include theme.add-component-tokens(tokens.$button-tokens);
 @include button.button;