From 766dbca23b52f9ef8e1bcb6bbfc42d3929397a32 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Wed, 19 Dec 2018 16:15:30 +0100 Subject: [PATCH] refactor(a11y): output less CSS for high contrast styles (#14567) Reworks the media query to output slightly less CSS. Also fixes a high contrast selector in the badge that was being output 3 times unnecessarily. --- src/cdk/a11y/_a11y.scss | 2 +- src/lib/badge/_badge-theme.scss | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cdk/a11y/_a11y.scss b/src/cdk/a11y/_a11y.scss index 6bf2152b738..f8f7b96a6bb 100644 --- a/src/cdk/a11y/_a11y.scss +++ b/src/cdk/a11y/_a11y.scss @@ -26,7 +26,7 @@ * `white-on-black` or `black-on-white`. */ @mixin cdk-high-contrast($target: active) { - @media screen and (-ms-high-contrast: $target) { + @media (-ms-high-contrast: $target) { @content; } } diff --git a/src/lib/badge/_badge-theme.scss b/src/lib/badge/_badge-theme.scss index 79d992495ad..cce6cc99de9 100644 --- a/src/lib/badge/_badge-theme.scss +++ b/src/lib/badge/_badge-theme.scss @@ -18,11 +18,6 @@ $mat-badge-large-size: $mat-badge-default-size + 6; width: $size; height: $size; line-height: $size; - - @include cdk-high-contrast { - outline: solid 1px; - border-radius: 0; - } } &.mat-badge-above { @@ -102,6 +97,11 @@ $mat-badge-large-size: $mat-badge-default-size + 6; .mat-badge-content { color: mat-color($primary, default-contrast); background: mat-color($primary); + + @include cdk-high-contrast { + outline: solid 1px; + border-radius: 0; + } } .mat-badge-accent {