diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-07-16 16:58:55 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-16 16:58:55 +0200 |
| commit | 3483bea5716b608cb04dc2d006595c8dbf0dfd6d (patch) | |
| tree | 8499c2a2487d601d2e53cf623b5b7f5d9839a15f /app/components/styled | |
| parent | 7aa861495ffe90e0b5a9b9c67b8ccf0ad62c2882 (diff) | |
| parent | 28425ce96bef4f9cef54673910aeae51237c6714 (diff) | |
| download | mullvadvpn-3483bea5716b608cb04dc2d006595c8dbf0dfd6d.tar.xz mullvadvpn-3483bea5716b608cb04dc2d006595c8dbf0dfd6d.zip | |
Merge branch 'visual-adjustments'
Diffstat (limited to 'app/components/styled')
| -rw-r--r-- | app/components/styled/CellButton.js | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/app/components/styled/CellButton.js b/app/components/styled/CellButton.js index f0251c942e..709260d2e6 100644 --- a/app/components/styled/CellButton.js +++ b/app/components/styled/CellButton.js @@ -10,7 +10,7 @@ import { createViewStyles, createTextStyles } from '../../lib/styles'; const styles = { ...createViewStyles({ cell: { - backgroundColor: colors.blue80, + backgroundColor: colors.blue, paddingTop: 14, paddingBottom: 14, paddingLeft: 16, @@ -21,24 +21,9 @@ const styles = { alignItems: 'center', alignContent: 'center', }, - blue: { + cellHover: { backgroundColor: colors.blue80, }, - blueHover: { - backgroundColor: colors.blue60, - }, - white40: { - color: colors.white40, - }, - white60: { - color: colors.white60, - }, - white80: { - color: colors.white80, - }, - white: { - color: colors.white, - }, icon: { color: colors.white60, marginLeft: 8, @@ -85,7 +70,7 @@ export default class CellButton extends Component<CellButtonProps, State> { iconStyle = (cellHoverStyle?: Types.ViewStyle) => (this.state.hovered ? cellHoverStyle : null); subtextStyle = (cellHoverStyle?: Types.ViewStyle) => (this.state.hovered ? cellHoverStyle : null); backgroundStyle = (cellHoverStyle?: Types.ViewStyle) => - this.state.hovered ? cellHoverStyle || styles.blueHover : null; + this.state.hovered ? cellHoverStyle || styles.cellHover : null; onHoverStart = () => (!this.props.disabled ? this.setState({ hovered: true }) : null); onHoverEnd = () => (!this.props.disabled ? this.setState({ hovered: false }) : null); |
