Skip to content

[Navigation] Adjust :active color for selected items #3562

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
merged 4 commits into from
Oct 27, 2020
Merged

[Navigation] Adjust :active color for selected items #3562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
051272b
Adjust :active color for navigation
Oct 26, 2020
826e180
Don't change color on focus
Oct 27, 2020
d90861a
Merge branch 'master' into navigation-active
Oct 27, 2020
ca322d8
Update UNRELEASED.md
Oct 27, 2020
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
2 changes: 2 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

### Bug fixes

- Removed `Navigation.Item` color change when focused ([#3562](https://github.com/Shopify/polaris-react/pull/3562))

### Documentation

### Development workflow
Expand Down
9 changes: 4 additions & 5 deletions src/components/Navigation/Navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ $disabled-fade: 0.6;

&:active,
&:active:hover {
color: var(--p-text, color('indigo', 'dark'));
color: var(--p-action-primary, color('indigo', 'dark'));
@include no-focus-ring;

// stylelint-disable-next-line selector-max-specificity
Expand Down Expand Up @@ -300,8 +300,7 @@ $secondary-item-font-size: rem(15px);
}
}

&:hover,
&:focus {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaelig removing this :focus color change fixes it up

&:hover {
color: var(--p-text-subdued, color('indigo', 'dark'));
}

Expand All @@ -317,7 +316,7 @@ $secondary-item-font-size: rem(15px);
}

&:active {
color: var(--p-text, color('indigo', 'dark'));
color: var(--p-action-primary, color('indigo', 'dark'));
}

@include breakpoint-after(nav-min-window-corrected()) {
Expand Down Expand Up @@ -354,7 +353,7 @@ $secondary-item-font-size: rem(15px);
color: var(--p-action-primary, color('indigo', 'dark'));
}
&:active {
color: var(--p-action-primary-pressed, color('indigo', 'dark'));
color: var(--p-action-primary, color('indigo', 'dark'));
@include no-focus-ring;
}
}
Expand Down