Skip to content

Commit 3590116

Browse files
committed
finishing up button changes
1 parent 74aa9f8 commit 3590116

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

packages/components/Button/src/ButtonTokens.android.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
3434
},
3535
large: {
3636
paddingHorizontal: globalTokens.size200,
37-
paddingVertical: globalTokens.size120,
3837
borderRadius: globalTokens.corner.radius60,
3938
iconSize: 20,
4039
outline: {
@@ -43,12 +42,11 @@ export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
4342
},
4443
spacingIconContentBefore: globalTokens.size80,
4544
spacingIconContentAfter: globalTokens.size80,
46-
minHeight: 36,
45+
minHeight: 48,
4746
minWidth: 36,
4847
},
4948
medium: {
5049
paddingHorizontal: globalTokens.size120,
51-
paddingVertical: globalTokens.size80,
5250
borderRadius: globalTokens.corner.radius40,
5351
iconSize: 20,
5452
outline: {
@@ -62,7 +60,6 @@ export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
6260
},
6361
small: {
6462
paddingHorizontal: globalTokens.size80,
65-
paddingVertical: globalTokens.size40,
6663
borderRadius: globalTokens.corner.radius40,
6764
iconSize: 16,
6865
outline: {

packages/components/Button/src/ButtonTokens.ios.ts

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,66 +10,69 @@ export const defaultButtonTokens: TokenSettings<ButtonTokens, Theme> = () =>
1010
width: '100%',
1111
},
1212
medium: {
13-
padding: globalTokens.size80,
13+
paddingHorizontal: globalTokens.size120,
1414
borderWidth: globalTokens.stroke.width10,
15+
minHeight: 40,
1516
iconSize: 16,
1617
focused: {
1718
borderWidth: 0,
18-
padding: globalTokens.size100,
19+
padding: globalTokens.size120,
1920
},
2021
hasContent: {
2122
minWidth: 96,
22-
paddingHorizontal: globalTokens.size160 - globalTokens.stroke.width10,
23+
paddingHorizontal: globalTokens.size120,
2324
hasIconAfter: {
24-
spacingIconContentAfter: globalTokens.size100,
25+
spacingIconContentAfter: globalTokens.size80,
2526
},
2627
hasIconBefore: {
27-
spacingIconContentBefore: globalTokens.size100,
28+
spacingIconContentBefore: globalTokens.size80,
2829
},
2930
focused: {
30-
paddingHorizontal: globalTokens.size160,
31+
paddingHorizontal: globalTokens.size120,
3132
},
3233
},
3334
},
3435
small: {
35-
padding: globalTokens.size80 - globalTokens.stroke.width10,
36+
padding: globalTokens.size60,
3637
borderWidth: globalTokens.stroke.width10,
38+
minHeight: 28,
3739
iconSize: 16,
3840
focused: {
3941
borderWidth: 0,
40-
padding: globalTokens.size80,
42+
padding: globalTokens.size60,
4143
},
4244
hasContent: {
4345
minWidth: 64,
4446
minHeight: 24,
4547
paddingHorizontal: globalTokens.size120 - globalTokens.stroke.width10,
4648
hasIconAfter: {
47-
spacingIconContentAfter: globalTokens.size80,
49+
spacingIconContentAfter: globalTokens.size60,
4850
},
4951
hasIconBefore: {
50-
spacingIconContentBefore: globalTokens.size80,
52+
spacingIconContentBefore: globalTokens.size60,
5153
},
5254
focused: {
5355
paddingHorizontal: globalTokens.size120,
5456
},
5557
},
5658
},
5759
large: {
58-
padding: globalTokens.size120 - globalTokens.stroke.width10,
60+
paddingHorizontal: globalTokens.size160,
5961
borderWidth: globalTokens.stroke.width10,
62+
minHeight: 52,
6063
iconSize: 20,
6164
focused: {
6265
borderWidth: 0,
63-
padding: globalTokens.size120,
66+
padding: globalTokens.size160,
6467
},
6568
hasContent: {
6669
minWidth: 96,
67-
paddingHorizontal: globalTokens.size160 - globalTokens.stroke.width10,
70+
paddingHorizontal: globalTokens.size160,
6871
hasIconAfter: {
69-
spacingIconContentAfter: globalTokens.size100,
72+
spacingIconContentAfter: globalTokens.size80,
7073
},
7174
hasIconBefore: {
72-
spacingIconContentBefore: globalTokens.size100,
75+
spacingIconContentBefore: globalTokens.size80,
7376
},
7477
focused: {
7578
paddingHorizontal: globalTokens.size160,

0 commit comments

Comments
 (0)