Browse Source

Merge pull request #1215 from NastiaS/fix/1210

fixes #1210
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
1fce887655
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/components/AccountPage/EmptyStateAccount.js
  2. 2
      src/components/DashboardPage/index.js
  3. 2
      src/components/ExchangePage/index.js
  4. 2
      src/components/ManagerPage/Dashboard.js
  5. 2
      src/components/ManagerPage/ManagerGenuineCheck.js
  6. 1
      src/components/Onboarding/index.js
  7. 2
      src/components/SettingsPage/index.js
  8. 1
      src/components/base/Modal/ModalBody.js
  9. 5
      src/styles/reset.js

2
src/components/AccountPage/EmptyStateAccount.js

@ -32,7 +32,7 @@ class EmptyStateAccount extends PureComponent<Props, *> {
render() { render() {
const { t, account, openModal } = this.props const { t, account, openModal } = this.props
return ( return (
<Box mt={7} alignItems="center"> <Box mt={7} alignItems="center" selectable>
<img <img
alt="emptyState Dashboard logo" alt="emptyState Dashboard logo"
src={i('logos/emptyStateAccount.png')} src={i('logos/emptyStateAccount.png')}

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}> <Box flow={7} selectable>
{totalAccounts > 0 ? ( {totalAccounts > 0 ? (
<Fragment> <Fragment>
<Box horizontal alignItems="flex-end"> <Box horizontal alignItems="flex-end">

2
src/components/ExchangePage/index.js

@ -57,7 +57,7 @@ class ExchangePage extends PureComponent<Props> {
render() { render() {
const { t } = this.props const { t } = this.props
return ( return (
<Box pb={6}> <Box pb={6} selectable>
<TrackPage category="Exchange" /> <TrackPage category="Exchange" />
<Box ff="Museo Sans|Regular" fontSize={7} color="dark"> <Box ff="Museo Sans|Regular" fontSize={7} color="dark">
{t('app:exchange.title')} {t('app:exchange.title')}

2
src/components/ManagerPage/Dashboard.js

@ -23,7 +23,7 @@ type Props = {
} }
const Dashboard = ({ device, deviceInfo, t, handleHelpRequest }: Props) => ( const Dashboard = ({ device, deviceInfo, t, handleHelpRequest }: Props) => (
<Box flow={4} pb={8}> <Box flow={4} pb={8} selectable>
<TrackPage category="Manager" name="Dashboard" /> <TrackPage category="Manager" name="Dashboard" />
<Box> <Box>
<Text ff="Museo Sans|Regular" fontSize={7} color="dark"> <Text ff="Museo Sans|Regular" fontSize={7} color="dark">

2
src/components/ManagerPage/ManagerGenuineCheck.js

@ -22,7 +22,7 @@ class ManagerGenuineCheck extends PureComponent<Props> {
render() { render() {
const { t, onSuccess } = this.props const { t, onSuccess } = this.props
return ( return (
<Box align="center" py={7}> <Box align="center" py={7} selectable>
<TrackPage category="Manager" name="Genuine Check" /> <TrackPage category="Manager" name="Genuine Check" />
<Box align="center" style={{ maxWidth: 460 }}> <Box align="center" style={{ maxWidth: 460 }}>
<img <img

1
src/components/Onboarding/index.js

@ -202,6 +202,7 @@ class Onboarding extends PureComponent<Props> {
const Container = styled(Box).attrs({ const Container = styled(Box).attrs({
bg: 'white', bg: 'white',
p: 60, p: 60,
selectable: true,
})` })`
position: fixed; position: fixed;
top: 0; top: 0;

2
src/components/SettingsPage/index.js

@ -105,7 +105,7 @@ class SettingsPage extends PureComponent<Props, State> {
const items = this._items.filter(item => item.key !== 'currencies' || accountsCount > 0) const items = this._items.filter(item => item.key !== 'currencies' || accountsCount > 0)
return ( return (
<Box pb={4}> <Box pb={4} selectable>
<Box ff="Museo Sans|Regular" color="dark" fontSize={7} mb={5}> <Box ff="Museo Sans|Regular" color="dark" fontSize={7} mb={5}>
{t('app:settings.title')} {t('app:settings.title')}
</Box> </Box>

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

@ -77,6 +77,7 @@ 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);
` `

5
src/styles/reset.js

@ -6,7 +6,8 @@ module.exports = `* {
padding: 0; padding: 0;
font: inherit; font: inherit;
color: inherit; color: inherit;
user-select: none; user-select: inherit;
cursor: inherit;
min-width: 0; min-width: 0;
outline: none; outline: none;
@ -21,6 +22,8 @@ body {
font-size: 16px; font-size: 16px;
font-weight: 300; font-weight: 300;
line-height: 1.5; line-height: 1.5;
user-select: none;
cursor: default;
} }
#app { #app {

Loading…
Cancel
Save