diff --git a/src/components/Col/index.js b/src/components/Col/index.js index ae8b7719..7c83a9b9 100644 --- a/src/components/Col/index.js +++ b/src/components/Col/index.js @@ -1,9 +1,9 @@ import styled from 'styled-components' const Col = styled.div` - ${props => props.width + ${props => !props.noWidth && (props.width ? `flex: 0 0 ${props.width};` - : `flex: 1;` + : `flex: 1;`) } padding-right: 1rem; diff --git a/src/components/ErrorOverlay/index.js b/src/components/ErrorOverlay/index.js index 0de77089..482e5541 100644 --- a/src/components/ErrorOverlay/index.js +++ b/src/components/ErrorOverlay/index.js @@ -3,6 +3,8 @@ import styled from 'styled-components' import PropTypes from 'prop-types' import OverlayModal from '../OverlayModal' import Button from '../Button' +import Col from '../Col' +import Row from '../Row' import Control from '../../containers/Control' const ErrorMessage = styled.p` @@ -17,6 +19,15 @@ const Wrapper = styled.div` user-select: text; ` +const PopupControl = styled(Row)` + margin-top: 1rem; + font-size: 0.7rem; + background: rgba(100,100,100,0.5); + border-radius: 2px; + padding: 0.5rem; + text-align: left; +` + const ErrorOverlay = ({ isVisible, onCancelClick, code, message, onChooseSketchFolderClick }) => { let inner =

Whoops!

let showPopupControl = true @@ -45,10 +56,10 @@ const ErrorOverlay = ({ isVisible, onCancelClick, code, message, onChooseSketchF {message} { - showPopupControl && <> -

Stop errors from popping up (Can be enabled again in settings)

- - + showPopupControl && + + Stop errors from popping up (Can be enabled again in settings) + } diff --git a/src/components/Settings/index.js b/src/components/Settings/index.js index 3c7cc5ab..45c17ac6 100644 --- a/src/components/Settings/index.js +++ b/src/components/Settings/index.js @@ -51,8 +51,10 @@ const Settings = () => (

GUI

- +

Disable Error Popups

+ +