Skip to content

Commit

Permalink
fixes primer#790
Browse files Browse the repository at this point in the history
  • Loading branch information
Flavia Nunes authored and flavianunes committed Dec 26, 2019
1 parent 3f72b94 commit 3fc1336
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/buttons/button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
}

&.selected,
&[aria-selected=true],
&:focus,
&:active,
&:hover {
Expand Down Expand Up @@ -65,6 +66,7 @@
}

&.selected,
&[aria-selected=true],
&:focus,
&:active,
&:hover {
Expand Down
4 changes: 3 additions & 1 deletion src/buttons/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
}

&:active,
&.selected {
&.selected,
&[aria-selected=true] {
background-image: none;
}
}
Expand Down Expand Up @@ -153,6 +154,7 @@
&:active,
&:focus,
&.selected,
&[aria-selected=true],
&.zeroclipboard-is-hover,
&.zeroclipboard-is-active {
color: $text-blue;
Expand Down
3 changes: 2 additions & 1 deletion src/navigation/filter-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
background-color: lighten($gray-200, 3%);
}

&.selected {
&.selected,
&[aria-selected=true] {
color: $text-white;
background-color: $bg-blue;
}
Expand Down
3 changes: 2 additions & 1 deletion src/navigation/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
background-color: $bg-gray;
}

&.selected {
&.selected,
&[aria-selected=true] {
font-weight: $font-weight-bold;
color: $text-gray-dark;
cursor: default;
Expand Down
5 changes: 4 additions & 1 deletion src/navigation/subnav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@
}

&.selected,
&[aria-selected=true],
&.selected:hover,
&.selected:focus {
&[aria-selected=true]:hover,
&.selected:focus,
&[aria-selected=true]:focus {
z-index: 2;
color: $text-white;
background-color: $bg-blue;
Expand Down
4 changes: 4 additions & 0 deletions src/support/mixins/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

&:active,
&.selected,
&[aria-selected=true],
[open] > & {
background-color: darken(desaturate($bg, 10%), 6%);
background-image: none;
Expand Down Expand Up @@ -55,6 +56,7 @@

&:active,
&.selected,
&[aria-selected=true],
[open] > & {
background-color: darken(mix($bg, $bg2, 50%), 7%);
background-image: none;
Expand Down Expand Up @@ -101,6 +103,7 @@

&:active,
&.selected,
&[aria-selected=true],
[open] > & {
color: $text-white;
background-color: darken($color, 5%);
Expand Down Expand Up @@ -132,6 +135,7 @@
&:hover,
&:active,
&.selected,
&[aria-selected=true],
[open] > & {
color: $bg-color;
background-color: $text-color;
Expand Down

0 comments on commit 3fc1336

Please sign in to comment.