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

[core] fix(Tabs, Switch): improve high contrast mode support #5668

Merged
merged 4 commits into from
Oct 14, 2022
Merged

[core] fix(Tabs, Switch): improve high contrast mode support #5668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7364725
Add high contrast mode support for Blueprint tabs
styu Oct 12, 2022
9375e82
fix switch outline, try and fix vertical/dark mode tabs
styu Oct 14, 2022
4e7f4eb
Fix more dark mode styles
styu Oct 14, 2022
979bd72
disable
styu Oct 14, 2022
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
1 change: 1 addition & 0 deletions packages/core/src/common/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ $pt-dark-toast-box-shadow: $pt-dark-elevation-shadow-3 !default;
// See https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/system_color_keywords for more info on system colors.
$pt-high-contrast-mode-border-color: buttonborder;
$pt-high-contrast-mode-active-background-color: highlight;
$pt-high-contrast-mode-active-text-color: highlight;
$pt-high-contrast-mode-disabled-border-color: graytext;
$pt-high-contrast-mode-disabled-text-color: graytext;
$pt-high-contrast-mode-disabled-background-color: graytext;
29 changes: 29 additions & 0 deletions packages/core/src/components/forms/_controls.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,10 @@ $control-indicator-spacing: $pt-grid-size !default;
margin-top: $switch-indicator-margin - 1px;
}
}

@media (forced-colors: active) and (prefers-color-scheme: dark) {
border: 1px solid $pt-high-contrast-mode-border-color;
}
}

input:checked ~ .#{$ns}-control-indicator::before {
Expand Down Expand Up @@ -551,6 +555,31 @@ $control-indicator-spacing: $pt-grid-size !default;
input:checked ~ .#{$ns}-control-indicator::before {
background: $dark-switch-checked-indicator-background-color;
}

// Add Windows high contrast mode styles
@media (forced-colors: active) and (prefers-color-scheme: dark) {
input:checked ~ .#{$ns}-control-indicator {
background: $pt-high-contrast-mode-active-background-color;
border: 1px solid $pt-high-contrast-mode-border-color;
}

input:checked:disabled ~ .#{$ns}-control-indicator {
background-color: $pt-high-contrast-mode-disabled-background-color;
}

input:not(:checked):disabled ~ .#{$ns}-control-indicator {
border-color: $pt-high-contrast-mode-disabled-border-color;

// stylelint-disable-next-line max-nesting-depth
&::before {
border-color: $pt-high-contrast-mode-disabled-border-color;
}
}

&:hover input:checked ~ .#{$ns}-control-indicator {
background: $pt-high-contrast-mode-active-background-color;
}
}
}

.#{$ns}-switch-inner-text {
Expand Down
35 changes: 35 additions & 0 deletions packages/core/src/components/tabs/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ $tab-indicator-width: 3px !default;
&[aria-selected="true"] {
background-color: rgba($pt-intent-primary, 0.2);
box-shadow: none;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
background-color: $pt-high-contrast-mode-active-background-color;
color: $black;
}
}
}

Expand Down Expand Up @@ -117,6 +122,11 @@ $tab-indicator-width: 3px !default;
&[aria-disabled="true"] {
color: $pt-text-color-disabled;
cursor: not-allowed;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
color: $pt-high-contrast-mode-disabled-text-color;
}
}

&[aria-selected="true"] {
Expand All @@ -127,6 +137,11 @@ $tab-indicator-width: 3px !default;
&[aria-selected="true"],
&:not([aria-disabled="true"]):hover {
color: $tab-color-selected;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
color: $pt-high-contrast-mode-active-text-color;
}
}

&:focus {
Expand Down Expand Up @@ -164,6 +179,11 @@ $tab-indicator-width: 3px !default;
left: 0;
position: absolute;
right: 0;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
background-color: $pt-high-contrast-mode-active-background-color;
}
}

&.#{$ns}-no-animation {
Expand All @@ -177,6 +197,11 @@ $tab-indicator-width: 3px !default;

&[aria-disabled="true"] {
color: $pt-dark-text-color-disabled;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
color: $pt-high-contrast-mode-disabled-text-color;
}
}

&[aria-selected="true"] {
Expand All @@ -186,11 +211,21 @@ $tab-indicator-width: 3px !default;
&[aria-selected="true"],
&:not([aria-disabled="true"]):hover {
color: $dark-tab-color-selected;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
color: $pt-high-contrast-mode-active-text-color;
}
}
}

.#{$ns}-tab-indicator {
background-color: $dark-tab-color-selected;

@media (forced-colors: active) and (prefers-color-scheme: dark) {
// Windows High Contrast dark theme
background-color: $pt-high-contrast-mode-active-background-color;
}
}
}

Expand Down