Skip to content

Update the background menu color when no theme is set. #2928

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
alex-page merged 8 commits into from
Apr 21, 2020
Merged

Update the background menu color when no theme is set. #2928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
772b130
Update the background menu color when no theme is set.
Apr 17, 2020
039c87f
Match colours from design
Apr 17, 2020
3ad3720
Try and default the hover colour of the user menu to the theme
Apr 20, 2020
91bac72
Update themed topbar plus nav, adjust menu color
Apr 21, 2020
7dd1ddf
Add changelog
Apr 21, 2020
f55b90a
Add background darker from web
Apr 21, 2020
fca372b
Remove
Apr 21, 2020
37a1aec
Add bg
Apr 21, 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
1 change: 1 addition & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Enhancements

- Removed `max-height` property from `Tooltip` ([#2908](https://github.com/Shopify/polaris-react/pull/2908))
- Update `TopBar.Menu` to be properly themed in active, hover and focused state ([#2928](https://github.com/Shopify/polaris-react/pull/2928))

### Bug fixes

Expand Down
9 changes: 6 additions & 3 deletions src/components/TopBar/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,11 @@ function TopBarExample() {
const theme = {
colors: {
topBar: {
background: '#357997',
backgroundLighter: '#6192a9',
color: '#FFFFFF',
background: '#fff',
backgroundLighter: '#F4F6F8',
backgroundDarker: '#DFE3E8',
border: '#C4CDD5',
color: '#212B36',
},
},
logo: {
Expand Down Expand Up @@ -370,6 +372,7 @@ function TopBarExample() {
onChange={handleSearchChange}
value={searchValue}
placeholder="Search"
showFocusBorder
Copy link
Member

@alex-page alex-page Apr 21, 2020

Choose a reason for hiding this comment

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

To make it easier for the plus team, I updated the example to use their white theme.

/>
);

Expand Down
18 changes: 10 additions & 8 deletions src/components/TopBar/components/Menu/Menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

$activator-variables: (
min-width: rem(36px),
border-left: 1px solid rgba(color('black'), 0.42),
transition: background-color 0.1s,
focus-background-color: rgba(color('white'), 0.16),
hover-background-color: rgba(color('white'), 0.08),
active-background-color: rgba(color('black'), 0.28),
Comment on lines -7 to -9
Copy link
Member

@alex-page alex-page Apr 21, 2020

Choose a reason for hiding this comment

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

These values are used once and blocked multiple theme overrides.

focus-opacity: 0.85,
);

Expand Down Expand Up @@ -39,19 +35,25 @@ $activator-variables: (
&:focus {
@include focus-ring($style: 'focused');
background-color: var(
--p-override-transparent,
menu(focus-background-color)
--top-bar-background-lighter,
var(--p-override-transparent, rgba(color('white'), 0.16))
);
outline: none;
}

&:hover {
background-color: var(--p-surface-hovered, menu(hover-background-color));
background-color: var(
--top-bar-background-lighter,
var(--p-surface-hovered, rgba(color('white'), 0.08))
);
}

&:active,
&[aria-expanded='true'] {
background-color: var(--p-surface-pressed, menu(active-background-color));
background-color: var(
--top-bar-background-darker,
var(--p-surface-pressed, rgba(color('black'), 0.28))
);
outline: none;
transition: none;

Expand Down
1 change: 1 addition & 0 deletions src/utilities/custom-properties/custom-properties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const nonDesignLangaugeCustomProperties = [
'--Polaris-RangeSlider-output-factor',
'--top-bar-color',
'--top-bar-background-lighter',
'--top-bar-background-darker',
'--top-bar-border',
'--p-frame-offset',
];
Expand Down