Skip to content

Commit

Permalink
Revert "fix(wcag2.1): fix ntcc issues (#5106)" (#5109)
Browse files Browse the repository at this point in the history
This reverts commit 1411308.
  • Loading branch information
Dottenpixel committed Dec 16, 2022
1 parent 1411308 commit e4dbeda
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 37 deletions.
4 changes: 2 additions & 2 deletions ui/components/button-icons/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
*/
.slds-button__icon_hint,
.slds-button__icon--hint {
fill: var(--slds-g-color-neutral-base-50, #{$color-text-icon-default-hint});
fill: var(--slds-g-color-neutral-base-70, #{$color-text-icon-default-hint});
}

/**
Expand Down Expand Up @@ -346,7 +346,7 @@

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

.slds-button__icon_inverse-hint,
Expand Down
2 changes: 1 addition & 1 deletion ui/components/carousel/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
width: $carousel-indicator-width;
height: $carousel-indicator-width;
background: var(--slds-g-color-neutral-base-100, #{$carousel-indicator-color-background});
border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
border-radius: 50%;

/**
Expand Down
2 changes: 1 addition & 1 deletion ui/components/checkbox-button/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
&.slds-checkbox-button_is-checked {
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-button-brand-disabled});
border-color: var(--slds-g-color-neutral-base-80, #{$color-border-button-brand-disabled});
color: var(--slds-g-color-neutral-base-80, #{$color-text-button-brand-disabled}); // Controls icon fill, not meant for text, faux Styling Hooks
color: var(--slds-g-color-neutral-base-100, #{$color-text-button-brand-disabled}); // Controls icon fill, not meant for text, faux Styling Hooks
}
}

Expand Down
4 changes: 2 additions & 2 deletions ui/components/checkbox-toggle/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
// @todo consider shared hooks for inputs
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-toggle-disabled});
// @todo consider shared hooks for inputs
border-color: var(--slds-g-color-neutral-base-80, #{$color-background-toggle}); // Prevents checked styles from bleeding through
border-color: var(--slds-g-color-neutral-base-60, #{$color-background-toggle}); // Prevents checked styles from bleeding through
pointer-events: none;

&:after {
Expand All @@ -247,7 +247,7 @@

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

&:after {
Expand Down
2 changes: 1 addition & 1 deletion ui/components/checkbox/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
// @todo consider shared hooks for inputs
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
// @todo consider shared hooks for inputs
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});

&:after {
// @todo consider shared hooks for inputs
Expand Down
2 changes: 1 addition & 1 deletion ui/components/combobox/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ input[readonly][role="combobox"] {
}

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

Expand Down
5 changes: 0 additions & 5 deletions ui/components/data-tables/inline-edit/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@
&:focus .slds-button__icon--edit {
opacity: 1;
}

&[disabled],
&:disabled {
color: var(--slds-g-color-neutral-base-50, #{$color-text-icon-default});
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ui/components/dynamic-icons/trend/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $_icon-trend-one: 1.125px;
}

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

.slds-icon-trend[data-slds-trend="up"] {
Expand Down
6 changes: 3 additions & 3 deletions ui/components/file-selector/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
.slds-file-selector__dropzone {
padding: $spacing-xxx-small;
border: $border-width-thin dashed var(--slds-g-color-border-base-4, #{$color-border});
border: $border-width-thin dashed var(--slds-g-color-border-base-1, #{$color-border});
border-radius: $border-radius-medium;

/**
Expand Down Expand Up @@ -51,12 +51,12 @@
}

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

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

> .slds-file-selector__body-icon {
Expand Down
8 changes: 0 additions & 8 deletions ui/components/pills/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,4 @@
color: var(--slds-c-pill-error-text-color, var(--sds-c-pill-error-text-color,
var(--slds-g-color-error-base-40, #{$color-text-error})));
}

&:hover {
--slds-c-pill-error-text-color: var(--slds-g-color-error-base-30, #{$color-text-error});

.slds-pill__icon_container .slds-icon-text-error {
--slds-c-icon-color-foreground: var(--slds-g-color-error-base-30, #{$color-text-error});
}
}
}
2 changes: 1 addition & 1 deletion ui/components/popovers/walkthrough/_deprecate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

.slds-text-title {
color: var(--slds-g-color-neutral-base-100, #{$popover-color-text});
color: var(--slds-g-color-neutral-base-80, #{$popover-color-text});
}

.slds-input,
Expand Down
2 changes: 1 addition & 1 deletion ui/components/popovers/warning/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

.slds-popover__header {
background-color: var(--slds-g-color-warning-base-60, #{$color-background-warning});
color: var(--slds-g-color-neutral-base-10, #{$color-gray-12});
color: var(--slds-g-color-neutral-base-20, #{$color-gray-12});

.slds-icon {
fill: currentColor;
Expand Down
2 changes: 1 addition & 1 deletion ui/components/progress-indicator/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
&.slds-is-completed .slds-progress__marker,
&.slds-is-active .slds-progress__marker {
background: var(--slds-g-color-neutral-base-100, #{$progress-color-background});
border-color: var(--slds-g-color-brand-base-50, #{$progress-color-border-active});
border-color: var(--slds-g-color-brand-base-60, #{$progress-color-border-active});
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ui/components/radio-group/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
~ .slds-radio--faux,
+ .slds-radio__label .slds-radio_faux,
+ .slds-radio__label .slds-radio--faux {
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});

&:after {
Expand Down
2 changes: 1 addition & 1 deletion ui/components/select/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

&[disabled],
&.slds-is-disabled {
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
color: var(--slds-g-color-neutral-base-50, #{$color-text-input-disabled});
cursor: not-allowed;
Expand Down
2 changes: 1 addition & 1 deletion ui/components/spinners/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
.slds-spinner__dot-b:after {
content: '';
position: absolute;
background: var(--slds-g-color-neutral-base-50, #{$color-background-spinner-dot});
background: var(--slds-g-color-neutral-base-60, #{$color-background-spinner-dot});
border-radius: $border-radius-circle;
animation-duration: 1000ms;
animation-iteration-count: infinite;
Expand Down
4 changes: 2 additions & 2 deletions ui/components/split-view/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

.slds-indicator_unread,
.slds-indicator--unread {
background: var(--slds-g-color-brand-base-50, #{$color-brand});
background: var(--slds-g-color-brand-base-60, #{$color-brand});
}
}

Expand Down Expand Up @@ -170,7 +170,7 @@
width: 0.75rem;
background: var(--slds-g-color-neutral-base-100, #{$color-background-alt});
border-radius: 0;
border: $border-width-thin solid var(--slds-g-color-neutral-base-50, #{$color-border});
border: $border-width-thin solid var(--slds-g-color-neutral-base-80, #{$color-border});

&:hover,
&:focus {
Expand Down
2 changes: 1 addition & 1 deletion ui/components/tabs/base/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
line-height: inherit;
color: var(--slds-c-tabs-item-text-color, var(--sds-c-tabs-item-text-color, var(--slds-g-color-neutral-base-30, #{$color-text-action-label})));
box-shadow: none;
--slds-c-button-color-border-active: transparent;

&:focus {
text-decoration: underline;
}
Expand Down
2 changes: 1 addition & 1 deletion ui/components/visual-picker/coverable-content/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

~ label .slds-visual-picker__figure {
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
box-shadow: none;

&:hover {
Expand Down
4 changes: 2 additions & 2 deletions ui/dependencies/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

@mixin form-input-disabled {
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
cursor: not-allowed;
user-select: none;
Expand Down Expand Up @@ -95,7 +95,7 @@
}

@mixin input-disabled {
background-color: var(--slds-g-color-neutral-base-95, #{$color-background-input-disabled});
background-color: var(--slds-g-color-neutral-base-80, #{$color-background-input-disabled});
border-color: var(--slds-g-color-border-base-1, #{$color-border-input-disabled});
color: var(--slds-g-color-neutral-base-50, #{$color-text-input-disabled});
cursor: not-allowed;
Expand Down

0 comments on commit e4dbeda

Please sign in to comment.