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): Removed inverted color #1828

Merged
merged 5 commits into from
Apr 15, 2024
Merged

feat(Button): Removed inverted color #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f63c486
chore(Button): Remove use of inverted
Barsnes Apr 15, 2024
ed629a6
build css
Barsnes Apr 15, 2024
998c03d
Merge branch 'main' into button/-no-inverted
Barsnes Apr 15, 2024
897bf61
remove variant
Barsnes Apr 15, 2024
06aaf6c
inverted
Barsnes Apr 15, 2024
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
53 changes: 0 additions & 53 deletions packages/css/react-css-modules.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,6 @@
background-color: var(--fds-semantic-surface-danger-hover);
}

.fds-button-primary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-hover);
}

.fds-button-secondary-8fa00f0f:where(.fds-button-first-8fa00f0f):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-action-first-hover);

Expand Down Expand Up @@ -168,10 +162,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill-hover);
}

.fds-button-secondary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):hover {
background-color: var(--fds-semantic-surface-on_inverted-no_fill-hover);
}

.fds-button-tertiary-8fa00f0f:where(.fds-button-first-8fa00f0f):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-action-first-hover);

Expand All @@ -195,12 +185,6 @@

background-color: var(--fds-semantic-surface-danger-no_fill-hover);
}

.fds-button-tertiary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-hover);
}
}

/* Primary button colors */
Expand All @@ -220,12 +204,6 @@
background-color: var(--fds-semantic-surface-danger-default);
}

.fds-button-primary-8fa00f0f:where(.fds-button-inverted-8fa00f0f) {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-default);
}

.fds-button-primary-8fa00f0f:where(.fds-button-first-8fa00f0f):not([aria-disabled='true'], :disabled):active {
background-color: var(--fds-semantic-surface-action-first-active);
}
Expand All @@ -242,12 +220,6 @@
background-color: var(--fds-semantic-surface-danger-active);
}

.fds-button-primary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-active);
}

/* Secondary button colors */
.fds-button-secondary-8fa00f0f:where(.fds-button-first-8fa00f0f) {
--fc-button-color: var(--fds-semantic-text-action-first-default);
Expand Down Expand Up @@ -277,13 +249,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill);
}

.fds-button-secondary-8fa00f0f:where(.fds-button-inverted-8fa00f0f) {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

border: 1px solid var(--fds-semantic-border-on_inverted-default);
background-color: transparent;
}

.fds-button-secondary-8fa00f0f:where(.fds-button-first-8fa00f0f):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-action-first-active);

Expand Down Expand Up @@ -312,12 +277,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill-active);
}

.fds-button-secondary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-active);
}

/* Tertiary button colors */
.fds-button-tertiary-8fa00f0f:where(.fds-button-first-8fa00f0f) {
--fc-button-color: var(--fds-semantic-text-action-first-default);
Expand All @@ -335,12 +294,6 @@
--fc-button-color: var(--fds-semantic-text-danger-default);
}

.fds-button-tertiary-8fa00f0f:where(.fds-button-inverted-8fa00f0f) {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: transparent;
}

.fds-button-tertiary-8fa00f0f:where(.fds-button-first-8fa00f0f):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-action-first-active);

Expand All @@ -364,12 +317,6 @@

background-color: var(--fds-semantic-surface-danger-no_fill-active);
}

.fds-button-tertiary-8fa00f0f:where(.fds-button-inverted-8fa00f0f):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-active);
}
}

@layer fds.paragraph {
Expand Down
53 changes: 0 additions & 53 deletions packages/react/src/components/Button/Button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@
background-color: var(--fds-semantic-surface-danger-hover);
}

.primary:where(.inverted):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-hover);
}

.secondary:where(.first):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-action-first-hover);

Expand Down Expand Up @@ -141,10 +135,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill-hover);
}

.secondary:where(.inverted):not([aria-disabled='true'], :disabled):hover {
background-color: var(--fds-semantic-surface-on_inverted-no_fill-hover);
}

.tertiary:where(.first):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-action-first-hover);

Expand All @@ -168,12 +158,6 @@

background-color: var(--fds-semantic-surface-danger-no_fill-hover);
}

.tertiary:where(.inverted):not([aria-disabled='true'], :disabled):hover {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-hover);
}
}

/* Primary button colors */
Expand All @@ -193,12 +177,6 @@
background-color: var(--fds-semantic-surface-danger-default);
}

.primary:where(.inverted) {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-default);
}

.primary:where(.first):not([aria-disabled='true'], :disabled):active {
background-color: var(--fds-semantic-surface-action-first-active);
}
Expand All @@ -215,12 +193,6 @@
background-color: var(--fds-semantic-surface-danger-active);
}

.primary:where(.inverted):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-default);

background-color: var(--fds-semantic-surface-on_inverted-active);
}

/* Secondary button colors */
.secondary:where(.first) {
--fc-button-color: var(--fds-semantic-text-action-first-default);
Expand Down Expand Up @@ -250,13 +222,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill);
}

.secondary:where(.inverted) {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

border: 1px solid var(--fds-semantic-border-on_inverted-default);
background-color: transparent;
}

.secondary:where(.first):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-action-first-active);

Expand Down Expand Up @@ -285,12 +250,6 @@
background-color: var(--fds-semantic-surface-danger-no_fill-active);
}

.secondary:where(.inverted):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-active);
}

/* Tertiary button colors */
.tertiary:where(.first) {
--fc-button-color: var(--fds-semantic-text-action-first-default);
Expand All @@ -308,12 +267,6 @@
--fc-button-color: var(--fds-semantic-text-danger-default);
}

.tertiary:where(.inverted) {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: transparent;
}

.tertiary:where(.first):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-action-first-active);

Expand All @@ -337,10 +290,4 @@

background-color: var(--fds-semantic-surface-danger-no_fill-active);
}

.tertiary:where(.inverted):not([aria-disabled='true'], :disabled):active {
--fc-button-color: var(--fds-semantic-text-neutral-on_inverted);

background-color: var(--fds-semantic-surface-on_inverted-no_fill-active);
}
}
8 changes: 1 addition & 7 deletions packages/react/src/components/Button/Button.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@ import type { ButtonProps } from './Button';
import { Button } from './Button';

const sizes: ButtonProps['size'][] = ['small', 'medium', 'large'];
const colors: ButtonProps['color'][] = [
'first',
'second',
'success',
'danger',
'inverted',
];
const colors: ButtonProps['color'][] = ['first', 'second', 'success', 'danger'];
const variants: ButtonProps['variant'][] = ['primary', 'secondary', 'tertiary'];

const user = userEvent.setup();
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/components/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export type ButtonProps = {
/** Specify which variant to use */
variant?: 'primary' | 'secondary' | 'tertiary';
/** Specify which color palette to use */
color?: 'first' | 'second' | 'success' | 'danger' | 'inverted';
color?: 'first' | 'second' | 'success' | 'danger';
/** Size */
size?: 'small' | 'medium' | 'large';
/** If `Button` should fill full width of its container */
Expand Down
Loading