From 6f543ae36c7afdb064d87de2a09d7f1e1ea24fca Mon Sep 17 00:00:00 2001 From: Ben Wheeler <wheeler.benjamin@gmail.com> Date: Wed, 16 Jan 2019 15:20:05 -0500 Subject: [PATCH] Refactored the css for sprite context menu items a bit to separate classes --- src/components/context-menu/context-menu.css | 13 +++++-------- src/components/context-menu/context-menu.jsx | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/components/context-menu/context-menu.css b/src/components/context-menu/context-menu.css index 32fc00f22..37512018e 100644 --- a/src/components/context-menu/context-menu.css +++ b/src/components/context-menu/context-menu.css @@ -17,23 +17,20 @@ z-index: $z-index-context-menu; } -.menu-item, .menu-item-bordered { +.menu-item { padding: 8px 12px; white-space: nowrap; cursor: pointer; transition: 0.1s ease; } -.menu-item-bordered { - border-top: 3px solid $text-primary; -} - -.menu-item:hover, .menu-item-bordered:hover { +.menu-item:hover { + background: $motion-primary; color: white; } -.menu-item:hover { - background: $motion-primary; +.menu-item-bordered { + border-top: 2px solid $text-primary-transparent; } .menu-item-bordered:hover { diff --git a/src/components/context-menu/context-menu.jsx b/src/components/context-menu/context-menu.jsx index 445ac222e..677f89441 100644 --- a/src/components/context-menu/context-menu.jsx +++ b/src/components/context-menu/context-menu.jsx @@ -1,5 +1,6 @@ import React from 'react'; import {ContextMenu, MenuItem} from 'react-contextmenu'; +import classNames from 'classnames'; import styles from './context-menu.css'; @@ -20,7 +21,7 @@ const StyledMenuItem = props => ( const BorderedMenuItem = props => ( <MenuItem {...props} - attributes={{className: styles.menuItemBordered}} + attributes={{className: classNames(styles.menuItem, styles.menuItemBordered)}} /> ); -- GitLab