From 7b04093cc5cc4dfc515c95e916632c80d74c72ac Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Tue, 7 Dec 2021 21:24:16 +0000 Subject: [PATCH] style updates --- nym-wallet/src/components/NymCard.tsx | 15 ++++++--------- nym-wallet/src/routes/bond/BondForm.tsx | 2 +- nym-wallet/src/routes/bond/index.tsx | 2 +- nym-wallet/src/routes/delegate/DelegateForm.tsx | 2 +- nym-wallet/src/routes/delegate/index.tsx | 2 +- nym-wallet/src/routes/send/SendWizard.tsx | 2 +- nym-wallet/src/routes/sign-in/sign-in.tsx | 2 +- .../src/routes/undelegate/UndelegateForm.tsx | 2 +- nym-wallet/src/routes/undelegate/index.tsx | 4 +++- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/nym-wallet/src/components/NymCard.tsx b/nym-wallet/src/components/NymCard.tsx index 6824cdc47a..81a2e71f45 100644 --- a/nym-wallet/src/components/NymCard.tsx +++ b/nym-wallet/src/components/NymCard.tsx @@ -1,6 +1,6 @@ import React from 'react' import { Card, CardContent, CardHeader } from '@mui/material' -import { styled } from '@mui/styles' +import { styled } from '@mui/material/styles' export const NymCard: React.FC<{ title: string @@ -20,21 +20,18 @@ export const NymCard: React.FC<{ sx={{ color: 'nym.background.dark', padding: 2.5, - borderBottom: (theme) => `1px solid ${theme.palette.grey[100]}`, + borderBottom: (theme) => `1px solid ${theme.palette.grey[200]}`, }} /> - {noPadding ? ( - {children} - ) : ( - {children} - )} + {noPadding ? {children} : {children}} ) } -const CardContentNoPadding = styled(CardContent)({ +const CardContentNoPadding = styled(CardContent)(({ theme }) => ({ + background: theme.palette.grey[50], padding: 0, '&:last-child': { paddingBottom: 0, }, -}) +})) diff --git a/nym-wallet/src/routes/bond/BondForm.tsx b/nym-wallet/src/routes/bond/BondForm.tsx index f088c46f95..90cb1486f4 100644 --- a/nym-wallet/src/routes/bond/BondForm.tsx +++ b/nym-wallet/src/routes/bond/BondForm.tsx @@ -339,7 +339,7 @@ export const BondForm = ({ alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - bgcolor: (theme) => theme.palette.grey[50], + bgcolor: 'grey.100', padding: 2, }} > diff --git a/nym-wallet/src/routes/bond/index.tsx b/nym-wallet/src/routes/bond/index.tsx index 0aa621d252..8cc10979f7 100644 --- a/nym-wallet/src/routes/bond/index.tsx +++ b/nym-wallet/src/routes/bond/index.tsx @@ -100,7 +100,7 @@ export const Bond = () => { alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - bgcolor: (theme) => theme.palette.grey[50], + bgcolor: 'grey.100', padding: 2, }} > diff --git a/nym-wallet/src/routes/delegate/DelegateForm.tsx b/nym-wallet/src/routes/delegate/DelegateForm.tsx index 3466053cf9..978db77b4d 100644 --- a/nym-wallet/src/routes/delegate/DelegateForm.tsx +++ b/nym-wallet/src/routes/delegate/DelegateForm.tsx @@ -114,7 +114,7 @@ export const DelegateForm = ({ alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - background: (theme) => theme.palette.grey[50], + bgcolor: 'grey.100', padding: 2, }} > diff --git a/nym-wallet/src/routes/delegate/index.tsx b/nym-wallet/src/routes/delegate/index.tsx index cc87b5c7f1..4720553348 100644 --- a/nym-wallet/src/routes/delegate/index.tsx +++ b/nym-wallet/src/routes/delegate/index.tsx @@ -73,7 +73,7 @@ export const Delegate = () => { alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - background: (theme) => theme.palette.grey[50], + bgcolor: 'grey.100', p: 2, }} > diff --git a/nym-wallet/src/routes/send/SendWizard.tsx b/nym-wallet/src/routes/send/SendWizard.tsx index 21458102c2..00263c0d91 100644 --- a/nym-wallet/src/routes/send/SendWizard.tsx +++ b/nym-wallet/src/routes/send/SendWizard.tsx @@ -136,7 +136,7 @@ export const SendWizard = () => { alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - background: (theme) => theme.palette.grey[50], + bgcolor: 'grey.50', p: 2, }} > diff --git a/nym-wallet/src/routes/sign-in/sign-in.tsx b/nym-wallet/src/routes/sign-in/sign-in.tsx index 3a297a95c3..c3082a0238 100644 --- a/nym-wallet/src/routes/sign-in/sign-in.tsx +++ b/nym-wallet/src/routes/sign-in/sign-in.tsx @@ -1,6 +1,6 @@ import React, { useContext, useState } from 'react' import { Button, CircularProgress, Grid, Stack, Link, TextField, Typography, Alert, SvgIcon } from '@mui/material' -import { styled } from '@mui/styles' +import { styled } from '@mui/material/styles' import Logo from '../../images/logo-background.svg' import { signInWithMnemonic } from '../../requests' import { ClientContext } from '../../context/main' diff --git a/nym-wallet/src/routes/undelegate/UndelegateForm.tsx b/nym-wallet/src/routes/undelegate/UndelegateForm.tsx index 3b2839fef5..1084452b7d 100644 --- a/nym-wallet/src/routes/undelegate/UndelegateForm.tsx +++ b/nym-wallet/src/routes/undelegate/UndelegateForm.tsx @@ -110,7 +110,7 @@ export const UndelegateForm = ({ alignItems: 'center', justifyContent: 'flex-end', borderTop: (theme) => `1px solid ${theme.palette.grey[200]}`, - background: (theme) => theme.palette.grey[50], + bgcolor: 'grey.100', p: 2, }} > diff --git a/nym-wallet/src/routes/undelegate/index.tsx b/nym-wallet/src/routes/undelegate/index.tsx index a269a59b77..39054fbbed 100644 --- a/nym-wallet/src/routes/undelegate/index.tsx +++ b/nym-wallet/src/routes/undelegate/index.tsx @@ -98,12 +98,14 @@ export const Undelegate = () => { alignItems: 'center', justifyContent: 'flex-end', borderTop: '1px solid grey[200]', - bgcolor: 'grey[50]', + bgcolor: 'grey.100', p: 2, }} >