Skip to content

fix(components): improve dark-mode error message contrast #2489

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
amir-ba wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(components): improve dark-mode error message contrast #2489

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
10 changes: 8 additions & 2 deletions packages/components/src/components/checkbox/checkbox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,17 @@ scale-icon-alert-error {

/* :host(.error) [part='helper-text'], */
scale-checkbox.error [part='helper-text'] {
color: var(--telekom-color-text-and-icon-functional-danger);
color: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
}

scale-checkbox.error [part='helper-text'] scale-icon-alert-error {
color: var(--telekom-color-text-and-icon-functional-danger);
color: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
}

/* :host(.error) [part='checkbox'], */
Expand Down
14 changes: 14 additions & 0 deletions packages/components/src/components/checkbox/checkbox.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,18 @@ describe('scale-checkbox', () => {
const element = await page.find('scale-checkbox');
expect(element).toHaveClass('hydrated');
});

it('uses the dark-mode danger helper text color', async () => {
const page = await newE2EPage();
await page.setContent(
'<div data-mode="dark"><scale-checkbox label="Label" helper-text="This is the error message" invalid></scale-checkbox></div>'
);

const color = await page.$eval(
'scale-checkbox [part="helper-text"]',
(element: HTMLElement) => getComputedStyle(element).color
);
Comment on lines +23 to +31

expect(color).toBe('rgb(251, 106, 85)');
});
});
9 changes: 6 additions & 3 deletions packages/components/src/components/combobox/combobox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

/*listbox*/
--background-listbox: var(--telekom-color-background-surface);
--box-shadow-listbox: 0 2px 4px 0 rgba(0, 0, 0, 0.1),
0 4px 16px 0 rgba(0, 0, 0, 0.1);
--box-shadow-listbox:
0 2px 4px 0 rgba(0, 0, 0, 0.1), 0 4px 16px 0 rgba(0, 0, 0, 0.1);
--max-height-listbox: 300px;
--z-index-listbox: 99;

Expand Down Expand Up @@ -186,7 +186,10 @@
--telekom-color-text-and-icon-functional-informational
);
--color-warning: var(--telekom-color-text-and-icon-functional-warning);
--color-danger: var(--telekom-color-text-and-icon-functional-danger);
--color-danger: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
--color-success: var(--telekom-color-text-and-icon-functional-success);
--color-neutral: var(--telekom-color-text-and-icon-additional);
--font-size: var(--telekom-typography-font-size-small);
Expand Down
5 changes: 4 additions & 1 deletion packages/components/src/components/helper-text/helper-text.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
--telekom-color-text-and-icon-functional-informational
);
--color-warning: var(--telekom-color-text-and-icon-functional-warning);
--color-danger: var(--telekom-color-text-and-icon-functional-danger);
--color-danger: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
--color-success: var(--telekom-color-text-and-icon-functional-success);
--color-neutral: var(--telekom-color-text-and-icon-additional);
--font-size: 0.75rem;
Expand Down
17 changes: 17 additions & 0 deletions packages/components/src/components/helper-text/helper-text.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,21 @@ describe('scale-helper-text', () => {
const element = await page.find('scale-helper-text');
expect(element).toHaveClass('hydrated');
});

it('uses the dark-mode danger token', async () => {
const page = await newE2EPage();
await page.setContent(
'<div data-mode="dark"><scale-helper-text variant="danger">default</scale-helper-text></div>'
);

const color = await page.$eval(
'scale-helper-text',
(element: HTMLElement) =>
getComputedStyle(
element.shadowRoot.querySelector('.helper-text') as HTMLElement
).color
Comment on lines +28 to +33
);

expect(color).toBe('rgb(251, 106, 85)');
Comment on lines +28 to +36
});
});
16 changes: 12 additions & 4 deletions packages/components/src/components/input/input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@
(
var(--telekom-spacing-composition-space-14) -
var(--telekom-typography-font-size-body)
) / 2
) /
2
)
);
font-weight: var(--telekom-typography-font-weight-medium);
Expand All @@ -182,10 +183,16 @@
var(--telekom-color-functional-danger-standard);
}
.input--status-error .input__helper-text {
color: var(--telekom-color-text-and-icon-functional-danger);
color: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
}
.input--status-error .input__counter {
color: var(--telekom-color-text-and-icon-functional-danger);
color: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
}
.input--size-small .input__input {
height: var(--telekom-spacing-composition-space-12);
Expand Down Expand Up @@ -214,7 +221,8 @@
(
var(--telekom-spacing-composition-space-12) -
var(--telekom-typography-font-size-body)
) / 2
) /
2
)
);
font-weight: var(--telekom-typography-font-weight-medium);
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/components/radio-button-group/radio-button-group.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
/*helper-text--status-error*/
--font-size-error-helper-text: var(--telekom-typography-font-size-small);
--color-error-helper-text: var(
--telekom-color-text-and-icon-functional-danger
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
--padding-bottom-error-helper-text: var(
--telekom-spacing-composition-space-04
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/components/radio-button/radio-button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ scale-radio-button {
);
--spacing-top-helper-text: var(--telekom-spacing-composition-space-03);
--color-helper-text-error: var(
--telekom-color-text-and-icon-functional-danger
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);
/*label*/
--transition-label: var(--transition);
Expand Down
34 changes: 26 additions & 8 deletions packages/components/src/components/text-field/text-field.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ scale-text-field {
--line-height-meta: var(--telekom-typography-line-spacing-standard);
--spacing-y-meta: var(--telekom-spacing-composition-space-03);
--color-meta: var(--telekom-color-text-and-icon-standard);
--color-meta-error: var(--telekom-color-text-and-icon-functional-danger);
--color-meta-error: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);

/* control */
/*
Expand All @@ -67,7 +70,10 @@ scale-text-field {
--color-helper-text: var(
--telekom-color-text-and-icon-functional-informational
);
--color-helper-text-error: var(--color-meta-error);
--color-helper-text-error: var(
--scl-color-form-error-message,
var(--color-meta-error)
);
Comment on lines +73 to +76
--color-helper-text-success: var(
--telekom-color-text-and-icon-functional-success
);
Expand Down Expand Up @@ -208,23 +214,35 @@ scale-text-field {
border: var(--border-warning);
}

.text-field--variant-danger:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-danger:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:hover,
.text-field--variant-danger:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-danger:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:focus {
border-color: var(--telekom-color-functional-danger-hovered);
}

.text-field--variant-success:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-success:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:hover,
.text-field--variant-success:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-success:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:focus {
border-color: var(--telekom-color-functional-success-hovered);
}

.text-field--variant-warning:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-warning:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:hover,
.text-field--variant-warning:not(.text-field--disabled):not(.text-field--readonly)
.text-field--variant-warning:not(.text-field--disabled):not(
.text-field--readonly
)
.text-field__control:focus {
border-color: var(--telekom-color-functional-warning-hovered);
}
Expand Down
9 changes: 7 additions & 2 deletions packages/components/src/components/textarea/textarea.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ scale-textarea {
--line-height-meta: var(--telekom-typography-line-spacing-standard);
--spacing-y-meta: var(--telekom-spacing-composition-space-03);
--color-meta: var(--telekom-color-text-and-icon-standard);
--color-meta-error: var(--telekom-color-text-and-icon-functional-danger);
--color-meta-error: var(
--scl-color-form-error-message,
var(--telekom-color-text-and-icon-functional-danger)
);

/*control*/
/*
Expand Down Expand Up @@ -173,7 +176,9 @@ scale-textarea {

.textarea--status-error:not(.textarea--disabled):not(.textarea--readonly)
.textarea__wrapper:hover,
.textarea--status-error:not(.textarea--disabled):not(.textarea--readonly).textarea--has-focus
.textarea--status-error:not(.textarea--disabled):not(
.textarea--readonly
).textarea--has-focus
.textarea__wrapper {
border-color: var(--telekom-color-functional-danger-hovered);
}
Expand Down
23 changes: 23 additions & 0 deletions packages/components/src/global/scale.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
--scl-z-index-50: 50;
--scl-z-index-60: 60;
--scl-z-index-70: 70;
--scl-color-form-error-message: var(
--telekom-color-text-and-icon-functional-danger
);
/* TODO: we can try to set this rule in design tokens :root */
color-scheme: light dark;
}
Expand All @@ -73,9 +76,29 @@
}

[data-mode='light'] {
--scl-color-form-error-message: var(
--telekom-color-text-and-icon-functional-danger
);
color-scheme: light;
}

[data-mode='dark'] {
--scl-color-form-error-message: var(
--telekom-color-text-and-icon-on-subtle-danger
);
color-scheme: dark;
}

@media (prefers-color-scheme: dark) {
:root {
--scl-color-form-error-message: var(
--telekom-color-text-and-icon-on-subtle-danger
);
}

[data-mode='light'] {
--scl-color-form-error-message: var(
--telekom-color-text-and-icon-functional-danger
);
}
}
Loading