Skip to content

Commit e46f58d

Browse files
authored
Restore "fix(wcag2.1): fix ntcc issues" (#5106) (#5109) (#5110)
This reverts commit e4dbeda.
1 parent 42e5c91 commit e46f58d

File tree

20 files changed

+37
-24
lines changed

20 files changed

+37
-24
lines changed

ui/components/button-icons/base/_index.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
*/
312312
.slds-button__icon_hint,
313313
.slds-button__icon--hint {
314-
fill: var(--slds-g-color-neutral-base-70, #{$color-text-icon-default-hint});
314+
fill: var(--slds-g-color-neutral-base-50, #{$color-text-icon-default-hint});
315315
}
316316

317317
/**
@@ -346,7 +346,7 @@
346346

347347
.slds-button__icon_hint,
348348
.slds-button__icon--hint {
349-
fill: var(--slds-g-color-neutral-base-50, #{$color-text-icon-default});
349+
fill: var(--slds-g-color-neutral-base-40, #{$color-text-icon-default});
350350
}
351351

352352
.slds-button__icon_inverse-hint,

ui/components/carousel/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
width: $carousel-indicator-width;
134134
height: $carousel-indicator-width;
135135
background: var(--slds-g-color-neutral-base-100, #{$carousel-indicator-color-background});
136-
border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
136+
border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
137137
border-radius: 50%;
138138

139139
/**

ui/components/checkbox-button/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
&.slds-checkbox-button_is-checked {
5454
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-button-brand-disabled});
5555
border-color: var(--slds-g-color-neutral-base-80, #{$color-border-button-brand-disabled});
56-
color: var(--slds-g-color-neutral-base-100, #{$color-text-button-brand-disabled}); // Controls icon fill, not meant for text, faux Styling Hooks
56+
color: var(--slds-g-color-neutral-base-80, #{$color-text-button-brand-disabled}); // Controls icon fill, not meant for text, faux Styling Hooks
5757
}
5858
}
5959

ui/components/checkbox-toggle/base/_index.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
// @todo consider shared hooks for inputs
225225
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-toggle-disabled});
226226
// @todo consider shared hooks for inputs
227-
border-color: var(--slds-g-color-neutral-base-60, #{$color-background-toggle}); // Prevents checked styles from bleeding through
227+
border-color: var(--slds-g-color-neutral-base-80, #{$color-background-toggle}); // Prevents checked styles from bleeding through
228228
pointer-events: none;
229229

230230
&:after {
@@ -247,7 +247,7 @@
247247

248248
&:before {
249249
// @todo consider shared hooks for inputs
250-
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-checkbox-disabled});
250+
background-color: var(--slds-g-color-neutral-base-90, #{$color-background-input-checkbox-disabled});
251251
}
252252

253253
&:after {

ui/components/checkbox/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
// @todo consider shared hooks for inputs
167167
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
168168
// @todo consider shared hooks for inputs
169-
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
169+
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
170170

171171
&:after {
172172
// @todo consider shared hooks for inputs

ui/components/combobox/base/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ input[readonly][role="combobox"] {
186186
}
187187

188188
&[aria-disabled="true"] {
189-
color: var(--slds-g-color-neutral-base-80, #{$color-text-button-default-disabled});
189+
color: var(--slds-g-color-neutral-base-50, #{$color-text-button-default-disabled});
190190
}
191191
}
192192

ui/components/data-tables/inline-edit/_index.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@
225225
&:focus .slds-button__icon--edit {
226226
opacity: 1;
227227
}
228+
229+
&[disabled],
230+
&:disabled {
231+
color: var(--slds-g-color-neutral-base-50, #{$color-text-icon-default});
232+
}
228233
}
229234

230235
/**

ui/components/dynamic-icons/trend/_index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $_icon-trend-one: 1.125px;
6969
}
7070

7171
.slds-icon-trend[data-slds-trend="neutral"] {
72-
color: var(--slds-g-color-neutral-base-60, #{$palette-neutral-60});
72+
color: var(--slds-g-color-neutral-base-50, #{$palette-neutral-60});
7373
}
7474

7575
.slds-icon-trend[data-slds-trend="up"] {

ui/components/file-selector/base/_index.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
.slds-file-selector__dropzone {
2323
padding: $spacing-xxx-small;
24-
border: $border-width-thin dashed var(--slds-g-color-border-base-1, #{$color-border});
24+
border: $border-width-thin dashed var(--slds-g-color-border-base-4, #{$color-border});
2525
border-radius: $border-radius-medium;
2626

2727
/**
@@ -51,12 +51,12 @@
5151
}
5252

5353
&[disabled] ~ .slds-file-selector__body {
54-
color: var(--slds-g-color-neutral-base-80, #{$color-text-button-default-disabled});
54+
color: var(--slds-g-color-neutral-base-10, #{$color-text-button-default-disabled});
5555

5656
> .slds-file-selector__button {
5757
background: var(--slds-g-color-neutral-base-95, #{$color-background-button-brand-disabled});
5858
border-color: var(--slds-g-color-neutral-base-80, #{$color-border-button-brand-disabled});
59-
color: var(--slds-g-color-neutral-base-100, #{$color-text-button-brand-disabled});
59+
color: var(--slds-g-color-neutral-base-30, #{$color-text-button-brand-disabled});
6060
}
6161

6262
> .slds-file-selector__body-icon {

ui/components/pills/base/_index.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,4 +232,12 @@
232232
color: var(--slds-c-pill-error-text-color, var(--sds-c-pill-error-text-color,
233233
var(--slds-g-color-error-base-40, #{$color-text-error})));
234234
}
235+
236+
&:hover {
237+
--slds-c-pill-error-text-color: var(--slds-g-color-error-base-30, #{$color-text-error});
238+
239+
.slds-pill__icon_container .slds-icon-text-error {
240+
--slds-c-icon-color-foreground: var(--slds-g-color-error-base-30, #{$color-text-error});
241+
}
242+
}
235243
}

0 commit comments

Comments
 (0)