diff --git a/tauri-wallet/src-tauri/Cargo.toml b/tauri-wallet/src-tauri/Cargo.toml index 4558ede657..34b8494a87 100644 --- a/tauri-wallet/src-tauri/Cargo.toml +++ b/tauri-wallet/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.0.0-beta.4" } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.0.0-beta.6", features = ["api-all"] } +tauri = { version = "1.0.0-beta.6", features = [] } tokio = { version = "1.10", features = ["sync"] } dirs = "3.0" url = "2.2" diff --git a/tauri-wallet/src/components/Page.tsx b/tauri-wallet/src/components/Page.tsx index 4f9ee67ee1..dca768257c 100644 --- a/tauri-wallet/src/components/Page.tsx +++ b/tauri-wallet/src/components/Page.tsx @@ -22,9 +22,7 @@ export const Page = ({ children }: { children: React.ReactElement }) => { style={{ gridArea: '1 / 1 / 2 / 2', background: '#121726', - - borderTopRightRadius: 10, - borderBottomRightRadius: 10, + overflow: 'auto', }} >
{ + const handleSignIn = (e: React.FormEvent) => { + e.preventDefault() + + history.push('/bond') + } + const [loading, setLoading] = useState(false) const theme: Theme = useTheme() const history = useHistory() @@ -35,8 +43,6 @@ export const SignIn = () => { display: 'flex', alignItems: 'center', justifyContent: 'center', - borderTopRightRadius: 10, - borderBottomRightRadius: 10, }} > @@ -47,11 +53,18 @@ export const SignIn = () => { display: 'flex', alignItems: 'center', justifyContent: 'center', + background: theme.palette.grey[100], }} > -
+ Sign in -
history.push('/balance')}> + { color="primary" type="submit" disabled={loading} - size="large" disableElevation > Sign In @@ -88,7 +100,7 @@ export const SignIn = () => {
-
+
) diff --git a/tauri-wallet/src/theme.tsx b/tauri-wallet/src/theme.tsx index 688d745914..ea0354e98d 100644 --- a/tauri-wallet/src/theme.tsx +++ b/tauri-wallet/src/theme.tsx @@ -1,6 +1,9 @@ import { createTheme } from '@material-ui/core' export const theme = createTheme({ + shape: { + borderRadius: 24, + }, palette: { primary: { main: '#F4731B', @@ -12,7 +15,6 @@ export const theme = createTheme({ overrides: { MuiButton: { root: { - borderRadius: 50, padding: '12px 24px', }, containedPrimary: { @@ -22,12 +24,7 @@ export const theme = createTheme({ padding: 'default', }, }, - MuiOutlinedInput: { - root: { - borderRadius: 50, - background: '#fff', - }, - }, + MuiStepIcon: { text: { fill: '#fff',