Skip to content
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

feat(Button): update interactive styles for tertiary buttons #1970

Merged
merged 1 commit into from
May 31, 2024
Merged

feat(Button): update interactive styles for tertiary buttons #1970

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
22 changes: 8 additions & 14 deletions src/components/Button/Button-v2.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
}
}

/* TODO-AH: EDS-1344 confirm color: var(--eds-theme-color-text-utility-interactive-secondary-hover) and -active */
.button--secondary.button--variant-neutral {
color: var(--eds-theme-color-text-utility-default-secondary);
border-color: currentColor;
Expand All @@ -216,18 +217,19 @@
}
}

/* TODO-AH: EDS-1344 confirm color: var(--eds-theme-color-text-utility-interactive-secondary-hover) and -active */
.button--tertiary.button--variant-neutral {
color: var(--eds-theme-color-text-utility-default-secondary);
border-color: transparent;
background-color: var(--eds-theme-color-background-utility-default-no-emphasis);

&:hover {
border-color: var(--eds-theme-color-background-utility-default-no-emphasis-hover);
border-color: var(--eds-theme-color-background-utility-default-medium-emphasis-hover);
background-color: var(--eds-theme-color-background-utility-default-no-emphasis-hover);
}

&:active {
border-color: var(--eds-theme-color-background-utility-default-no-emphasis-active);
border-color: var(--eds-theme-color-background-utility-default-medium-emphasis-active);
background-color: var(--eds-theme-color-background-utility-default-no-emphasis-active);
}
}
Expand Down Expand Up @@ -314,7 +316,7 @@
}

.button--tertiary.button--variant-default:hover {
border-color: var(--eds-theme-color-background-utility-interactive-no-emphasis-hover);
border-color: var(--eds-theme-color-border-utility-interactive-hover);
}

.button--variant-critical:hover {
Expand All @@ -331,7 +333,7 @@
}

.button--tertiary.button--variant-critical:hover {
border-color: var(--eds-theme-color-background-utility-critical-no-emphasis-hover);
border-color: var(--eds-theme-color-border-utility-critical-hover);
}

.button--primary.button--variant-inverse:hover {
Expand All @@ -344,7 +346,7 @@
}

.button--tertiary.button--variant-inverse:hover {
border-color: var(--eds-theme-color-background-utility-inverse-no-emphasis-hover);
border-color: var(--eds-theme-color-border-utility-inverse);
}

.button--tertiary.button--context-standalone:hover {
Expand All @@ -366,7 +368,7 @@
}

.button--tertiary.button--variant-default:active {
border-color: var(--eds-theme-color-background-utility-interactive-no-emphasis-active);
border-color: var(--eds-theme-color-border-utility-interactive-active);
}

.button--variant-critical:active {
Expand All @@ -382,14 +384,6 @@
border-color: var(--eds-theme-color-border-utility-critical-active);
}

.button--tertiary.button--variant-critical:active {
border-color: var(--eds-theme-color-background-utility-critical-no-emphasis-active);
}

.button--primary.button--variant-inverse:active {
background-color: var(--eds-theme-color-background-utility-inverse-high-emphasis-active);
}

.button--secondary.button--variant-inverse:active,
.button--tertiary.button--variant-inverse:active {
background-color: var(--eds-theme-color-background-utility-inverse-no-emphasis-active);
Expand Down
10 changes: 5 additions & 5 deletions src/components/Button/Button-v2.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ function ExtendedButton(args: ExtendArgs) {
* Steps to use:
*
* * import `ButtonProps`
* * use the type param. to augment the types for `Button` with the libraries type, e.g., `type ExtendedProps = ButtonProps<typeof CustomButton>;`
* * use the type param. to augment the types for `Button` with the libraries type, e.g., `type ExtendedProps = ButtonProps<CustomButtonProps>;`
* * Now export a new function component that uses the new prop type and returns a composed function
*
* When using this pattern, you likely want to also specify the library's Button component using `as`
*
* ```tsx
* type ExtendedProps = ButtonProps<typeof CustomButton>;
* type ExtendedProps = ButtonProps<CustomButtonType>;
*
* export default function Button({children, ...other}: ExtendedProps) {
* return (
Expand All @@ -235,12 +235,12 @@ function ExtendedButton(args: ExtendArgs) {
export const UsingExtendedLink: StoryObj<ExtendArgs> = {
render: (args) => (
<div>
Lorem ipsum dolor sit amet,{' '}
Lorem ipsum dolor sit amet, . Morbi porta at ante quis molestie. Nam
scelerisque id diam at iaculis. Nullam sit amet iaculis erat. Nulla id
tellus ante.{' '}
<ExtendedButton {...args} to="test">
consectetur adipiscing elit
</ExtendedButton>
. Morbi porta at ante quis molestie. Nam scelerisque id diam at iaculis.
Nullam sit amet iaculis erat. Nulla id tellus ante.{' '}
</div>
),
};
4 changes: 1 addition & 3 deletions src/components/Button/__snapshots__/Button-v2.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ exports[`<Button /> (v2) TertiaryStandalone story renders snapshot 1`] = `

exports[`<Button /> (v2) UsingExtendedLink story renders snapshot 1`] = `
<div>
Lorem ipsum dolor sit amet,
Lorem ipsum dolor sit amet, . Morbi porta at ante quis molestie. Nam scelerisque id diam at iaculis. Nullam sit amet iaculis erat. Nulla id tellus ante.

<button
class="button button--layout-none button--primary button--lg button--variant-default"
Expand All @@ -567,8 +567,6 @@ exports[`<Button /> (v2) UsingExtendedLink story renders snapshot 1`] = `
consectetur adipiscing elit
</span>
</button>
. Morbi porta at ante quis molestie. Nam scelerisque id diam at iaculis. Nullam sit amet iaculis erat. Nulla id tellus ante.

</div>
`;

Expand Down
Loading