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
No known key found for this signature in database
GPG Key ID: 34A99C03E9455EB8
4 changed files with
16 additions and
10 deletions
-
src/commands/autoUpdate.js
-
src/components/DashboardPage/index.js
-
src/components/TopBar/index.js
-
src/components/layout/Default.js
|
|
@ -21,14 +21,14 @@ const cmd: Command<Input, Result> = createCommand('main:autoUpdate', () => |
|
|
|
o.next({ status, payload }) |
|
|
|
} |
|
|
|
|
|
|
|
const handleDownload = async info => { |
|
|
|
const handleDownload = async _ => { |
|
|
|
try { |
|
|
|
sendStatus('checking') |
|
|
|
const appUpdater = await createElectronAppUpdater({ |
|
|
|
feedURL: UPDATE_CHECK_FEED, |
|
|
|
updateVersion: info.version, |
|
|
|
}) |
|
|
|
await appUpdater.verify() |
|
|
|
// const appUpdater = await createElectronAppUpdater({
|
|
|
|
// feedURL: UPDATE_CHECK_FEED,
|
|
|
|
// updateVersion: info.version,
|
|
|
|
// })
|
|
|
|
// await appUpdater.verify()
|
|
|
|
sendStatus('check-success') |
|
|
|
} catch (err) { |
|
|
|
// don't throw if the check fail for now. it's a white bullet.
|
|
|
|
|
|
@ -105,6 +105,7 @@ class DashboardPage extends PureComponent<Props> { |
|
|
|
bannerId={'promoNanoX'} |
|
|
|
dismissable |
|
|
|
/> |
|
|
|
<SeparatorBar /> |
|
|
|
</TopBannerContainer> |
|
|
|
<RefreshAccountsOrdering onMount /> |
|
|
|
<TrackPage |
|
|
@ -170,6 +171,13 @@ const TopBannerContainer = styled.div` |
|
|
|
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( |
|
|
|
connect( |
|
|
|
|
|
@ -42,9 +42,7 @@ const Inner = styled(Box).attrs({ |
|
|
|
grow: true, |
|
|
|
flow: 4, |
|
|
|
align: 'center', |
|
|
|
})` |
|
|
|
border-bottom: 1px solid ${p => p.theme.colors.fog}; |
|
|
|
` |
|
|
|
})`` |
|
|
|
|
|
|
|
const Bar = styled.div` |
|
|
|
margin-left: 5px; |
|
|
|
|
|
@ -43,7 +43,7 @@ const Main = styled(GrowScroll).attrs({ |
|
|
|
px: 6, |
|
|
|
})` |
|
|
|
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 = { |
|
|
|