Skip to content

Commit cbb8fa9

Browse files
feat(styles): add component tokens to button, tag (#9663)
* feat(styles): add component tokens to button, tag * fix(button): updated test Co-authored-by: Scott Strubberg <sstrubberg@us.ibm.com>
1 parent f6c98cf commit cbb8fa9

File tree

6 files changed

+1170
-690
lines changed

6 files changed

+1170
-690
lines changed

packages/carbon-react/.storybook/styles.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
@use '../scss/components/tag';
1414

1515
:root {
16-
@include styles.theme(styles.$white, button.$white, tag.$white);
16+
@include styles.theme(styles.$white);
1717
}
1818

1919
[data-carbon-theme='g10'] {
20-
@include styles.theme(styles.$g10, button.$g10, tag.$g10);
20+
@include styles.theme(styles.$g10);
2121
}
2222

2323
[data-carbon-theme='g90'] {
24-
@include styles.theme(styles.$g90, button.$g90, tag.$g90);
24+
@include styles.theme(styles.$g90);
2525
}
2626

2727
[data-carbon-theme='g100'] {
28-
@include styles.theme(styles.$g100, button.$g100, tag.$g100);
28+
@include styles.theme(styles.$g100);
2929
}
3030

3131
body {

packages/styles/scss/components/__tests__/button-test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ Array [
3939
"button-padding-ghost-sm",
4040
"button-border-width",
4141
"button-outline-width",
42-
"white",
43-
"g10",
44-
"g90",
45-
"g100",
4642
"button-separator",
4743
"button-primary",
4844
"button-secondary",
@@ -58,6 +54,7 @@ Array [
5854
"button-secondary-hover",
5955
"button-tertiary-hover",
6056
"button-disabled",
57+
"button-tokens",
6158
]
6259
`);
6360
});

packages/styles/scss/components/button/_index.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
@forward 'vars';
99
@forward 'button';
1010
@forward 'tokens';
11+
12+
@use '../../theme';
1113
@use 'button';
14+
@use 'tokens';
1215

16+
@include theme.add-component-tokens(tokens.$button-tokens);
1317
@include button.button;

0 commit comments

Comments
 (0)