Skip to content

Commit ccd9b2d

Browse files
committed
fix(Button): optimize styles * 6
1 parent e99efe9 commit ccd9b2d

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

src/components/actions/Button/Button.stories.tsx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,17 @@ const TemplateStates: StoryFn<CubeButtonProps> = ({
156156
>
157157
{label || 'Focused'}
158158
</Button>
159+
<Button
160+
{...props}
161+
isDisabled
162+
mods={{
163+
hovered: false,
164+
pressed: false,
165+
focused: false,
166+
}}
167+
>
168+
{label || 'Disabled'}
169+
</Button>
159170
{['outline', 'neutral', 'clear'].includes(props.type) || !props.type ? (
160171
<Button
161172
{...props}
@@ -169,17 +180,6 @@ const TemplateStates: StoryFn<CubeButtonProps> = ({
169180
{label || 'Selected'}
170181
</Button>
171182
) : null}
172-
<Button
173-
{...props}
174-
isDisabled
175-
mods={{
176-
hovered: false,
177-
pressed: false,
178-
focused: false,
179-
}}
180-
>
181-
{label || 'Disabled'}
182-
</Button>
183183
</Space>
184184
);
185185

@@ -244,6 +244,17 @@ const DarkTemplateStates: StoryFn<CubeButtonProps> = ({
244244
>
245245
{label || 'Focused'}
246246
</Button>
247+
<Button
248+
{...props}
249+
isDisabled
250+
mods={{
251+
hovered: false,
252+
pressed: false,
253+
focused: false,
254+
}}
255+
>
256+
{label || 'Disabled'}
257+
</Button>
247258
{['outline', 'neutral'].includes(props.type) || !props.type ? (
248259
<Button
249260
{...props}
@@ -257,17 +268,6 @@ const DarkTemplateStates: StoryFn<CubeButtonProps> = ({
257268
{label || 'Selected'}
258269
</Button>
259270
) : null}
260-
<Button
261-
{...props}
262-
isDisabled
263-
mods={{
264-
hovered: false,
265-
pressed: false,
266-
focused: false,
267-
}}
268-
>
269-
{label || 'Disabled'}
270-
</Button>
271271
</Space>
272272
);
273273

src/components/actions/Button/Button.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,9 @@ export const SPECIAL_NEUTRAL_STYLES: Styles = {
489489
},
490490
fill: {
491491
'': '#white.0',
492-
hovered: '#white.18',
493-
'pressed | selected | [disabled]': '#white.12',
492+
hovered: '#white.12',
493+
'pressed | selected': '#white.18',
494+
'[disabled]': 'white.12',
494495
},
495496
color: {
496497
'': '#white',

0 commit comments

Comments
 (0)