Extract color #B2B5B2 to a variable secondaryText

2019-09-02 17:30:12 +04:00 · 2019-09-02 17:30:12 +04:00 · fa5dee6997
parent 4294d1f7cd
commit fa5dee6997
15 changed files with 31 additions and 30 deletions
--- 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',
  },
--- 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',
  },
--- 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: {
--- 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,
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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',
  },
--- 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,
    },
--- 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: {