From d37fc066c5083b4a43d5be7e98f3bc4ff521fa0b Mon Sep 17 00:00:00 2001 From: Mari Johannessen Date: Fri, 26 May 2017 10:44:29 -0500 Subject: [PATCH] fix(focus-states): Card, Breadcrumb, Checkbox (#61) * fix(card): removed outline none * fix(comps): fixed focus on firefox * fix(card): fixed merge conflict * fix(breadcrumbs): removed tabindex * fix(breadcrumbs): added comment --- src/components/breadcrumb/_breadcrumb.scss | 11 ++++++++++- src/components/card/_card.scss | 17 +++++++++++++---- src/components/checkbox/_checkbox.scss | 8 +++++++- src/components/toggle/_toggle.scss | 3 +-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/src/components/breadcrumb/_breadcrumb.scss b/src/components/breadcrumb/_breadcrumb.scss index 26fb90b58a3e..ecc5108a899a 100644 --- a/src/components/breadcrumb/_breadcrumb.scss +++ b/src/components/breadcrumb/_breadcrumb.scss @@ -41,9 +41,18 @@ text-decoration: none; border-bottom: 1px solid transparent; - &:hover { + &:hover, + &:focus { + outline: none; color: $brand-01; border-bottom: 1px solid $brand-01; } + + // Applies to Firefox only + @-moz-document url-prefix() { + & { + border-bottom: none; + } + } } } diff --git a/src/components/card/_card.scss b/src/components/card/_card.scss index e30946cc70b7..047596abee0b 100644 --- a/src/components/card/_card.scss +++ b/src/components/card/_card.scss @@ -26,6 +26,10 @@ height: rem(240px); background-color: $ui-01; border: 1px solid $ui-04; + + &:focus { + @include focus-outline('border'); + } } .bx--card__card-overview { @@ -153,23 +157,28 @@ .bx--app-actions__button { @include font-size('16'); display: inline-block; - padding: 0; - margin: 0; + padding: .125rem 0 0; + margin: 0 .175rem; cursor: pointer; background: none; border: none; - &:hover { + &:hover, + &:focus { .bx--app-actions__button--icon { fill: $brand-01; } } + + &:focus { + @include focus-outline('border'); + } } .bx--app-actions__button--icon { width: 1rem; height: 1rem; - margin: 0 .3rem; + margin: 0 .125rem; transition: 200ms; fill: $ui-05; cursor: pointer; diff --git a/src/components/checkbox/_checkbox.scss b/src/components/checkbox/_checkbox.scss index 874c9d757c29..568583fe4ecd 100644 --- a/src/components/checkbox/_checkbox.scss +++ b/src/components/checkbox/_checkbox.scss @@ -62,7 +62,7 @@ .bx--checkbox:focus + .bx--checkbox-label .bx--checkbox-appearance, .bx--checkbox:focus + .bx--checkbox-appearance { - @include focus-outline; + @include focus-outline('blurred'); } .bx--checkbox-checkmark { @@ -75,5 +75,11 @@ .bx--checkbox:checked + .bx--checkbox-appearance .bx--checkbox-checkmark, .bx--checkbox:checked + .bx--checkbox-label .bx--checkbox-appearance .bx--checkbox-checkmark { display: block; + + @-moz-document url-prefix() { + & { + stroke: $brand-01; + } + } } } diff --git a/src/components/toggle/_toggle.scss b/src/components/toggle/_toggle.scss index e4d7c77f6ebe..c95a42055e7b 100644 --- a/src/components/toggle/_toggle.scss +++ b/src/components/toggle/_toggle.scss @@ -88,8 +88,7 @@ } .bx--toggle__appearance:after { - box-shadow: 0 0 0 3px $color__blue-20; - outline: 1px solid transparent; + @include focus-outline('blurred'); } }