Browse Source

Fix global scrolling, fix SideBar color

master
meriadec 7 years ago
parent
commit
89ebc45240
No known key found for this signature in database GPG Key ID: 1D2FC2305E2CB399
  1. 4
      src/components/SideBar/index.js
  2. 10
      src/components/Wrapper.js

4
src/components/SideBar/index.js

@ -28,7 +28,7 @@ const CapsSubtitle = styled(Box).attrs({
const Container = styled(Box).attrs({ const Container = styled(Box).attrs({
noShrink: true, noShrink: true,
})` })`
background-color: ${p => rgba(p.theme.colors[p.bg], 0.4)}; background-color: ${p => rgba(p.theme.colors[p.bg], process.platform === 'darwin' ? 0.4 : 1)};
padding-top: 40px; padding-top: 40px;
width: 250px; width: 250px;
` `
@ -62,7 +62,7 @@ class SideBar extends PureComponent<Props> {
const { accounts, openModal } = this.props const { accounts, openModal } = this.props
return ( return (
<Container> <Container bg="night">
<GrowScroll flow={4} py={4}> <GrowScroll flow={4} py={4}>
<Box flow={2}> <Box flow={2}>
<CapsSubtitle>{'Menu'}</CapsSubtitle> <CapsSubtitle>{'Menu'}</CapsSubtitle>

10
src/components/Wrapper.js

@ -6,7 +6,7 @@ import { Route } from 'react-router'
import { translate } from 'react-i18next' import { translate } from 'react-i18next'
import * as modals from 'components/modals' import * as modals from 'components/modals'
import Box from 'components/base/Box' import Box, { GrowScroll } from 'components/base/Box'
import AccountPage from 'components/AccountPage' import AccountPage from 'components/AccountPage'
import DashboardPage from 'components/DashboardPage' import DashboardPage from 'components/DashboardPage'
@ -42,9 +42,11 @@ class Wrapper extends PureComponent<{}> {
<Box shrink grow bg="cream"> <Box shrink grow bg="cream">
<TopBar /> <TopBar />
<Route path="/" exact component={DashboardPage} /> <GrowScroll>
<Route path="/settings" component={SettingsPage} /> <Route path="/" exact component={DashboardPage} />
<Route path="/account/:id" component={AccountPage} /> <Route path="/settings" component={SettingsPage} />
<Route path="/account/:id" component={AccountPage} />
</GrowScroll>
</Box> </Box>
</Box> </Box>
</Fragment> </Fragment>

Loading…
Cancel
Save