From de16921f60308b57092bf6675d3abbb688ca42dd Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Fri, 30 Aug 2019 19:32:58 +0400 Subject: [PATCH] safe page rebranding wip --- src/components/layout/ButtonLink/index.scss | 1 + .../SafeOwnersConfirmationsForm/ScanQRModal/style.js | 5 ++++- src/routes/opening/component/index.jsx | 6 +----- src/theme/variables.js | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/layout/ButtonLink/index.scss b/src/components/layout/ButtonLink/index.scss index 3d3061f8..e591f46f 100644 --- a/src/components/layout/ButtonLink/index.scss +++ b/src/components/layout/ButtonLink/index.scss @@ -3,6 +3,7 @@ border: none; text-decoration: underline; cursor: pointer; + font-family: inherit; } .sm { diff --git a/src/routes/open/components/SafeOwnersConfirmationsForm/ScanQRModal/style.js b/src/routes/open/components/SafeOwnersConfirmationsForm/ScanQRModal/style.js index 3d2c3c25..02220c30 100644 --- a/src/routes/open/components/SafeOwnersConfirmationsForm/ScanQRModal/style.js +++ b/src/routes/open/components/SafeOwnersConfirmationsForm/ScanQRModal/style.js @@ -1,5 +1,7 @@ // @flow -import { lg, sm, background } from '~/theme/variables' +import { + lg, sm, background, secondaryText, +} from '~/theme/variables' export const styles = () => ({ heading: { @@ -15,6 +17,7 @@ export const styles = () => ({ close: { height: '25px', width: '25px', + color: secondaryText, }, detailsContainer: { backgroundColor: background, diff --git a/src/routes/opening/component/index.jsx b/src/routes/opening/component/index.jsx index 39bb4d34..d200d02e 100644 --- a/src/routes/opening/component/index.jsx +++ b/src/routes/opening/component/index.jsx @@ -20,9 +20,6 @@ type Props = SelectorProps & { const vault = require('../assets/vault.svg') const styles = { - page: { - letterSpacing: '-1px', - }, icon: { height: mediumFontSize, color: secondary, @@ -38,7 +35,6 @@ const styles = { display: 'flex', alignItems: 'center', marginLeft: xs, - fontWeight: 'bolder', }, } @@ -46,7 +42,7 @@ const Opening = ({ classes, name = 'Safe creation process', tx, network, }: Props) => ( - + {name} diff --git a/src/theme/variables.js b/src/theme/variables.js index da8c3119..e7143318 100644 --- a/src/theme/variables.js +++ b/src/theme/variables.js @@ -7,6 +7,7 @@ const fontColor = '#001428' const fancyColor = '#f02525' const warningColor = '#ffc05f' const errorColor = '#f02525' +const secondaryTextOrSvg = '#B2B5B2' const connectedColor = '#008C73' const disabled = '#5D6D74' const xs = '4px' @@ -23,6 +24,7 @@ module.exports = { disabled, background, fontColor, + secondaryText: secondaryTextOrSvg, fancy: fancyColor, warning: warningColor, error: errorColor,