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

Jump to bottom

Change disabled colors #2966

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Change disabled colors #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2b5627
Change disabled colors
vvalentin-lucca Jul 18, 2024
b9f93cd
Only for textfields
vvalentin-lucca Jul 18, 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
4 changes: 2 additions & 2 deletions packages/ng/core-select/option/option.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
@include optionItemStyle;

.is-disabled {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
user-select: none;
cursor: default;

&.is-selected {
background-color: var(--palettes-neutral-100);
background-color: var(--commons-disabled-background);
}

&:hover {
Expand Down
5 changes: 3 additions & 2 deletions packages/ng/date/calendar/calendar-input.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@

&:focus-visible {
@include a11y.focusVisible($borderRadius: var(--commons-borderRadius-L));

z-index: 1;
}

Expand All @@ -137,11 +138,11 @@

&.is-disabled,
&[disabled] {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
pointer-events: none;

&:hover .calendar-grid-item-content {
background-color: var(--palettes-neutral-0);
background-color: var(--palettes-neutral-0); // disabled token candidate
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/option/item/option-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
@include optionItemStyle;

.is-disabled {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
user-select: none;
cursor: default;

&.is-selected {
background-color: var(--palettes-neutral-100);
background-color: var(--commons-disabled-background);
}

&:hover {
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/option/item/tree-option-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
}

.is-disabled {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
user-select: none;
cursor: default;

&.is-selected {
background-color: var(--palettes-neutral-100);
background-color: var(--commons-disabled-background);
}

&:hover {
Expand Down
2 changes: 1 addition & 1 deletion packages/ng/styles/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}

&.is-disabled {
color: var(--palettes-neutral-400);
color: var(--commons-disabled-placeholder);
pointer-events: none;

&:hover {
Expand Down
8 changes: 4 additions & 4 deletions packages/ng/styles/definitions/option/_option-item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@
}

&.is-disabled {
--components-options-checkbox-border-color: var(--palettes-neutral-500);
--components-options-checkbox-border-color: var(--palettes-neutral-500); // disabled token candidate

&.is-selected {
--components-options-checkbox-color: var(--palettes-neutral-100);
background: transparent;
--components-options-checkbox-color: var(--commons-disabled-background);
background-color: transparent;

&::after {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ng/styles/definitions/select/_select-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

&[disabled],
&.is-disabled {
cursor: not-allowed;
cursor: not-allowed; // disabled token candidate
pointer-events: all;
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/scss/src/commons/config.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ $elevation: (
),
);

// opacity is deprecated
$disabled: (
'opacity': 0.4,
'background': 'var(--palettes-neutral-100)',
Expand Down Expand Up @@ -592,4 +593,5 @@ $textLink: (
color: var(--palettes-product-700),
hover: var(--palettes-product-600),
disabled: var(--palettes-neutral-500),
// disabled token candidate
);
2 changes: 1 addition & 1 deletion packages/scss/src/components/actionIcon/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@lucca-front/scss/src/components/loading/exports' as loading;

@mixin disabled {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
pointer-events: none;
cursor: default;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/scss/src/components/button/component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

&:disabled {
--components-button-cursor: default;
--components-button-color: var(--palettes-neutral-500);
--components-button-color: var(--palettes-neutral-500); // disabled token candidate
--components-button-backgroundColor: var(--commons-disabled-background);
--components-button-pointerEvents: none;

Expand Down
6 changes: 3 additions & 3 deletions packages/scss/src/components/button/mods.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

@mixin textDisabled {
--components-button-backgroundColor: transparent;
--components-button-color: var(--palettes-neutral-500);
--components-button-color: var(--palettes-neutral-500); // disabled token candidate
}

@mixin text {
Expand All @@ -83,8 +83,8 @@

@mixin outlinedDisabled {
--components-button-backgroundColor: var(--palettes-neutral-0);
--components-button-boxShadow: 0 0 0 1px var(--palettes-neutral-400);
--components-button-color: var(--palettes-neutral-500);
--components-button-boxShadow: 0 0 0 1px var(--commons-disabled-placeholder);
--components-button-color: var(--palettes-neutral-500); // disabled token candidate
}

@mixin outlined {
Expand Down
4 changes: 2 additions & 2 deletions packages/scss/src/components/button/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

@mixin disabled {
--components-button-cursor: default;
--components-button-color: var(--palettes-neutral-500);
--components-button-color: var(--palettes-neutral-500); // disabled token
--components-button-backgroundColor: var(--commons-disabled-background);
--components-button-pointerEvents: none;

Expand All @@ -21,7 +21,7 @@
@mixin loading {
@include loading.spinner(var(--components-button-font-size));

--components-button-opacity: var(--commons-disabled-opacity);
--components-button-opacity: 0.4;
--components-button-pointerEvents: none;
--components-button-color: transparent;
--components-button-userSelect: none;
Expand Down
4 changes: 2 additions & 2 deletions packages/scss/src/components/buttonGroup/mods.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
box-shadow: 0 0 0 1px var(--palettes-400, var(--palettes-neutral-400));

&:is(.is-disabled, .disabled) {
box-shadow: 0 0 0 1px var(--palettes-neutral-200);
box-shadow: 0 0 0 1px var(--palettes-neutral-200); // disabled token candidate
}

.button {
Expand All @@ -25,7 +25,7 @@
}

&:is([disabled], .is-disabled) {
box-shadow: 0 0 0 1px var(--palettes-neutral-200);
box-shadow: 0 0 0 1px var(--palettes-neutral-200); // disabled token candidate
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions packages/scss/src/components/checkbox/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@

@mixin disabled {
~ .checkbox-label {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
cursor: default;

&::before {
border-color: var(--palettes-neutral-500);
border-color: var(--palettes-neutral-500); // disabled token candidate
}

.checkbox-label-helper {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
}
}

&:checked ~ .checkbox-label {
&::before {
color: var(--palettes-neutral-500);
background-color: var(--palettes-neutral-100);
border-color: var(--palettes-neutral-100);
color: var(--palettes-neutral-500); // disabled token candidate
background-color: var(--commons-disabled-background);
border-color: var(--commons-disabled-background);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/scss/src/components/checkboxField/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@

@mixin checkedDisabled {
~ .checkboxField-icon {
background-color: var(--palettes-neutral-100);
border-color: var(--palettes-neutral-100);
color: var(--palettes-neutral-500);
background-color: var(--commons-disabled-background);
border-color: var(--commons-disabled-background);
color: var(--palettes-neutral-500); // disabled token candidate
}
}

Expand Down Expand Up @@ -77,7 +77,7 @@
cursor: default;

~ .checkboxField-icon {
border-color: var(--palettes-neutral-500);
border-color: var(--palettes-neutral-500); // disabled token candidate
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/scss/src/components/chip/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@mixin disabled {
background: var(--palettes-neutral-100);
color: var(--palettes-neutral-500);
background-color: var(--commons-disabled-background);
color: var(--palettes-neutral-500); // disabled token candidate

.chip-kill {
display: none;
Expand Down
4 changes: 2 additions & 2 deletions packages/scss/src/components/clear/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin disabled {
--components-clear-cross-color: var(--palettes-neutral-500);
--components-clear-background: var(--palettes-neutral-300);
--components-clear-cross-color: var(--palettes-neutral-500); // disabled token candidate
--components-clear-background: var(--palettes-neutral-300); // disabled token candidate
}
6 changes: 3 additions & 3 deletions packages/scss/src/components/field/mods.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@

.textfield-input {
&:not(:disabled, .is-error, .is-success, .is-valid, .is-warning, .is-invalid) {
background-color: var(--palettes-neutral-0);
background-color: var(--palettes-neutral-0); // disabled token candidate

&::placeholder {
color: var(--palettes-neutral-400);
color: var(--commons-disabled-placeholder);
}

&:focus,
&:hover {
position: relative;
z-index: 1;
background-color: var(--palettes-neutral-0);
background-color: var(--palettes-neutral-0); // disabled token candidate
box-shadow: form.fakeBorderOverlay(var(--components-field-framed-color));

~ .textfield-messages,
Expand Down
4 changes: 2 additions & 2 deletions packages/scss/src/components/field/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
}

@mixin inputDisabled {
color: var(--palettes-neutral-500);
cursor: not-allowed;
color: var(--palettes-neutral-500); // disabled token candidate
cursor: not-allowed; // disabled token candidate
}

@mixin inputState($state) {
Expand Down
6 changes: 3 additions & 3 deletions packages/scss/src/components/file/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@mixin disabled {
&,
&::file-selector-button {
cursor: not-allowed;
cursor: not-allowed; // disabled token candidate
}

~ .file-content {
.file-title,
.file-or,
.file-formats,
.file-button {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
}
}
}
Expand Down Expand Up @@ -92,7 +92,7 @@
&:hover,
&:focus,
&:active {
cursor: not-allowed;
cursor: not-allowed; // disabled token candidate
box-shadow: 0 0 0 1px inset;
background-color: transparent;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/scss/src/components/formLabel/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
}

@mixin disabled {
--components-formLabel-color: var(--palettes-neutral-500);
--components-formLabel-color: var(--palettes-neutral-500); // disabled token candidate
--components-formLabel-cursor: default;
}
18 changes: 9 additions & 9 deletions packages/scss/src/components/inlineMessage/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@mixin success {
--components-inlineMessage-icon-color: var(--palettes-success-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);
--components-inlineMessage-icon-color: var(--palettes-success-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);

.lucca-icon {
&::before {
Expand All @@ -11,8 +11,8 @@
}

@mixin warning {
--components-inlineMessage-icon-color: var(--palettes-warning-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);
--components-inlineMessage-icon-color: var(--palettes-warning-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);

.lucca-icon {
&::before {
Expand All @@ -23,9 +23,9 @@
}

@mixin error {
--components-inlineMessage-icon-color: var(--palettes-error-700);
--components-inlineMessage-color: var(--palettes-error-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);
--components-inlineMessage-icon-color: var(--palettes-error-700);
--components-inlineMessage-color: var(--palettes-error-700);
--components-inlineMessage-gap: var(--pr-t-spacings-50);

.lucca-icon {
&::before {
Expand All @@ -36,6 +36,6 @@
}

@mixin disabled {
--components-inlineMessage-icon-color: var(--palettes-neutral-500);
--components-inlineMessage-color: var(--palettes-neutral-500);
--components-inlineMessage-icon-color: var(--palettes-neutral-500); // disabled token candidate
--components-inlineMessage-color: var(--palettes-neutral-500); // disabled token candidate
}
2 changes: 1 addition & 1 deletion packages/scss/src/components/link/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin disabled {
color: var(--commons-text-link-disabled);
cursor: not-allowed;
cursor: not-allowed; // disabled token candidate
}
2 changes: 1 addition & 1 deletion packages/scss/src/components/menu/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// .label is deprecated
&,
.label {
color: var(--palettes-neutral-500);
color: var(--palettes-neutral-500); // disabled token candidate
pointer-events: none;
}

Expand Down
8 changes: 4 additions & 4 deletions packages/scss/src/components/multiSelect/states.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
}

@mixin disabled {
--components-multiSelect-border-color: var(--palettes-neutral-300);
--components-multiSelect-background: var(--palettes-neutral-100);
--components-multiSelect-placeholder: var(--palettes-neutral-400);
--components-multiSelect-arrow-color: var(--palettes-neutral-500);
--components-multiSelect-border-color: var(--palettes-neutral-300); // disabled token candidate
--components-multiSelect-background: var(--commons-disabled-background);
--components-multiSelect-placeholder: var(--commons-disabled-placeholder);
--components-multiSelect-arrow-color: var(--palettes-neutral-500); // disabled token candidate
pointer-events: none;
}

Expand Down
Loading