Skip to content

fix: button styles #1752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cooper-joe wants to merge 1 commit into
base: master
Choose a base branch
from
+107 −22
Open

fix: button styles #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions components/button/src/button/button.prod.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,3 +303,67 @@ Loading.parameters = {
},
},
}

const variantComparisonRows = [
{ label: 'Basic', props: {} },
{ label: 'Primary', props: { primary: true } },
{ label: 'Secondary', props: { secondary: true } },
{ label: 'Destructive', props: { destructive: true } },
{
label: 'Destructive secondary',
props: { destructive: true, secondary: true },
},
]

const variantComparisonColumns = [
{ label: 'Default', children: 'Label', props: {} },
{
label: 'W icon',
children: 'Label',
props: { icon: DemoIcon24 },
},
{
label: 'Small',
children: 'Label',
props: { small: true },
},
{
label: 'Small w icon',
children: 'Label',
props: { small: true, icon: DemoIcon16 },
},
{
label: 'Loading',
children: 'Loading...',
props: { loading: true },
},
]

export const VariantComparison = () => (
<div
style={{
display: 'grid',
gridTemplateColumns: 'repeat(5, max-content)',
alignItems: 'center',
gap: '12px 16px',
}}
>
{variantComparisonRows.map(({ label: rowLabel, props: rowProps }) => (
<React.Fragment key={rowLabel}>
{variantComparisonColumns.map(
({ label: columnLabel, children, props: columnProps }) => (
<Button
key={`${rowLabel}-${columnLabel}`}
name={`${rowLabel} ${columnLabel} button`}
{...rowProps}
{...columnProps}
>
{children}
</Button>
)
)}
</React.Fragment>
))}
</div>
)
VariantComparison.storyName = 'Variant comparison'
65 changes: 43 additions & 22 deletions components/button/src/button/button.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default css`
justify-content: center;
border-radius: 4px;
font-weight: 400;
letter-spacing: 0.5px;
letter-spacing: 0.4px;
text-decoration: none;
cursor: pointer;
user-select: none;
Expand Down Expand Up @@ -49,7 +49,8 @@ export default css`
text-decoration: none;
}

button:hover {
button:hover,
button:focus:hover {
border-color: ${colors.grey500};
background-color: ${colors.grey200};
}
Expand Down Expand Up @@ -91,28 +92,36 @@ export default css`
.primary {
border-color: ${theme.primary800};
background: linear-gradient(180deg, #1565c0 0%, #0650a3 100%);
box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.35) inset;
--button-icon-filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.2))
drop-shadow(0 0px 1px rgba(0, 0, 0, 0.2));
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0px 1px rgba(0, 0, 0, 0.2);
background-color: #2b61b3;
color: ${colors.white};
fill: ${colors.white};
font-weight: 500;
font-weight: 400;
}

.primary:hover {
.primary:hover,
.primary:focus:hover {
border-color: ${theme.primary800};
background: linear-gradient(180deg, #054fa3 0%, #034793 100%);
background-color: #21539f;
}

.primary:active,
.primary:active:focus {
background: linear-gradient(180deg, #054fa3 0%, #034793 100%);
background-color: #1c4a90;
box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18) inset;
border-color: ${theme.primary800};
background: linear-gradient(180deg, #034793 0%, #033c7a 100%);
background-color: #033c7a;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.28) inset,
0 0 0 1px rgba(0, 0, 0, 0.24) inset;
}

.primary:focus {
background: ${colors.blue800};
border-color: ${colors.blue900};
background: linear-gradient(180deg, #1565c0 0%, #0650a3 100%);
background-color: #2b61b3;
border-color: ${theme.primary800};
outline-offset: -5px;
}

Expand All @@ -129,14 +138,15 @@ export default css`
background-color: transparent;
}

.secondary:hover {
.secondary:hover,
.secondary:focus:hover {
border-color: rgba(74, 87, 104, 0.5);
background-color: rgba(160, 173, 186, 0.05);
}

.secondary:active,
.secondary:active:focus {
background-color: rgba(160, 173, 186, 0.2);
background-color: rgba(160, 173, 186, 0.1);
box-shadow: none;
}

Expand All @@ -156,12 +166,17 @@ export default css`
border-color: #a10b0b;
background: linear-gradient(180deg, #d32f2f 0%, #b71c1c 100%);
background-color: #b9242b;
box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.35) inset;
--button-icon-filter: drop-shadow(0 1px 2px rgba(0, 0, 0, 0.2))
drop-shadow(0 0px 1px rgba(0, 0, 0, 0.4));
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0px 1px rgba(0, 0, 0, 0.4);
color: ${colors.white};
fill: ${colors.white};
font-weight: 500;
font-weight: 400;
}

.destructive:hover {
.destructive:hover,
.destructive:focus:hover {
border-color: #a10b0b;
background: linear-gradient(180deg, #b81c1c 0%, #b80c0b 100%);
background-color: #ac0f1a;
Expand Down Expand Up @@ -190,12 +205,16 @@ export default css`
.destructive.secondary {
border-color: rgba(74, 87, 104, 0.25);
background: transparent;
box-shadow: none;
--button-icon-filter: none;
text-shadow: none;
color: ${colors.red700};
fill: ${colors.red700};
font-weight: 400;
}

.destructive.secondary:hover {
.destructive.secondary:hover,
.destructive.secondary:focus:hover {
border-color: ${colors.red600};
background: ${colors.red050};
color: ${colors.red800};
Expand All @@ -204,8 +223,8 @@ export default css`

.destructive.secondary:active,
.destructive.secondary:active:focus {
background: ${colors.red100};
border-color: ${colors.red700};
background: rgba(211, 47, 47, 0.08);
border-color: ${colors.red600};
box-shadow: none;
}

Expand All @@ -220,20 +239,21 @@ export default css`
padding: 0 0 0 5px;
}

button:has(.button-icon):not(.icon-only):not(.small) {
padding-inline-start: 8px;
}

.button-icon {
margin-inline-end: 6px;
margin-inline-end: 5px;
color: inherit;
fill: inherit;
display: inline-flex;
align-items: center;
justify-content: center;
filter: var(--button-icon-filter, none);
pointer-events: none;
}

.icon-only .button-icon {
margin-inline-end: 5px;
}

.small.icon-only {
padding-block: 0;
padding-inline-start: 5px;
Expand All @@ -259,7 +279,8 @@ export default css`
background: ${colors.grey800};
}

.toggled:hover {
.toggled:hover,
.toggled:focus:hover {
background: ${colors.grey800};
border-color: ${colors.grey900};
}
Expand Down
Loading