From 479e3b7bbffb7bd2dacd07272b682b5790127270 Mon Sep 17 00:00:00 2001 From: Jake Dexheimer Date: Tue, 27 Nov 2018 18:29:56 -0500 Subject: [PATCH] minor aesthetic tweaks --- components/Button.js | 3 ++- components/Dropdown.js | 13 ++++++------- components/ExportMenu.js | 20 +++++++++++++++++--- components/Settings.js | 8 ++++---- components/Toggle.js | 2 +- components/WindowPointer.js | 4 ++-- components/svg/WindowThemes.js | 12 ++++++------ 7 files changed, 38 insertions(+), 24 deletions(-) diff --git a/components/Button.js b/components/Button.js index 52f0ddc..761d789 100644 --- a/components/Button.js +++ b/components/Button.js @@ -8,7 +8,8 @@ export default props => ( ...props.style, background: COLORS.BLACK, color: props.color, - border: `${props.selected ? 2 : 1}px solid ${props.color}` + boxShadow: `inset 0px 0px 0px ${props.selected ? 2 : 1}px ${props.color}`, + border: 'none' }} disabled={props.disabled} > diff --git a/components/Dropdown.js b/components/Dropdown.js index a1dd72c..711fe9a 100644 --- a/components/Dropdown.js +++ b/components/Dropdown.js @@ -156,14 +156,13 @@ const DropdownIcon = ({ children, isOpen }) => { {` .dropdown-icon { position: absolute; - left: -40px; + left: -${isOpen ? 38 : 39}px; display: flex; align-items: center; justify-content: center; width: 40px; height: 40px; - border: ${isOpen ? 2 : 1}px solid white; - border-right: none; + box-shadow: inset 0px 0px 0px ${isOpen ? 2 : 1}px white; border-radius: 3px 0 0 3px; cursor: initial; } @@ -205,7 +204,8 @@ const SelectedItem = ({ display: flex; align-items: center; height: 40px; - border: 1px solid ${itemColor}; + padding: 0 16px; + box-shadow: inset 0px 0px 0px 1px ${itemColor}; border-radius: ${hasIcon ? '0 3px 3px 0' : '3px'}; outline: none; } @@ -215,12 +215,11 @@ const SelectedItem = ({ .dropdown-display.is-open { border-radius: ${hasIcon ? '0 3px 0 0' : '3px 3px 0 0'}; - border-width: 2px; + box-shadow: inset 0px 0px 0px 2px ${itemColor}; } .dropdown-display-text { flex-grow: 1; - padding: 0 16px; color: ${itemColor}; background: transparent; border: none; @@ -230,7 +229,7 @@ const SelectedItem = ({ } .dropdown-arrow { - padding: 0 16px; + display: flex; } .is-open > .dropdown-arrow { diff --git a/components/ExportMenu.js b/components/ExportMenu.js index 6a08ab3..11ee160 100644 --- a/components/ExportMenu.js +++ b/components/ExportMenu.js @@ -46,11 +46,12 @@ class ExportMenu extends React.PureComponent { color={COLORS.PURPLE} />