Skip to content

[Tabs][Uplift]: Match hover and active colour #9619

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 1 commit into from
Jul 6, 2023
Merged

[Tabs][Uplift]: Match hover and active colour #9619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 8 additions & 27 deletions polaris-react/src/components/Tabs/Tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,8 @@
}

&:not([aria-disabled='true']):hover {
background-color: var(--p-color-bg-subdued);
background-color: var(--p-color-bg-secondary-experimental);
color: var(--p-color-text-primary);

#{$se23} & {
Copy link
Contributor Author

@ginabak ginabak Jul 5, 2023

Choose a reason for hiding this comment

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

This is already under the primary #{$se23} and just needed to be cleaned up.

https://github.com/Shopify/polaris/blob/5e2c3c532a9a0ee7aa6fd49439be118364a44c0d/polaris-react/src/components/Tabs/Tabs.scss#L123

background-color: var(--p-color-bg-secondary-experimental);
}
}

&:not([aria-disabled='true']):focus-visible {
Expand All @@ -149,13 +145,9 @@
}

&:not([aria-disabled='true']):active {
background-color: var(--p-color-bg-subdued);
background-color: var(--p-color-bg-secondary-experimental);
color: var(--p-color-text-primary);
z-index: var(--p-z-index-1);

#{$se23} & {
Copy link
Contributor Author

@ginabak ginabak Jul 5, 2023

Choose a reason for hiding this comment

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

Same as this comment, see:

https://github.com/Shopify/polaris/blob/5e2c3c532a9a0ee7aa6fd49439be118364a44c0d/polaris-react/src/components/Tabs/Tabs.scss#L123

background-color: var(--p-color-bg-secondary-experimental);
}
}

@media #{$p-breakpoints-md-up} {
Expand Down Expand Up @@ -187,12 +179,9 @@
}

#{$se23} & {
background: var(--p-color-bg-subdued);
background: var(--p-color-bg-secondary-experimental);
color: var(--p-color-text);

#{$se23} & {
background: var(--p-color-bg-secondary-experimental);
}
border-radius: var(--p-border-radius-2);

&[aria-disabled='true'] {
background: var(--p-color-bg-disabled);
Expand All @@ -201,20 +190,12 @@

&:not([aria-disabled='true']):hover,
&:not([aria-disabled='true']):focus {
background-color: var(--p-color-bg-subdued);
background-color: var(--p-color-bg-secondary-experimental);
color: var(--p-color-text-primary);

#{$se23} & {
background-color: var(--p-color-bg-secondary-experimental);
}
}

&:not([aria-disabled='true']):active {
background-color: var(--p-color-bg-subdued);

#{$se23} & {
background-color: var(--p-color-bg-secondary-experimental);
}
background-color: var(--p-color-bg-secondary-experimental);
}
}
}
Expand Down Expand Up @@ -374,7 +355,7 @@
}

&:not([aria-disabled='true']):hover {
background-color: var(--p-color-bg-interactive-subdued-active);
Copy link
Contributor Author

@ginabak ginabak Jul 5, 2023

Choose a reason for hiding this comment

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

ℹ️ This is the only change in the PR (the others are cleanup 🧼 🧹).

This is behind the se23:
https://github.com/Shopify/polaris/blob/5e2c3c532a9a0ee7aa6fd49439be118364a44c0d/polaris-react/src/components/Tabs/Tabs.scss#L361

and this follows the Tabs from the Uplift Figma for Tabs 🖌️

background-color: var(--p-color-bg-secondary-experimental);
color: var(--p-color-text-primary);
}

Expand All @@ -384,7 +365,7 @@
}

&:not([aria-disabled='true']):active {
background-color: var(--p-color-bg-interactive-subdued-active);
Copy link
Contributor Author

@ginabak ginabak Jul 5, 2023

Choose a reason for hiding this comment

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

From the Uplift Figma for Tabs 🖌️, hover and active were the same.

background-color: var(--p-color-bg-secondary-experimental);
}
}
}
Expand Down