Browse Source

Merge pull request #1241 from NastiaS/ui-polish-branch

a few adjustments after design meeting on selectables
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
65ba1c1771
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/components/DashboardPage/index.js
  2. 4
      src/components/ExchangePage/ExchangeCard.js
  3. 1
      src/components/base/Modal/ModalBody.js
  4. 1
      src/components/base/Modal/index.js
  5. 2
      src/components/base/SideBar/SideBarList.js

2
src/components/DashboardPage/index.js

@ -108,7 +108,7 @@ class DashboardPage extends PureComponent<Props> {
totalOperations={totalOperations} totalOperations={totalOperations}
totalCurrencies={totalCurrencies} totalCurrencies={totalCurrencies}
/> />
<Box flow={7} selectable> <Box flow={7}>
{totalAccounts > 0 ? ( {totalAccounts > 0 ? (
<Fragment> <Fragment>
<Box horizontal alignItems="flex-end"> <Box horizontal alignItems="flex-end">

4
src/components/ExchangePage/ExchangeCard.js

@ -26,14 +26,14 @@ export default class ExchangeCard extends PureComponent<{ t: T, card: CardType }
t, t,
} = this.props } = this.props
return ( return (
<Card horizontal py={5} px={6} style={{ cursor: 'pointer' }} onClick={this.onClick}> <Card horizontal py={5} px={6}>
<Box justify="center" style={{ width: 200 }}> <Box justify="center" style={{ width: 200 }}>
{logo} {logo}
</Box> </Box>
<Box shrink ff="Open Sans|Regular" fontSize={4} flow={3}> <Box shrink ff="Open Sans|Regular" fontSize={4} flow={3}>
<Box>{t(`app:exchange.${id}`)}</Box> <Box>{t(`app:exchange.${id}`)}</Box>
<Box horizontal align="center" color="wallet" flow={1}> <Box horizontal align="center" color="wallet" flow={1}>
<FakeLink>{t('app:exchange.visitWebsite')}</FakeLink> <FakeLink onClick={this.onClick}>{t('app:exchange.visitWebsite')}</FakeLink>
<ExternalLinkIcon size={14} /> <ExternalLinkIcon size={14} />
</Box> </Box>
</Box> </Box>

1
src/components/base/Modal/ModalBody.js

@ -77,7 +77,6 @@ const Body = styled(Box).attrs({
bg: p => p.theme.colors.white, bg: p => p.theme.colors.white,
relative: true, relative: true,
borderRadius: 1, borderRadius: 1,
selectable: true,
})` })`
box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.2);
` `

1
src/components/base/Modal/index.js

@ -241,6 +241,7 @@ export const ModalFooter = styled(Box).attrs({
export const ModalContent = styled(Box).attrs({ export const ModalContent = styled(Box).attrs({
px: 5, px: 5,
pb: 5, pb: 5,
selectable: true,
})`` })``
export default connect( export default connect(

2
src/components/base/SideBar/SideBarList.js

@ -35,7 +35,7 @@ class SideBarList extends Component<Props> {
{children} {children}
</ListWrapper> </ListWrapper>
) : emptyState ? ( ) : emptyState ? (
<Box px={4} ff="Open Sans|Regular" fontSize={3} color="grey"> <Box px={4} ff="Open Sans|Regular" selectable fontSize={3} color="grey">
{emptyState} {emptyState}
</Box> </Box>
) : null} ) : null}

Loading…
Cancel
Save