Skip to content

Commit 6d4bbd9

Browse files
authored
refactor: use semantic disabled tokens in next components (#4529)
Replace incorrect use of --eds-color-border-medium and --eds-color-border-neutral-medium with the dedicated disabled state tokens (--eds-color-text-disabled, --eds-color-border-disabled, --eds-color-bg-fill-emphasis-disabled, --eds-color-bg-disabled) introduced in eds-tokens#4525.
1 parent 9416b83 commit 6d4bbd9

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

packages/eds-core-react/src/components/next/Button/button.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@
161161
}
162162

163163
.eds-button[data-variant='primary']:disabled {
164-
background-color: var(--eds-color-bg-fill-muted-default);
165-
color: var(--eds-color-border-medium);
164+
background-color: var(--eds-color-bg-fill-emphasis-disabled);
165+
color: var(--eds-color-text-disabled);
166166
cursor: not-allowed;
167167
}
168168

@@ -186,9 +186,9 @@
186186

187187
.eds-button[data-variant='secondary']:disabled {
188188
outline: var(--eds-border-width-default, 1px) solid
189-
var(--eds-color-border-medium);
189+
var(--eds-color-border-disabled);
190190
outline-offset: calc(-1 * var(--eds-border-width-default, 1px));
191-
color: var(--eds-color-border-medium);
191+
color: var(--eds-color-text-disabled);
192192
cursor: not-allowed;
193193
}
194194

@@ -208,7 +208,7 @@
208208
}
209209

210210
.eds-button[data-variant='ghost']:disabled {
211-
color: var(--eds-color-border-medium);
211+
color: var(--eds-color-text-disabled);
212212
cursor: not-allowed;
213213
}
214214

packages/eds-core-react/src/components/next/Checkbox/checkbox.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
}
147147

148148
.eds-checkbox[data-disabled='true'] .eds-checkbox__icon {
149-
fill: var(--eds-color-border-medium);
149+
fill: var(--eds-color-text-disabled);
150150
}
151151

152152
/* Icon visibility */
@@ -185,7 +185,7 @@
185185
}
186186

187187
.eds-field.eds-checkbox[data-disabled='true'] .eds-field__label {
188-
color: var(--eds-color-border-medium);
188+
color: var(--eds-color-text-disabled);
189189
cursor: not-allowed;
190190
}
191191

packages/eds-core-react/src/components/next/Field/field.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858

5959
/* Only helper message changes color when disabled */
6060
.eds-field[data-disabled='true'] {
61-
--_eds-field-helper-color: var(--eds-color-border-neutral-medium);
61+
--_eds-field-helper-color: var(--eds-color-text-disabled);
6262
}
6363
}

packages/eds-core-react/src/components/next/Input/input.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,23 @@
8080
outline-color: transparent;
8181

8282
& .eds-input {
83-
color: var(--eds-color-border-medium);
83+
color: var(--eds-color-text-disabled);
8484
cursor: not-allowed;
8585
opacity: 1;
8686
-webkit-text-fill-color: var(
87-
--eds-color-border-medium
87+
--eds-color-text-disabled
8888
); /* Safari autofill override */
8989

9090
&::placeholder {
91-
color: var(--eds-color-border-medium);
92-
-webkit-text-fill-color: var(--eds-color-border-medium);
91+
color: var(--eds-color-text-disabled);
92+
-webkit-text-fill-color: var(--eds-color-text-disabled);
9393
}
9494
}
9595

9696
& .eds-adornment__text,
9797
& .eds-adornment__adornment,
9898
& .eds-error-icon {
99-
color: var(--eds-color-border-medium);
99+
color: var(--eds-color-text-disabled);
100100
}
101101
}
102102

packages/eds-core-react/src/components/next/Radio/radio.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
}
144144

145145
.eds-radio[data-disabled='true'] .eds-radio__icon {
146-
fill: var(--eds-color-border-medium);
146+
fill: var(--eds-color-text-disabled);
147147
}
148148

149149
/* Icon visibility */
@@ -168,7 +168,7 @@
168168
}
169169

170170
.eds-field.eds-radio[data-disabled='true'] .eds-field__label {
171-
color: var(--eds-color-border-medium);
171+
color: var(--eds-color-text-disabled);
172172
cursor: not-allowed;
173173
}
174174
}

packages/eds-core-react/src/components/next/Switch/switch.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
}
5151

5252
&[data-disabled='true'] .eds-field__label {
53-
color: var(--eds-color-border-medium);
53+
color: var(--eds-color-text-disabled);
5454
cursor: not-allowed;
5555
}
5656
}
@@ -124,7 +124,7 @@
124124
}
125125

126126
.eds-switch:has(.eds-switch__input:disabled) & {
127-
background-color: var(--eds-color-border-medium);
127+
background-color: var(--eds-color-bg-disabled);
128128
box-shadow: none;
129129
}
130130
}

0 commit comments

Comments
 (0)