From 6199ac5ef38faf9da8540a054bf9ffedb06f0948 Mon Sep 17 00:00:00 2001 From: Vladimir Volek Date: Mon, 24 Sep 2018 15:38:19 +0200 Subject: [PATCH] Styled divider --- .../LeftNavigation/components/CoinMenu/index.js | 3 +-- .../LeftNavigation/components/Divider/index.js | 15 +++++---------- .../components/StickyContainer/index.js | 3 --- .../Wallet/components/LeftNavigation/index.js | 3 +-- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js index d0859e51..578ff20b 100644 --- a/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/CoinMenu/index.js @@ -44,8 +44,7 @@ class CoinMenu extends Component { {coins.map(coin => ( diff --git a/src/views/Wallet/components/LeftNavigation/components/Divider/index.js b/src/views/Wallet/components/LeftNavigation/components/Divider/index.js index 0b30e28b..185a6594 100644 --- a/src/views/Wallet/components/LeftNavigation/components/Divider/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/Divider/index.js @@ -12,20 +12,16 @@ const Wrapper = styled.div` font-size: ${FONT_SIZE.SMALLER}; color: ${colors.TEXT_SECONDARY}; background: ${colors.LANDING}; - ${props => props.borderTop && css` - border-top: 1px solid ${colors.DIVIDER}; - `} - ${props => props.borderBottom && css` - border-bottom: 1px solid ${colors.DIVIDER}; + ${props => props.hasBorder && css` + border: 1px solid ${colors.BODY}; `} `; const Divider = ({ - textLeft, textRight, borderTop = false, borderBottom = false, + textLeft, textRight, hasBorder = false, }) => (

{textLeft}

{textRight}

@@ -35,8 +31,7 @@ const Divider = ({ Divider.propTypes = { textLeft: PropTypes.string, textRight: PropTypes.string, - borderTop: PropTypes.bool, - borderBottom: PropTypes.bool, + hasBorder: PropTypes.bool, }; export default Divider; diff --git a/src/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js b/src/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js index 9a360f14..def4b97d 100644 --- a/src/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js +++ b/src/views/Wallet/components/LeftNavigation/components/StickyContainer/index.js @@ -22,11 +22,9 @@ const AsideWrapper = styled.aside` min-width: 320px; overflow: hidden; background: ${colors.MAIN}; - border-right: 1px solid ${colors.DIVIDER}; .fixed { position: fixed; - border-right: 1px solid ${colors.DIVIDER}; } .fixed-bottom { @@ -35,7 +33,6 @@ const AsideWrapper = styled.aside` position: fixed; bottom: 0; background: ${colors.MAIN}; - border-right: 1px solid ${colors.DIVIDER}; } } `; diff --git a/src/views/Wallet/components/LeftNavigation/index.js b/src/views/Wallet/components/LeftNavigation/index.js index ef3e79f9..ab1e5399 100644 --- a/src/views/Wallet/components/LeftNavigation/index.js +++ b/src/views/Wallet/components/LeftNavigation/index.js @@ -28,7 +28,6 @@ const Footer = styled.div` width: 320px; bottom: 0; background: ${colors.MAIN}; - border-right: 1px solid ${colors.DIVIDER}; `; const Body = styled.div` @@ -42,7 +41,7 @@ const Help = styled.div` text-align: center; width: 319px; padding: 8px 0px; - border-top: 1px solid ${colors.DIVIDER}; + border-top: 1px solid ${colors.BACKGROUND}; `; const A = styled.a`