Skip to content
This repository was archived by the owner on Aug 2, 2024. It is now read-only.

Commit 09f5f53

Browse files
authored
Merge pull request #99 from decentdao/decent-1867-button-text-style-fix
fix text styles on buttons
2 parents 4907815 + cb5352f commit 09f5f53

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

design/tokens/components/button/theme/button.sizes.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
export default {
22
lg: {
3-
apply: 'utility-styles-button-large',
3+
apply: 'button-large',
44
height: '4.5rem',
55
padding: '1.5rem 2.5rem'
66
},
77
base: {
8-
apply: 'utility-styles-button-base',
8+
apply: 'button-base',
99
height: '2.75rem',
1010
padding: '0.75rem 1rem',
1111
},
1212
sm: {
13-
apply: 'utility-styles-button-small',
13+
apply: 'button-small',
1414
height: '1.875rem',
1515
padding: '0.25rem .5rem'
1616
},
1717
'icon-lg': {
18-
apply: 'utility-styles-icon-button-large',
18+
apply: 'button-large',
1919
height: '2.5rem',
2020
width: '2.5rem',
2121
borderRadius: '0.5rem'
2222
},
2323
'icon-md': {
24-
apply: 'utility-styles-icon-button-base',
24+
apply: 'button-base',
2525
height: '1.75rem',
2626
width: '1.75rem',
2727
borderRadius: '0.25rem'
2828
},
2929
'icon-sm': {
30-
apply: 'utility-styles-icon-button-small',
30+
apply: 'button-small',
3131
height: '1.5rem',
3232
width: '1.5rem',
3333
borderRadius: '0.25rem'

design/tokens/components/iconButton/theme/iconButton.sizes.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
export default {
22
'lg': {
3-
apply: 'utility-styles-icon-button-large',
3+
apply: 'button-large',
44
height: '2rem',
55
width: '2rem',
66
padding: '0.5rem',
77
borderRadius: '0.5rem'
88
},
99
'base': {
10-
apply: 'utility-styles-icon-button-base',
10+
apply: 'button-base',
1111
height: '1.5rem',
1212
width: '1.5rem',
1313
padding: '0.25rem',
1414
borderRadius: '0.25rem'
1515
},
1616
'sm': {
17-
apply: 'utility-styles-icon-button-small',
17+
apply: 'button-small',
1818
height: '1.25rem',
1919
width: '1.25rem',
2020
padding: '0.25rem',
2121
borderRadius: '0.25rem'
2222
},
2323
'icon-lg': {
24-
apply: 'utility-styles-icon-button-large',
24+
apply: 'button-large',
2525
height: '2rem',
2626
width: '2rem',
2727
padding: '0.5rem',
2828
borderRadius: '0.5rem'
2929
},
3030
'icon-md': {
31-
apply: 'utility-styles-icon-button-base',
31+
apply: 'button-base',
3232
height: '1.5rem',
3333
width: '1.5rem',
3434
padding: '0.25rem',
3535
borderRadius: '0.25rem'
3636
},
3737
'icon-sm': {
38-
apply: 'utility-styles-icon-button-small',
38+
apply: 'button-small',
3939
height: '1.25rem',
4040
width: '1.25rem',
4141
padding: '0.25rem',

design/tokens/stories/components/DisplayTypography.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function DisplayTypography() {
3232
<Text textStyle="label-large" color="grayscale.400">
3333
{fontProperty}:
3434
</Text>
35-
<Text>{value}</Text>
35+
<Text>{JSON.stringify(value)}</Text>
3636
</Flex>
3737
)
3838
})}

0 commit comments

Comments
 (0)