From cac5b730729329a257d717b14b6f2f91f9539101 Mon Sep 17 00:00:00 2001 From: slowbackspace Date: Thu, 24 Jan 2019 22:46:23 +0100 Subject: [PATCH] dont show menu toggler on landing page, fix padding --- src/components/Header/index.js | 17 ++++++++++++++--- .../Landing/components/ConnectDevice/index.js | 8 ++++++-- src/views/Wallet/index.js | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/components/Header/index.js b/src/components/Header/index.js index 6c23f9f7..ec5a767f 100644 --- a/src/components/Header/index.js +++ b/src/components/Header/index.js @@ -34,9 +34,17 @@ const LayoutWrapper = styled.div` } `; -const MenuToggler = styled.div` +const Left = styled.div` display: none; flex: 0 0 33%; + + @media screen and (max-width: ${SCREEN_SIZE.SM}) { + display: initial; + } +`; + +const MenuToggler = styled.div` + display: none; white-space: nowrap; color: ${colors.WHITE}; align-self: center; @@ -97,15 +105,18 @@ const A = styled.a` `; type Props = { + sidebarEnabled?: boolean, sidebarOpened?: boolean, toggleSidebar?: toggleSidebarType, }; -const Header = ({ sidebarOpened, toggleSidebar }: Props) => ( +const Header = ({ sidebarEnabled, sidebarOpened, toggleSidebar }: Props) => ( - {sidebarOpened ? '✕ Close' : '☰ Menu'} + + { sidebarEnabled && {sidebarOpened ? '✕ Close' : '☰ Menu'}} + diff --git a/src/views/Landing/components/ConnectDevice/index.js b/src/views/Landing/components/ConnectDevice/index.js index 223317c2..7e374544 100644 --- a/src/views/Landing/components/ConnectDevice/index.js +++ b/src/views/Landing/components/ConnectDevice/index.js @@ -18,6 +18,10 @@ type Props = { showDisconnect: boolean, }; +const StyledConnectDevice = styled.div` + padding: 0px 48px; +`; + const Title = styled.div` margin-top: 60px; `; @@ -105,7 +109,7 @@ class ConnectDevice extends PureComponent { render() { return ( -
+ <H2 claim>The private bank in your hands.</H2> <P>Trezor Wallet is an easy-to-use interface for your Trezor.</P> @@ -156,7 +160,7 @@ class ConnectDevice extends PureComponent<Props> { </StyledLink> </P> </Footer> - </div> + </StyledConnectDevice> ); } } diff --git a/src/views/Wallet/index.js b/src/views/Wallet/index.js index 36888d8e..52a977c1 100644 --- a/src/views/Wallet/index.js +++ b/src/views/Wallet/index.js @@ -106,7 +106,7 @@ const StyledBackdrop = styled(Backdrop)` const Wallet = (props: Props) => ( <AppWrapper> - <Header sidebarOpened={props.wallet.showSidebar} toggleSidebar={props.toggleSidebar} /> + <Header sidebarEnabled={!!props.wallet.selectedDevice} sidebarOpened={props.wallet.showSidebar} toggleSidebar={props.toggleSidebar} /> <AppNotifications /> <WalletWrapper> <StyledBackdrop show={props.wallet.showSidebar} onClick={props.toggleSidebar} animated />