diff --git a/src/components/Breadcrumb/Step.js b/src/components/Breadcrumb/Step.js index ca3aae2a..d2e97774 100644 --- a/src/components/Breadcrumb/Step.js +++ b/src/components/Breadcrumb/Step.js @@ -8,7 +8,7 @@ import Box from 'components/base/Box' const Wrapper = styled(Box).attrs({ align: 'center', justify: 'center', - color: p => (p.isActive ? 'blue' : 'mouse'), + color: p => (p.isActive ? 'wallet' : 'mouse'), })` width: 40px; flex-shrink: 0; @@ -20,13 +20,13 @@ const Number = styled(Box).attrs({ align: 'center', justify: 'center', color: p => (p.isActive ? 'white' : 'mouse'), - bg: p => (p.isActive ? 'blue' : 'pearl'), + bg: p => (p.isActive ? 'wallet' : 'pearl'), })` width: 20px; height: 20px; border-radius: 50%; font-size: 9px; - box-shadow: ${p => `0 0 0 ${p.isActive ? 4 : 0}px ${p.theme.colors.cream}`}; + box-shadow: ${p => `0 0 0 ${p.isActive ? 4 : 0}px ${p.theme.colors.lightGrey}`}; transition: all ease-in-out 0.1s ${p => (p.isActive ? 0.4 : 0)}s; ` @@ -45,7 +45,7 @@ const Bar = styled.div` top: 0; bottom: 0; position: absolute; - background: ${p => p.theme.colors.blue}; + background: ${p => p.theme.colors.wallet}; transition: transform ease-in-out 0.4s; transform-origin: center left; transform: scaleX(${p => (p.isActive ? 1 : 0)}); diff --git a/src/components/DashboardPage/AccountCard.js b/src/components/DashboardPage/AccountCard.js index 01d33c6e..1a67861f 100644 --- a/src/components/DashboardPage/AccountCard.js +++ b/src/components/DashboardPage/AccountCard.js @@ -23,11 +23,11 @@ const AccountCard = ({ return ( - + {Icon && } - + {account.unit.code} @@ -48,7 +48,7 @@ const AccountCard = ({ (p.isActive ? 1 : 0)}; ` diff --git a/src/components/DashboardPage/BalanceInfos.js b/src/components/DashboardPage/BalanceInfos.js index 9ff8041c..070968ce 100644 --- a/src/components/DashboardPage/BalanceInfos.js +++ b/src/components/DashboardPage/BalanceInfos.js @@ -23,7 +23,7 @@ type Props = { const Sub = styled(Text).attrs({ ff: 'Open Sans', - color: 'warmGrey', + color: 'graphite', fontSize: 4, })`` diff --git a/src/components/DashboardPage/index.js b/src/components/DashboardPage/index.js index 8cdcab19..e016f295 100644 --- a/src/components/DashboardPage/index.js +++ b/src/components/DashboardPage/index.js @@ -229,7 +229,7 @@ class DashboardPage extends PureComponent { - + = theme.fontSizes.map((s, i) => ({ })) const Container = styled(Box).attrs({ - bg: 'night', + bg: 'dark', p: 5, grow: true, color: 'white', @@ -98,7 +98,7 @@ const Items = styled(Box).attrs({ const Item = styled(Box).attrs({ alignItems: 'center', - bg: 'night', + bg: 'dark', borderRadius: 1, color: 'white', justifyContent: 'center', @@ -276,7 +276,7 @@ class DevTools extends PureComponent { } const Color = ({ onClick, color }: { onClick: Function, color: ColorType }) => ( - + {color.name} ) diff --git a/src/components/GlobalSearch.js b/src/components/GlobalSearch.js index 1e059ad8..65af7a1b 100644 --- a/src/components/GlobalSearch.js +++ b/src/components/GlobalSearch.js @@ -14,7 +14,6 @@ const Container = styled(Box).attrs({ horizontal: true, ff: 'Open Sans|SemiBold', fontSize: 4, - color: p => (p.isFocused ? 'dark' : 'warmGrey'), })`` const Input = styled.input` @@ -22,10 +21,6 @@ const Input = styled.input` background: transparent; outline: none; flex-grow: 1; - - &::placeholder { - color: ${p => p.theme.colors.warmGrey}; - } ` type State = { diff --git a/src/components/ReceiveBox.js b/src/components/ReceiveBox.js index 00597fd7..acd6c2e9 100644 --- a/src/components/ReceiveBox.js +++ b/src/components/ReceiveBox.js @@ -20,7 +20,7 @@ import QRCode from 'components/base/QRCode' import Text from 'components/base/Text' export const AddressBox = styled(Box).attrs({ - bg: 'cream', + bg: 'lightGrey', p: 2, })` border-radius: 3px; diff --git a/src/components/RecipientAddress/index.js b/src/components/RecipientAddress/index.js index eb4bbe4e..31d48970 100644 --- a/src/components/RecipientAddress/index.js +++ b/src/components/RecipientAddress/index.js @@ -10,7 +10,7 @@ import Icon from 'components/base/Icon' import Input from 'components/base/Input' const IconQrCode = ({ onClick }: { onClick: Function }) => ( - + ) diff --git a/src/components/SelectAccount/index.js b/src/components/SelectAccount/index.js index a414a601..2b83cdf0 100644 --- a/src/components/SelectAccount/index.js +++ b/src/components/SelectAccount/index.js @@ -24,7 +24,7 @@ const mapStateToProps: MapStateToProps<*, *, *> = state => ({ const renderItem = item => ( - + {item.name} diff --git a/src/components/SideBar/Item.js b/src/components/SideBar/Item.js index a65679f1..b2eb1785 100644 --- a/src/components/SideBar/Item.js +++ b/src/components/SideBar/Item.js @@ -38,12 +38,13 @@ const Container = styled(Tabbable).attrs({ cursor: pointer; color: ${p => p.theme.colors.dark}; opacity: ${p => (p.isActive ? 1 : 0.4)}; - background: ${p => (p.isActive ? p.theme.colors.argile : '')}; + background: ${p => (p.isActive ? p.theme.colors.lightGrey : '')}; height: ${p => (p.big ? 50 : 36)}px; outline: none; - &:hover { - background: ${p => (p.isActive ? p.theme.colors.argile : p.theme.colors.cream)}; + &:hover, + &:focus { + background: ${p => p.theme.colors.lightGrey}; } ` @@ -88,7 +89,7 @@ function Item({ {children} {desc && ( - + {desc} )} @@ -98,7 +99,7 @@ function Item({ } Item.defaultProps = { - iconActiveColor: 'blue', + iconActiveColor: 'wallet', big: false, desc: null, icon: null, diff --git a/src/components/SideBar/index.js b/src/components/SideBar/index.js index 811983cf..9d6af555 100644 --- a/src/components/SideBar/index.js +++ b/src/components/SideBar/index.js @@ -107,7 +107,7 @@ class SideBar extends PureComponent { desc={ p.theme.colors.mouse}; + background: #ff0000; ` const Activity = styled.div` background: ${p => p.progress === true - ? p.theme.colors.dodgerBlue - : p.fail === true ? p.theme.colors.grenade : p.theme.colors.green}; + ? p.theme.colors.wallet + : p.fail === true ? p.theme.colors.alertRed : p.theme.colors.positiveGreen}; border-radius: 50%; bottom: 20px; height: 4px; @@ -148,7 +148,7 @@ class TopBar extends PureComponent { const { sync } = this.state return ( - + @@ -184,12 +184,11 @@ class TopBar extends PureComponent { ]} renderItem={({ item, isHighlighted }) => ( - {item.icon} + {item.icon} {item.label} )} alignItems="center" - color="warmGrey" ff="Open Sans|SemiBold" flow={1} fontSize={4} diff --git a/src/components/TransactionsList/index.js b/src/components/TransactionsList/index.js index 191709f1..c92d8494 100644 --- a/src/components/TransactionsList/index.js +++ b/src/components/TransactionsList/index.js @@ -22,7 +22,7 @@ const AMOUNT_COL_SIZE = 150 const Cap = styled(Text).attrs({ fontSize: 2, - color: 'warmGrey', + color: 'graphite', ff: 'Museo Sans|Bold', })` text-transform: uppercase; @@ -38,7 +38,7 @@ const Day = styled(Text).attrs({ ` const Hour = styled(Day).attrs({ - color: 'warmGrey', + color: 'graphite', })`` const HeaderCol = ({ size, children, ...props }: { size?: number, children: any }) => ( @@ -101,7 +101,11 @@ const Transaction = ({ style={{ cursor: 'pointer' }} onClick={() => onAccountClick && onAccountClick(tx.account)} > - + {Icon && } @@ -119,7 +123,7 @@ const Transaction = ({ display: 'block', }} > - + {tx.balance > 0 ? t('transactionsList.from') : t('transactionsList.to')} diff --git a/src/components/UpdateNotifier.js b/src/components/UpdateNotifier.js index a0e659e1..fbce9be9 100644 --- a/src/components/UpdateNotifier.js +++ b/src/components/UpdateNotifier.js @@ -30,7 +30,7 @@ const mapStateToProps: MapStateToProps<*, *, *> = (state: State) => ({ const Container = styled(Box).attrs({ p: 1, - bg: 'blue', + bg: 'wallet', color: 'white', style: p => ({ transform: `translate3d(0, ${p.offset}%, 0)`, diff --git a/src/components/base/Button/index.js b/src/components/base/Button/index.js index d62eab53..bd89f63b 100644 --- a/src/components/base/Button/index.js +++ b/src/components/base/Button/index.js @@ -48,7 +48,7 @@ function getProps({ disabled, icon, primary }: Object) { primary, { color: 'white', - bg: 'blue', + bg: 'wallet', withShadow: true, }, { diff --git a/src/components/base/CheckBox/index.js b/src/components/base/CheckBox/index.js index 7a7eb32f..aaf689d0 100644 --- a/src/components/base/CheckBox/index.js +++ b/src/components/base/CheckBox/index.js @@ -27,9 +27,9 @@ const Base = styled(Tabbable).attrs({ outline: none; border-radius: 3px; border: 1px solid transparent; - background-color: ${p => (p.isChecked ? p.theme.colors.blue : p.theme.colors.white)}; + background-color: ${p => (p.isChecked ? p.theme.colors.wallet : p.theme.colors.white)}; box-shadow: 0 0 0 ${p => (p.isChecked ? 4 : 1)}px - ${p => (p.isChecked ? p.theme.colors.cream : p.theme.colors.argile)}; + ${p => (p.isChecked ? p.theme.colors.lightGrey : p.theme.colors.graphite)}; font-size: 7px; height: 19px; width: 19px; diff --git a/src/components/base/DropDown/index.js b/src/components/base/DropDown/index.js index 5851f9ef..3f8f0b84 100644 --- a/src/components/base/DropDown/index.js +++ b/src/components/base/DropDown/index.js @@ -30,7 +30,7 @@ export const DropDownItem = styled(Box).attrs({ fontSize: 4, px: 3, color: p => (p.isHighlighted || p.isActive ? 'dark' : 'warnGrey'), - bg: p => (p.isActive ? 'cream' : ''), + bg: p => (p.isActive ? 'lightGrey' : ''), })` cursor: pointer; height: 40px; diff --git a/src/components/base/FormattedVal.js b/src/components/base/FormattedVal.js index ab1bed49..f3beb91d 100644 --- a/src/components/base/FormattedVal.js +++ b/src/components/base/FormattedVal.js @@ -10,7 +10,7 @@ import Text from 'components/base/Text' const T = styled(Text).attrs({ ff: 'Rubik', - color: p => (p.isNegative ? p.theme.colors.grenade : p.theme.colors.green), + color: p => (p.isNegative ? p.theme.colors.alertRed : p.theme.colors.positiveGreen), })`` type Props = { diff --git a/src/components/base/GrowScroll/stories.js b/src/components/base/GrowScroll/stories.js index 2a61d1b5..f10eba34 100644 --- a/src/components/base/GrowScroll/stories.js +++ b/src/components/base/GrowScroll/stories.js @@ -14,8 +14,8 @@ stories.add('basic', () => { return ( p.theme.colors.steel}; + color: ${p => p.theme.colors.graphite}; background: ${p => p.theme.colors.white}; &::placeholder { diff --git a/src/components/base/Overlay.js b/src/components/base/Overlay.js index 93be10ad..bc94434e 100644 --- a/src/components/base/Overlay.js +++ b/src/components/base/Overlay.js @@ -8,7 +8,7 @@ import { rgba } from 'styles/helpers' import Box from 'components/base/Box' const Overlay = styled(({ sticky, ...props }) => )` - background-color: ${p => rgba(p.theme.colors.night, 0.4)}; + background-color: ${p => rgba(p.theme.colors.dark, 0.4)}; position: fixed; ` diff --git a/src/components/base/Pills/index.js b/src/components/base/Pills/index.js index 1f58e61c..c6aaf1f9 100644 --- a/src/components/base/Pills/index.js +++ b/src/components/base/Pills/index.js @@ -24,8 +24,8 @@ const Container = styled(Box).attrs({ const Pill = styled(Tabbable).attrs({ ff: p => (p.isActive ? 'Open Sans|SemiBold' : 'Open Sans'), - color: p => (p.isActive ? 'dodgerBlue' : 'warmGrey'), - bg: p => (p.isActive ? rgba(p.theme.colors.dodgerBlue, 0.1) : ''), + color: p => (p.isActive ? 'wallet' : 'grey'), + bg: p => (p.isActive ? rgba(p.theme.colors.wallet, 0.1) : ''), px: 3, fontSize: 4, borderRadius: 1, @@ -37,7 +37,7 @@ const Pill = styled(Tabbable).attrs({ cursor: ${p => (p.isActive ? 'default' : 'pointer')}; &:focus { - color: ${p => p.theme.colors.dodgerBlue}; + color: ${p => p.theme.colors.wallet}; background-color: ${p => (p.isActive ? '' : rgba(p.theme.colors.black, 0.02))}; } ` diff --git a/src/components/base/Radio/index.js b/src/components/base/Radio/index.js index 1c3e68fb..d6c9584b 100644 --- a/src/components/base/Radio/index.js +++ b/src/components/base/Radio/index.js @@ -7,7 +7,7 @@ import { Tabbable } from 'components/base/Box' const Base = styled(Tabbable).attrs({ relative: true })` outline: none; - box-shadow: 0 0 0 1px ${p => (p.isChecked ? p.theme.colors.cream : p.theme.colors.argile)}; + box-shadow: 0 0 0 1px ${p => (p.isChecked ? p.theme.colors.lightGrey : p.theme.colors.graphite)}; border-radius: 50%; height: 19px; width: 19px; @@ -15,7 +15,7 @@ const Base = styled(Tabbable).attrs({ relative: true })` &:focus { box-shadow: 0 0 0 ${p => (p.isChecked ? 4 : 2)}px - ${p => (p.isChecked ? p.theme.colors.cream : p.theme.colors.argile)}; + ${p => (p.isChecked ? p.theme.colors.lightGrey : p.theme.colors.graphite)}; } &:before, @@ -31,7 +31,7 @@ const Base = styled(Tabbable).attrs({ relative: true })` } &:before { - background-color: ${p => p.theme.colors.blue}; + background-color: ${p => p.theme.colors.wallet}; ${p => p.isChecked && ` diff --git a/src/components/base/Select/index.js b/src/components/base/Select/index.js index 4f3ed700..eaf54812 100644 --- a/src/components/base/Select/index.js +++ b/src/components/base/Select/index.js @@ -32,7 +32,7 @@ type Props = { value?: Object | null, } -const Container = styled(Box).attrs({ relative: true, color: 'steel' })`` +const Container = styled(Box).attrs({ relative: true, color: 'graphite' })`` const TriggerBtn = styled(Box).attrs({ p: 2, @@ -43,7 +43,7 @@ const TriggerBtn = styled(Box).attrs({ border-radius: 3px; display: flex; width: 100%; - color: ${p => p.theme.colors.steel}; + color: ${p => p.theme.colors.graphite}; background: ${p => p.theme.colors.white}; cursor: pointer; &:focus { @@ -56,7 +56,7 @@ const Item = styled(Box).attrs({ alignItems: 'center', p: 2, })` - background: ${p => (p.highlighted ? p.theme.colors.cream : p.theme.colors.white)}; + background: ${p => (p.highlighted ? p.theme.colors.lightGrey : p.theme.colors.white)}; ` const ItemWrapper = styled(Box)` @@ -94,7 +94,7 @@ const FloatingTriangles = styled(Box).attrs({ ` const IconSelected = styled(Box).attrs({ - bg: 'blue', + bg: 'wallet', color: 'white', alignItems: 'center', justifyContent: 'center', diff --git a/src/components/base/Tabs/index.js b/src/components/base/Tabs/index.js index d4d8b8a3..24072565 100644 --- a/src/components/base/Tabs/index.js +++ b/src/components/base/Tabs/index.js @@ -21,9 +21,11 @@ const Tab = styled(Tabbable).attrs({ fontSize: 3, })` border-bottom: 2px solid transparent; - border-bottom-color: ${p => (p.isActive ? p.theme.colors.blue : '')}; + border-bottom-color: ${p => (p.isActive ? p.theme.colors.wallet : '')}; color: ${p => - p.isActive ? p.theme.colors.blue : p.isDisabled ? p.theme.colors.grey : p.theme.colors.steel}; + p.isActive + ? p.theme.colors.wallet + : p.isDisabled ? p.theme.colors.grey : p.theme.colors.graphite}; margin-bottom: -1px; outline: none; cursor: ${p => (p.isActive ? 'default' : p.isDisabled ? 'not-allowed' : 'pointer')}; diff --git a/src/components/layout/Default.js b/src/components/layout/Default.js index 3da6b609..a35e0873 100644 --- a/src/components/layout/Default.js +++ b/src/components/layout/Default.js @@ -61,7 +61,7 @@ class Default extends Component { - + (this._scrollContainer = n)}> diff --git a/src/components/modals/AddAccount/RestoreAccounts.js b/src/components/modals/AddAccount/RestoreAccounts.js index 5c679f59..73f1c502 100644 --- a/src/components/modals/AddAccount/RestoreAccounts.js +++ b/src/components/modals/AddAccount/RestoreAccounts.js @@ -10,7 +10,7 @@ import Text from 'components/base/Text' import type { Accounts } from 'types/common' const Container = styled(Box)` - border: 1px solid ${p => p.theme.colors.grenade}; + border: 1px solid ${p => p.theme.colors.alertRed}; ` type Props = { diff --git a/src/components/modals/AddAccount/index.js b/src/components/modals/AddAccount/index.js index cecc1448..025e73f0 100644 --- a/src/components/modals/AddAccount/index.js +++ b/src/components/modals/AddAccount/index.js @@ -325,7 +325,7 @@ class AddAccountModal extends PureComponent { return ( - + {t('addAccount.title')} diff --git a/src/components/modals/Receive.js b/src/components/modals/Receive.js index e00faee2..bc808d04 100644 --- a/src/components/modals/Receive.js +++ b/src/components/modals/Receive.js @@ -65,7 +65,7 @@ class ReceiveModal extends PureComponent { return ( - + {t('receive.title')} diff --git a/src/components/modals/Send.js b/src/components/modals/Send.js index 0fe3b965..dd1fca7a 100644 --- a/src/components/modals/Send.js +++ b/src/components/modals/Send.js @@ -30,9 +30,7 @@ const Steps = { }} > - - {t('send.title')} - + {t('send.title')} diff --git a/src/components/modals/SettingsAccount.js b/src/components/modals/SettingsAccount.js index b6158652..186ebe9f 100644 --- a/src/components/modals/SettingsAccount.js +++ b/src/components/modals/SettingsAccount.js @@ -141,7 +141,7 @@ class SettingsAccount extends PureComponent { return ( - + Account settings