Browse Source

Removes the bottom border from topbar and makes it conditionally render if no banners are present,

comment the logic for the updater until we have it ready to ship.
develop
Juan Cortes Ross 6 years ago
parent
commit
17b679b75c
No known key found for this signature in database GPG Key ID: 34A99C03E9455EB8
  1. 12
      src/commands/autoUpdate.js
  2. 8
      src/components/DashboardPage/index.js
  3. 4
      src/components/TopBar/index.js
  4. 2
      src/components/layout/Default.js

12
src/commands/autoUpdate.js

@ -21,14 +21,14 @@ const cmd: Command<Input, Result> = createCommand('main:autoUpdate', () =>
o.next({ status, payload }) o.next({ status, payload })
} }
const handleDownload = async info => { const handleDownload = async _ => {
try { try {
sendStatus('checking') sendStatus('checking')
const appUpdater = await createElectronAppUpdater({ // const appUpdater = await createElectronAppUpdater({
feedURL: UPDATE_CHECK_FEED, // feedURL: UPDATE_CHECK_FEED,
updateVersion: info.version, // updateVersion: info.version,
}) // })
await appUpdater.verify() // await appUpdater.verify()
sendStatus('check-success') sendStatus('check-success')
} catch (err) { } catch (err) {
// don't throw if the check fail for now. it's a white bullet. // don't throw if the check fail for now. it's a white bullet.

8
src/components/DashboardPage/index.js

@ -105,6 +105,7 @@ class DashboardPage extends PureComponent<Props> {
bannerId={'promoNanoX'} bannerId={'promoNanoX'}
dismissable dismissable
/> />
<SeparatorBar />
</TopBannerContainer> </TopBannerContainer>
<RefreshAccountsOrdering onMount /> <RefreshAccountsOrdering onMount />
<TrackPage <TrackPage
@ -170,6 +171,13 @@ const TopBannerContainer = styled.div`
display: none; display: none;
} }
` `
// If no banners are present, the SeparatorBar appears
const SeparatorBar = styled.div`
height: 1px;
border-bottom: 1px solid ${p => p.theme.colors.fog};
margin-bottom: 15px;
margin-top: -20px;
`
export default compose( export default compose(
connect( connect(

4
src/components/TopBar/index.js

@ -42,9 +42,7 @@ const Inner = styled(Box).attrs({
grow: true, grow: true,
flow: 4, flow: 4,
align: 'center', align: 'center',
})` })``
border-bottom: 1px solid ${p => p.theme.colors.fog};
`
const Bar = styled.div` const Bar = styled.div`
margin-left: 5px; margin-left: 5px;

2
src/components/layout/Default.js

@ -43,7 +43,7 @@ const Main = styled(GrowScroll).attrs({
px: 6, px: 6,
})` })`
outline: none; outline: none;
padding-top: ${p => p.theme.sizes.topBarHeight + p.theme.space[7]}px; padding-top: ${p => p.theme.sizes.topBarHeight + p.theme.space[4]}px;
` `
type Props = { type Props = {

Loading…
Cancel
Save