diff --git a/src/components/Stepper/OpenPaper/index.jsx b/src/components/Stepper/OpenPaper/index.jsx index 951096af..95313f68 100644 --- a/src/components/Stepper/OpenPaper/index.jsx +++ b/src/components/Stepper/OpenPaper/index.jsx @@ -35,7 +35,7 @@ const OpenPaper = ({ return ( - + {children} {controls} diff --git a/src/routes/load/components/OwnerList/index.jsx b/src/routes/load/components/OwnerList/index.jsx index e3cc3d69..f111163c 100644 --- a/src/routes/load/components/OwnerList/index.jsx +++ b/src/routes/load/components/OwnerList/index.jsx @@ -14,7 +14,7 @@ import Link from '~/components/layout/Link' import Paragraph from '~/components/layout/Paragraph' import Hairline from '~/components/layout/Hairline' import { - sm, md, lg, border, secondary, + sm, md, lg, border, secondary, disabled, extraSmallFontSize, } from '~/theme/variables' import { getOwnerNameBy, getOwnerAddressBy } from '~/routes/open/components/fields' import { getEtherScanLink } from '~/logic/wallets/getWeb3' @@ -62,6 +62,8 @@ const styles = () => ({ }, header: { padding: `${sm} ${lg}`, + color: disabled, + fontSize: extraSmallFontSize, }, name: { marginRight: `${sm}`, @@ -120,7 +122,7 @@ const OwnerListComponent = (props: Props) => { return ( <> - + {`This Safe has ${owners.length} owners. Optional: Provide a name for each owner.`} diff --git a/src/routes/load/components/ReviewInformation/index.jsx b/src/routes/load/components/ReviewInformation/index.jsx index 2f8732b3..43f1f033 100644 --- a/src/routes/load/components/ReviewInformation/index.jsx +++ b/src/routes/load/components/ReviewInformation/index.jsx @@ -106,18 +106,18 @@ class ReviewComponent extends React.PureComponent { const safeAddress = values[FIELD_LOAD_ADDRESS] return ( - + <> - Review details + Review details - Name of the Safe + Name of the Safe {values[FIELD_LOAD_NAME]} @@ -125,7 +125,7 @@ class ReviewComponent extends React.PureComponent { - Safe address + Safe address @@ -139,7 +139,7 @@ class ReviewComponent extends React.PureComponent { - Connected wallet client is owner? + Connected wallet client is owner? {isOwner ? 'Yes' : 'No (read-only)'} @@ -147,7 +147,7 @@ class ReviewComponent extends React.PureComponent { - Any transaction requires the confirmation of: + Any transaction requires the confirmation of: {`${values[THRESHOLD]} out of ${getNumOwnersFrom(values)} owners`} @@ -162,11 +162,11 @@ class ReviewComponent extends React.PureComponent { - {owners.map((x, index) => ( - + {owners.map((address, index) => ( + - + @@ -175,9 +175,13 @@ class ReviewComponent extends React.PureComponent { - {owners[index]} + {address} - + @@ -189,7 +193,7 @@ class ReviewComponent extends React.PureComponent { ))} - + ) } } @@ -197,11 +201,11 @@ class ReviewComponent extends React.PureComponent { const ReviewPage = withStyles(styles)(ReviewComponent) const Review = ({ network, userAddress }: LayoutProps) => (controls: React.Node, { values }: Object) => ( - + <> - + ) export default Review diff --git a/src/theme/mui.js b/src/theme/mui.js index c3843d34..3978c2e5 100644 --- a/src/theme/mui.js +++ b/src/theme/mui.js @@ -1,7 +1,6 @@ // @flow import { createMuiTheme } from '@material-ui/core/styles' import { - largeFontSize, mediumFontSize, smallFontSize, disabled, @@ -12,6 +11,7 @@ import { md, lg, bolderFont, + regularFont, boldFont, buttonLargeFontSize, border, @@ -47,6 +47,7 @@ export default createMuiTheme({ MuiButton: { label: { lineHeight: 1, + fontWeight: regularFont, }, root: { fontFamily: 'Averta, monospace', @@ -154,7 +155,7 @@ export default createMuiTheme({ root: { fontFamily: 'Averta, monospace', color: primary, - fontSize: largeFontSize, + fontSize: mediumFontSize, lineHeight: '56px', order: 1, padding: `0 ${md}`, @@ -190,7 +191,7 @@ export default createMuiTheme({ MuiStepLabel: { label: { textAlign: 'left', - color: '#B2B5B2', + color: secondary, '&$active': { color: primary, }, diff --git a/src/theme/variables.js b/src/theme/variables.js index b3813f65..da8c3119 100644 --- a/src/theme/variables.js +++ b/src/theme/variables.js @@ -45,8 +45,9 @@ module.exports = { bolderFont: 500, boldFont: 700, extraBoldFont: 800, - smallFontSize: '11px', - mediumFontSize: '12px', + extraSmallFontSize: '11px', + smallFontSize: '12px', + mediumFontSize: '14px', largeFontSize: '16px', extraLargeFontSize: '20px', xxlFontSize: '32px',