Merge pull request #1060 from primer/fix-aria-current

Add support for aria-current=false
primer · May 21, 2020 · 9798f56 · 9798f56
2 parents 81d833f + 30fe2cf
commit 9798f56
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/src/breadcrumb/breadcrumb.scss b/src/breadcrumb/breadcrumb.scss
@@ -19,7 +19,7 @@
 }
 
 .breadcrumb-item-selected,
-.breadcrumb-item[aria-current] {
+.breadcrumb-item[aria-current]:not([aria-current=false]) {
   color: $text-gray;
 
   &::after {

diff --git a/src/navigation/filter-list.scss b/src/navigation/filter-list.scss
@@ -45,7 +45,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     color: $text-white;
     background-color: $bg-blue;
   }

diff --git a/src/navigation/menu.scss b/src/navigation/menu.scss
@@ -46,7 +46,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     font-weight: $font-weight-bold;
     color: $text-gray-dark;
     cursor: default;

diff --git a/src/navigation/sidenav.scss b/src/navigation/sidenav.scss
@@ -60,7 +60,7 @@
   background-color: $bg-white;
 }
 
-.SideNav-item[aria-current="page"],
+.SideNav-item[aria-current]:not([aria-current=false]),
 .SideNav-item[aria-selected="true"] {
   font-weight: $font-weight-semibold;
   color: $text-gray-dark;
@@ -104,7 +104,7 @@
   outline: none;
 }
 
-.SideNav-subItem[aria-current="page"],
+.SideNav-subItem[aria-current]:not([aria-current=false]),
 .SideNav-subItem[aria-selected="true"] {
   font-weight: $font-weight-semibold;
   color: $text-gray-dark;

diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss
@@ -41,7 +41,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     z-index: 2;
     color: $text-white;
     background-color: $bg-blue;

diff --git a/src/navigation/tabnav.scss b/src/navigation/tabnav.scss
@@ -31,7 +31,7 @@
 
   &.selected,
   &[aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     color: $text-gray-dark;
     background-color: $bg-white;
     border-color: $border-gray-dark;

diff --git a/src/navigation/underline-nav.scss b/src/navigation/underline-nav.scss
@@ -37,7 +37,7 @@
 
   &.selected,
   &[role=tab][aria-selected=true],
-  &[aria-current] {
+  &[aria-current]:not([aria-current=false]) {
     font-weight: $font-weight-bold;
     color: $text-gray-dark;
     // stylelint-disable-next-line primer/borders

diff --git a/src/pagination/pagination.scss b/src/pagination/pagination.scss
@@ -50,8 +50,7 @@
 
   .current,
   .current:hover,
-  [aria-current],
-  [aria-current]:hover {
+  [aria-current]:not([aria-current=false]) {
     z-index: 3;
     color: $text-white;
     background-color: $bg-blue;