From 88798eff9796370b892867b16e5fecded3f287ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Germ=C3=A1n=20Mart=C3=ADnez?= Date: Fri, 14 Jun 2019 18:03:52 +0200 Subject: [PATCH] Add and fix styles --- .../open/assets => assets/icons}/trash.svg | 0 .../open/components/SafeOwnersForm/index.jsx | 3 +-- .../safe/components/Balances/Tokens/index.jsx | 2 +- .../components/Settings/RemoveSafeModal/index.jsx | 4 ++-- .../components/Settings/UpdateSafeName/index.jsx | 2 +- .../components/Settings/UpdateSafeName/style.js | 15 ++++++++++++++- src/routes/safe/components/Settings/index.jsx | 4 +++- src/routes/safe/components/Settings/style.js | 3 --- 8 files changed, 22 insertions(+), 11 deletions(-) rename src/{routes/open/assets => assets/icons}/trash.svg (100%) diff --git a/src/routes/open/assets/trash.svg b/src/assets/icons/trash.svg similarity index 100% rename from src/routes/open/assets/trash.svg rename to src/assets/icons/trash.svg diff --git a/src/routes/open/components/SafeOwnersForm/index.jsx b/src/routes/open/components/SafeOwnersForm/index.jsx index 8d3a6911..a76d156f 100644 --- a/src/routes/open/components/SafeOwnersForm/index.jsx +++ b/src/routes/open/components/SafeOwnersForm/index.jsx @@ -23,8 +23,7 @@ import OpenPaper from '~/components/Stepper/OpenPaper' import { getAccountsFrom } from '~/routes/open/utils/safeDataExtractor' import Hairline from '~/components/layout/Hairline' import { md, lg, sm } from '~/theme/variables' - -const trash = require('../../assets/trash.svg') +import trash from '~/assets/icons/trash.svg' type Props = { classes: Object, diff --git a/src/routes/safe/components/Balances/Tokens/index.jsx b/src/routes/safe/components/Balances/Tokens/index.jsx index 1bfae351..b5ac8569 100644 --- a/src/routes/safe/components/Balances/Tokens/index.jsx +++ b/src/routes/safe/components/Balances/Tokens/index.jsx @@ -42,7 +42,7 @@ const Tokens = (props: Props) => { return ( - + Manage Tokens diff --git a/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx b/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx index 60e9eb15..324d0078 100644 --- a/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx +++ b/src/routes/safe/components/Settings/RemoveSafeModal/index.jsx @@ -51,7 +51,7 @@ const RemoveSafeComponent = ({ open={isOpen} > - + Remove Safe @@ -66,7 +66,7 @@ const RemoveSafeComponent = ({ - + {safeName} diff --git a/src/routes/safe/components/Settings/UpdateSafeName/index.jsx b/src/routes/safe/components/Settings/UpdateSafeName/index.jsx index f0ebeeb3..370745d8 100644 --- a/src/routes/safe/components/Settings/UpdateSafeName/index.jsx +++ b/src/routes/safe/components/Settings/UpdateSafeName/index.jsx @@ -51,7 +51,7 @@ const UpdateSafeName = (props: Props) => { {() => ( - + Modify Safe name diff --git a/src/routes/safe/components/Settings/UpdateSafeName/style.js b/src/routes/safe/components/Settings/UpdateSafeName/style.js index 3980c700..07d439f2 100644 --- a/src/routes/safe/components/Settings/UpdateSafeName/style.js +++ b/src/routes/safe/components/Settings/UpdateSafeName/style.js @@ -1,4 +1,17 @@ // @flow import { lg, border } from '~/theme/variables' -export const styles = () => ({}) +export const styles = () => ({ + title: { + padding: `${lg} 0 20px`, + fontSize: '16px', + }, + formContainer: { + padding: '0 20px', + minHeight: '369px', + }, + root: { + display: 'flex', + maxWidth: '460px', + }, +}) diff --git a/src/routes/safe/components/Settings/index.jsx b/src/routes/safe/components/Settings/index.jsx index 3895ffe6..45176532 100644 --- a/src/routes/safe/components/Settings/index.jsx +++ b/src/routes/safe/components/Settings/index.jsx @@ -59,7 +59,9 @@ class Settings extends React.Component { - Settings + + Settings + diff --git a/src/routes/safe/components/Settings/style.js b/src/routes/safe/components/Settings/style.js index 7fb64f13..31444600 100644 --- a/src/routes/safe/components/Settings/style.js +++ b/src/routes/safe/components/Settings/style.js @@ -22,9 +22,6 @@ export const styles = (theme: Object) => ({ alignItems: 'center', cursor: 'pointer', }, - container: { - padding: lg, - }, message: { margin: `${sm} 0`, },