Skip to content

MDL2: Checkbox - high contrast issues #204

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

Merged
atneik merged 4 commits into from
Aug 26, 2016
Merged

MDL2: Checkbox - high contrast issues #204

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f88b5f6
fixing high contrast issue
Aug 25, 2016
b3c0c06
fixing in-focus border
Aug 25, 2016
f1987dc
renaming
Aug 25, 2016
1495806
centering
Aug 26, 2016
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
77 changes: 47 additions & 30 deletions src/components/Checkbox/Checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,27 @@
$ms-checkbox-label-size: 20px;
$ms-checkbox-transition-duration: 200ms;
$ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
$ms-checkbox-highContrast-iconBoxSize: 16px;

@mixin highContrast-border($active-color, $bw-color, $size: 2px) {
@media screen and (-ms-high-contrast: active) {
border: $size solid $active-color;
}

@media screen and (-ms-high-contrast: black-on-white) {
border: $size solid $bw-color;
}
}

@mixin highContrast-color($active-color, $bw-color) {
@media screen and (-ms-high-contrast: active) {
color: $active-color;
}

@media screen and (-ms-high-contrast: black-on-white) {
color: $bw-color;
}
}

.ms-Checkbox {
box-sizing: border-box;
Expand All @@ -18,7 +39,6 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
font-size: $ms-font-size-m;
font-weight: $ms-font-weight-regular;
min-height: 36px;
border: 1px solid transparent;
position: relative;

.ms-Label {
Expand Down Expand Up @@ -64,14 +84,6 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
line-height: $ms-checkbox-label-size;
width: $ms-checkbox-label-size;
text-align: center;

@media screen and (-ms-high-contrast: active) {
color: $ms-color-black;
}

@media screen and (-ms-high-contrast: black-on-white) {
color: $ms-color-white;
}
}

// The checkbox label
Expand All @@ -82,6 +94,7 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
position: relative;
vertical-align: top;
user-select: none;
line-height: $ms-checkbox-label-size;

&:hover {
&::before {
Expand Down Expand Up @@ -124,17 +137,21 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
border: 10px solid $ms-color-themePrimary;
background-color: $ms-color-themePrimary;

@media screen and (-ms-high-contrast: active) {
border-color: $ms-color-contrastBlackSelected;
}

@media screen and (-ms-high-contrast: black-on-white) {
border-color: $ms-color-contrastWhiteSelected;
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: black-on-white) {
display: none;
}
}

&::after {
display: block;

@media screen and (-ms-high-contrast: active), (-ms-high-contrast: black-on-white) {
height: $ms-checkbox-highContrast-iconBoxSize;
width: $ms-checkbox-highContrast-iconBoxSize;
line-height: $ms-checkbox-highContrast-iconBoxSize;
}

@include highContrast-border($ms-color-white, $ms-color-black);
}

&:hover,
Expand All @@ -161,26 +178,17 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
background-color: $ms-color-neutralTertiaryAlt;
border-color: $ms-color-neutralTertiaryAlt;
color: $ms-color-neutralTertiaryAlt;
}

@media screen and (-ms-high-contrast: active) {
border-color: $ms-color-contrastBlackDisabled;
}

@media screen and (-ms-high-contrast: black-on-white) {
border-color: $ms-color-contrastWhiteDisabled;
}
&::after {
@include highContrast-border($ms-color-contrastBlackDisabled, $ms-color-contrastWhiteDisabled);
@include highContrast-color($ms-color-contrastBlackDisabled, $ms-color-contrastWhiteDisabled);
}

.ms-Label {
color: $ms-color-neutralTertiary;

@media screen and (-ms-high-contrast: active) {
color: $ms-color-contrastBlackDisabled;
}

@media screen and (-ms-high-contrast: black-on-white) {
color: $ms-color-contrastWhiteDisabled;
}
@include highContrast-color($ms-color-contrastBlackDisabled, $ms-color-contrastWhiteDisabled);
}
}

Expand All @@ -202,5 +210,14 @@ $ms-checkbox-transition-timing: cubic-bezier(.4, 0, .23, 1);
}

.is-focusVisible .ms-Checkbox.is-inFocus {
border: 1px solid $ms-color-neutralPrimary;
&::before {
content: '';
position: absolute;
top: 0px;
bottom: 0px;
@include right(0px);
@include left(-8px);
border: 1px solid $focusedBorderColor;
@include highContrast-border($ms-color-white, $ms-color-black, 1px);
}
}