diff --git a/.eslintrc b/.eslintrc index c93f6044..5a756dc6 100644 --- a/.eslintrc +++ b/.eslintrc @@ -8,6 +8,7 @@ "__PROD__": false, "__SENTRY_URL__": false, "__PRINT_MODE__": false, + "__GLOBAL_STYLES__": false, "__static": false, "window": false, "document": false, diff --git a/flow-defs/globals.js b/flow-defs/globals.js index a373152b..c5319c3f 100644 --- a/flow-defs/globals.js +++ b/flow-defs/globals.js @@ -5,6 +5,7 @@ declare var __PROD__: boolean declare var __ENV__: string declare var __PRINT_MODE__: string declare var __SENTRY_URL__: string +declare var __GLOBAL_STYLES__: string declare var __static: string declare var ResizeObserver: Class diff --git a/src/components/SelectAccount/index.js b/src/components/SelectAccount/index.js index 2b83cdf0..67f151c6 100644 --- a/src/components/SelectAccount/index.js +++ b/src/components/SelectAccount/index.js @@ -24,12 +24,12 @@ const mapStateToProps: MapStateToProps<*, *, *> = state => ({ const renderItem = item => ( - + {item.name} - + {formatBTC(item.balance)} @@ -51,6 +51,7 @@ export const SelectAccount = ({ accounts, onChange, value, t }: Props) => ( keyProp="id" items={accounts} placeholder={t('SelectAccount.placeholder')} + fontSize={4} onChange={onChange} /> ) diff --git a/src/components/base/Input/index.js b/src/components/base/Input/index.js index 9176b90f..e0deb4b6 100644 --- a/src/components/base/Input/index.js +++ b/src/components/base/Input/index.js @@ -1,14 +1,17 @@ // @flow import React, { PureComponent } from 'react' - import styled from 'styled-components' import { space } from 'styled-system' +import fontFamily from 'styles/styled/fontFamily' + const Base = styled.input.attrs({ - p: 2, + p: 4, + ff: 'Open Sans|SemiBold', })` ${space}; + ${fontFamily}; border: 1px solid ${p => p.theme.colors.mouse}; border-radius: 3px; display: flex; diff --git a/src/components/base/Select/index.js b/src/components/base/Select/index.js index eaf54812..2a48b4ed 100644 --- a/src/components/base/Select/index.js +++ b/src/components/base/Select/index.js @@ -35,9 +35,11 @@ type Props = { const Container = styled(Box).attrs({ relative: true, color: 'graphite' })`` const TriggerBtn = styled(Box).attrs({ - p: 2, + ff: 'Open Sans|SemiBold', + p: 4, + pr: 5, })` - min-height: 58px; + min-height: 64px; ${space}; border: 1px solid ${p => p.theme.colors.mouse}; border-radius: 3px; @@ -247,7 +249,9 @@ class Select extends PureComponent { {placeholder} )} - + + + )} {isOpen && diff --git a/src/components/modals/Send.js b/src/components/modals/Send.js index dd1fca7a..a0867492 100644 --- a/src/components/modals/Send.js +++ b/src/components/modals/Send.js @@ -29,9 +29,9 @@ const Steps = { } }} > - + {t('send.title')} - + diff --git a/src/globals.js b/src/globals.js index 2071155c..69bd02d1 100644 --- a/src/globals.js +++ b/src/globals.js @@ -5,3 +5,4 @@ const { NODE_ENV } = process.env global.__ENV__ = NODE_ENV === 'development' ? NODE_ENV : 'production' global.__DEV__ = global.__ENV__ === 'development' global.__PROD__ = !global.__DEV__ +global.__GLOBAL_STYLES__ = require('./styles/reset') diff --git a/src/index.ejs b/src/index.ejs index 56a4906a..f87f3eb1 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -4,40 +4,8 @@ <%= process.env.npm_package_productName %>