diff --git a/src/renderer/components/dropdown-menu/index.tsx b/src/renderer/components/dropdown-menu/index.tsx index 2ebf675c..000befb5 100644 --- a/src/renderer/components/dropdown-menu/index.tsx +++ b/src/renderer/components/dropdown-menu/index.tsx @@ -26,13 +26,27 @@ const StyledMenuLabel = styled(MantineMenu.Label)` `; const StyledMenuItem = styled(MantineMenu.Item)` - padding: 0.8rem; - font-size: 0.9em; + position: relative; + padding: var(--dropdown-menu-item-padding); + font-size: var(--dropdown-menu-item-font-size); font-family: var(--content-font-family); - background-color: ${({ $isActive }) => { - if (!$isActive) return undefined; - return 'var(--dropdown-menu-bg-hover)'; - }}; + + ${(props) => + props.$isActive && + ` + &::before { + content: ''; // ::before and ::after both require content + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: var(--primary-color); + opacity: 0.2; + z-index: -1; + } + + `} &:disabled { opacity: 0.6; @@ -56,6 +70,8 @@ const StyledMenuItem = styled(MantineMenu.Item)` display: flex; margin-left: 2rem !important; } + + cursor: default; `; const StyledMenuDropdown = styled(MantineMenu.Dropdown)` @@ -73,13 +89,12 @@ export const DropdownMenu = ({ children, ...props }: MenuProps) => { return ( {children} diff --git a/src/renderer/components/popover/index.tsx b/src/renderer/components/popover/index.tsx index c2147bf6..810a7f22 100644 --- a/src/renderer/components/popover/index.tsx +++ b/src/renderer/components/popover/index.tsx @@ -27,7 +27,7 @@ export const Popover = ({ children, ...props }: PopoverProps) => { filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 50%))', }, }} - transition="scale-y" + transition="fade" {...props} > {children} diff --git a/src/renderer/components/select/index.tsx b/src/renderer/components/select/index.tsx index e189f249..eeda7f11 100644 --- a/src/renderer/components/select/index.tsx +++ b/src/renderer/components/select/index.tsx @@ -64,7 +64,7 @@ export const Select = ({ width, maxWidth, ...props }: SelectProps) => { }, }} sx={{ maxWidth, width }} - transition="pop" + transition="fade" transitionDuration={100} {...props} /> @@ -126,7 +126,7 @@ export const MultiSelect = ({ width, maxWidth, ...props }: MultiSelectProps) => }, }} sx={{ maxWidth, width }} - transition="pop" + transition="fade" transitionDuration={100} {...props} /> diff --git a/src/renderer/themes/default.scss b/src/renderer/themes/default.scss index 90695b55..c991de09 100644 --- a/src/renderer/themes/default.scss +++ b/src/renderer/themes/default.scss @@ -63,11 +63,13 @@ --input-active-fg: rgb(193, 193, 193); --input-active-bg: rgba(255, 255, 255, 0.1); - --dropdown-menu-bg: rgb(36, 36, 36); - --dropdown-menu-fg: rgb(220, 220, 220); - --dropdown-menu-bg-hover: rgb(46, 46, 46); + --dropdown-menu-bg: rgb(40, 40, 40); + --dropdown-menu-fg: rgb(235, 235, 235); + --dropdown-menu-item-padding: 1rem 0.8rem; + --dropdown-menu-item-font-size: 0.9em; + --dropdown-menu-bg-hover: rgb(62, 62, 62); --dropdown-menu-border: none; - --dropdown-menu-border-radius: 4px; + --dropdown-menu-border-radius: 2px; --switch-track-bg: rgb(50, 50, 50); --switch-track-enabled-bg: var(--primary-color);