Skip to content
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

Jump to bottom

Update Menu hover state #1410

Merged
merged 13 commits into from
Jun 17, 2021
Merged

Update Menu hover state #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
892e273
💄 Added bold text on hover
pomfrida Jun 4, 2021
e235586
⏪ Revert story changes
pomfrida Jun 4, 2021
4e59f70
⏪ Revert revert
pomfrida Jun 4, 2021
6da8c86
💄 Changing menu title to p works for bold text
pomfrida Jun 4, 2021
838a739
✨ Bold hover on Typography menu_item variant
pomfrida Jun 9, 2021
ae296fd
🐛 Syntax error + a description comment
pomfrida Jun 9, 2021
1295cec
🔇 Remove logs
pomfrida Jun 9, 2021
ffa7018
✨ Menu label active color on hover should be ??
pomfrida Jun 9, 2021
05a61b6
🔥 Remove unused
pomfrida Jun 9, 2021
0acbd76
🎨 fontWeight string to number
pomfrida Jun 9, 2021
13fb433
🚨 Fixed a jest warning
pomfrida Jun 9, 2021
187282d
✨ Updated hover background and removed bold text
pomfrida Jun 17, 2021
93656a6
🔥 Remove unused
pomfrida Jun 17, 2021
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: 1 addition & 1 deletion libraries/core-react/src/components/Menu/Menu.tokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import type { ComponentToken } from '@equinor/eds-tokens'
const {
colors: {
ui: {
background__light: { rgba: hoverBackground },
background__default: { rgba: background },
},
interactive: {
Expand All @@ -13,6 +12,7 @@ const {
focus: { rgba: focusColor },
disabled__fill: { rgba: disabledIconColor },
disabled__text: { rgba: disabledTextColor },
table__header__fill_hover: { rgba: hoverBackground },
},
text: {
static_icons__default: { rgba: textColor },
Expand Down
13 changes: 12 additions & 1 deletion libraries/core-react/src/components/Menu/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,24 @@ type MenuPaperProps = {
open: boolean
}

const { border } = tokens

const MenuPaper = styled(Paper)<MenuPaperProps>`
position: absolute;
z-index: 150;
width: fit-content;
min-width: fit-content;
${bordersTemplate(tokens.border)};
${bordersTemplate(border)};
${({ open }) => css({ visibility: open ? null : 'hidden' })}

li:first-child {
border-top-left-radius: ${border.type === 'border' && border.radius};
border-top-right-radius: ${border.type === 'border' && border.radius};
}
li:last-child {
border-bottom-left-radius: ${border.type === 'border' && border.radius};
border-bottom-right-radius: ${border.type === 'border' && border.radius};
}
`
type MenuContainerProps = MenuProps & {
containerEl: HTMLElement
Expand Down