From fa5dee699776b58bc1d6c5d0af387935ee15cb01 Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Mon, 2 Sep 2019 17:30:12 +0400 Subject: [PATCH] Extract color #B2B5B2 to a variable secondaryText --- .../components/Balances/SendModal/screens/ReviewTx/style.js | 4 ++-- .../components/Balances/SendModal/screens/SendFunds/style.js | 4 ++-- .../components/Balances/Tokens/screens/TokenList/style.js | 4 ++-- src/routes/safe/components/Layout.jsx | 4 ++-- .../ManageOwners/AddOwnerModal/screens/OwnerForm/style.js | 4 ++-- .../ManageOwners/AddOwnerModal/screens/Review/style.js | 4 ++-- .../AddOwnerModal/screens/ThresholdForm/style.js | 4 ++-- .../RemoveOwnerModal/screens/CheckOwner/style.js | 4 ++-- .../ManageOwners/RemoveOwnerModal/screens/Review/style.js | 4 ++-- .../RemoveOwnerModal/screens/ThresholdForm/style.js | 4 ++-- .../ReplaceOwnerModal/screens/OwnerForm/style.js | 4 ++-- .../ManageOwners/ReplaceOwnerModal/screens/Review/style.js | 4 ++-- .../Settings/ThresholdSettings/ChangeThreshold/style.js | 4 ++-- .../safe/components/Settings/ThresholdSettings/style.js | 4 ++-- src/theme/mui.js | 5 +++-- 15 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/style.js b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/style.js index 2fc048e3..c2b97da5 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/style.js +++ b/src/routes/safe/components/Balances/SendModal/screens/ReviewTx/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/style.js b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/style.js index a3f6a564..a98c60bf 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/SendFunds/style.js +++ b/src/routes/safe/components/Balances/SendModal/screens/SendFunds/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Balances/Tokens/screens/TokenList/style.js b/src/routes/safe/components/Balances/Tokens/screens/TokenList/style.js index 650285a3..fbb88d69 100644 --- a/src/routes/safe/components/Balances/Tokens/screens/TokenList/style.js +++ b/src/routes/safe/components/Balances/Tokens/screens/TokenList/style.js @@ -1,6 +1,6 @@ // @flow import { - md, sm, xs, mediumFontSize, border, + md, sm, xs, mediumFontSize, border, secondaryText, } from '~/theme/variables' export const styles = () => ({ @@ -8,7 +8,7 @@ export const styles = () => ({ minHeight: '48px', }, search: { - color: '#B2B5B2', + color: secondaryText, paddingLeft: sm, }, padding: { diff --git a/src/routes/safe/components/Layout.jsx b/src/routes/safe/components/Layout.jsx index 506711df..52be6e15 100644 --- a/src/routes/safe/components/Layout.jsx +++ b/src/routes/safe/components/Layout.jsx @@ -15,7 +15,7 @@ import NoSafe from '~/components/NoSafe' import { type SelectorProps } from '~/routes/safe/container/selector' import { getEtherScanLink } from '~/logic/wallets/getWeb3' import { - sm, xs, secondary, smallFontSize, border, + sm, xs, secondary, smallFontSize, border, secondaryText, } from '~/theme/variables' import { copyToClipboard } from '~/utils/clipboard' import Balances from './Balances' @@ -70,7 +70,7 @@ const styles = () => ({ fontSize: smallFontSize, letterSpacing: '0.5px', color: '#ffffff', - backgroundColor: '#B2B5B2', + backgroundColor: secondaryText, textTransform: 'uppercase', padding: `0 ${sm}`, marginLeft: sm, diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js index 758ac366..943d525f 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/OwnerForm/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText, } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js index c348f25e..dbb876b1 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/Review/style.js @@ -1,6 +1,6 @@ // @flow import { - lg, sm, border, background, + lg, sm, border, background, secondaryText, } from '~/theme/variables' export const styles = () => ({ @@ -15,7 +15,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js index fbd7bf0e..34d100b3 100644 --- a/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/AddOwnerModal/screens/ThresholdForm/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js index 9d4c26e7..054834fb 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/CheckOwner/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js index d0f3b881..01518ffd 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/Review/style.js @@ -1,6 +1,6 @@ // @flow import { - lg, sm, border, background, + lg, sm, border, background, secondaryText, } from '~/theme/variables' export const styles = () => ({ @@ -15,7 +15,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js index fbd7bf0e..b43547e5 100644 --- a/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/RemoveOwnerModal/screens/ThresholdForm/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText, } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js index 9c81ed73..0c1145ba 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/OwnerForm/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js index 2c734470..043d7727 100644 --- a/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js +++ b/src/routes/safe/components/Settings/ManageOwners/ReplaceOwnerModal/screens/Review/style.js @@ -1,6 +1,6 @@ // @flow import { - lg, sm, border, background, + lg, sm, border, background, secondaryText, } from '~/theme/variables' export const styles = () => ({ @@ -15,7 +15,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/style.js b/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/style.js index 9d791db7..05465fc7 100644 --- a/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/style.js +++ b/src/routes/safe/components/Settings/ThresholdSettings/ChangeThreshold/style.js @@ -1,5 +1,5 @@ // @flow -import { lg, md, sm } from '~/theme/variables' +import { lg, md, sm, secondaryText } from '~/theme/variables' export const styles = () => ({ heading: { @@ -10,7 +10,7 @@ export const styles = () => ({ }, annotation: { letterSpacing: '-1px', - color: '#B2B5B2', + color: secondaryText, marginRight: 'auto', marginLeft: '20px', }, diff --git a/src/routes/safe/components/Settings/ThresholdSettings/style.js b/src/routes/safe/components/Settings/ThresholdSettings/style.js index 46d5e1ae..9f3daf31 100644 --- a/src/routes/safe/components/Settings/ThresholdSettings/style.js +++ b/src/routes/safe/components/Settings/ThresholdSettings/style.js @@ -1,12 +1,12 @@ // @flow import { - fontColor, lg, smallFontSize, md, border, + fontColor, lg, smallFontSize, md, border, secondaryText, } from '~/theme/variables' export const styles = () => ({ ownersText: { fontSize: '26px', - color: '#B2B5B2', + color: secondaryText, '& b': { color: fontColor, }, diff --git a/src/theme/mui.js b/src/theme/mui.js index bcd6e409..c78b3012 100644 --- a/src/theme/mui.js +++ b/src/theme/mui.js @@ -17,6 +17,7 @@ import { buttonLargeFontSize, border, xs, + secondaryText, } from './variables' export type WithStyles = { @@ -113,7 +114,7 @@ export default createMuiTheme({ MuiStepIcon: { root: { fontSize: '22px', - color: '#B2B5B2 !important', + color: `${secondaryText} !important`, }, completed: { color: `${secondary} !important`, @@ -125,7 +126,7 @@ export default createMuiTheme({ }, MuiStepContent: { root: { - borderLeft: '1px solid #B2B5B2', + borderLeft: `1px solid ${secondaryText}`, }, }, MuiTypography: {