From 3da08ee33c4ce1995919d4940238e2fe83f3527d Mon Sep 17 00:00:00 2001 From: fmtabbara Date: Mon, 23 Aug 2021 22:49:39 +0100 Subject: [PATCH] style updates --- tauri-wallet/src/routes/balance.tsx | 33 ++++++++------------- tauri-wallet/src/routes/send/SendWizard.tsx | 12 ++++++-- tauri-wallet/src/routes/send/index.tsx | 2 +- tauri-wallet/src/routes/sign-in.tsx | 1 - tauri-wallet/src/theme.tsx | 3 ++ 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tauri-wallet/src/routes/balance.tsx b/tauri-wallet/src/routes/balance.tsx index 85e6b6cfff..b0e1f7059b 100644 --- a/tauri-wallet/src/routes/balance.tsx +++ b/tauri-wallet/src/routes/balance.tsx @@ -26,30 +26,23 @@ export const Balance = () => { SuccessMessage={ {}} + disabled={false} + disableElevation + startIcon={} > - - + Refresh + } > - {'The current wallet balance is ' + client.balance} + {'The current balance is ' + client.balance} } failureMessage="Failed to check the account balance!" diff --git a/tauri-wallet/src/routes/send/SendWizard.tsx b/tauri-wallet/src/routes/send/SendWizard.tsx index 0eab276951..6b3aa6eb3a 100644 --- a/tauri-wallet/src/routes/send/SendWizard.tsx +++ b/tauri-wallet/src/routes/send/SendWizard.tsx @@ -27,10 +27,14 @@ export const SendWizard = () => { } return ( -
+
{steps.map((s, i) => ( @@ -44,6 +48,7 @@ export const SendWizard = () => { display: 'flex', justifyContent: 'center', alignItems: 'center', + padding: theme.spacing(0, 3), }} > {activeStep === 0 ? ( @@ -69,6 +74,9 @@ export const SendWizard = () => { display: 'flex', alignItems: 'center', justifyContent: 'flex-end', + borderTop: `1px solid ${theme.palette.grey[200]}`, + background: theme.palette.grey[100], + padding: theme.spacing(2), }} > {activeStep === 1 && ( diff --git a/tauri-wallet/src/routes/send/index.tsx b/tauri-wallet/src/routes/send/index.tsx index 0aacd91114..0a4c2d3e02 100644 --- a/tauri-wallet/src/routes/send/index.tsx +++ b/tauri-wallet/src/routes/send/index.tsx @@ -6,7 +6,7 @@ export const Send = () => { return ( - + diff --git a/tauri-wallet/src/routes/sign-in.tsx b/tauri-wallet/src/routes/sign-in.tsx index 6b94d15c12..421705681c 100644 --- a/tauri-wallet/src/routes/sign-in.tsx +++ b/tauri-wallet/src/routes/sign-in.tsx @@ -65,7 +65,6 @@ export const SignIn = () => { name="mnemonic" autoComplete="mnemonic" autoFocus - style={{ background: 'white' }} /> diff --git a/tauri-wallet/src/theme.tsx b/tauri-wallet/src/theme.tsx index 26a2c03d40..3db326f2d7 100644 --- a/tauri-wallet/src/theme.tsx +++ b/tauri-wallet/src/theme.tsx @@ -5,6 +5,9 @@ export const theme = createTheme({ primary: { main: '#F4731B', }, + secondary: { + main: '#009FA8', + }, }, overrides: { MuiButton: {