global theme update

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"

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',
         }}
       >
         <div

tauri-wallet/src/routes/sign-in.tsx

@@ -7,12 +7,20 @@ import {
   Grid,
   Link,
   Theme,
+  Card,
 } from '@material-ui/core'
 import { useTheme } from '@material-ui/styles'
 import logo from '../images/logo.png'
 import { useHistory } from 'react-router-dom'
+import { invoke } from '@tauri-apps/api'
 
 export const SignIn = () => {
+  const handleSignIn = (e: React.FormEvent<any>) => {
+    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,
         }}
       >
         <img src={logo} style={{ width: 100 }} />
@@ -47,11 +53,18 @@ export const SignIn = () => {
           display: 'flex',
           alignItems: 'center',
           justifyContent: 'center',
+          background: theme.palette.grey[100],
         }}
       >
-        <div style={{ width: 400 }}>
+        <Card
+          style={{
+            width: 600,
+            padding: theme.spacing(6, 10),
+            borderRadius: theme.shape.borderRadius,
+          }}
+        >
           <Typography variant="h4">Sign in</Typography>
-          <form noValidate onSubmit={() => history.push('/balance')}>
+          <form noValidate onSubmit={handleSignIn}>
             <Grid container direction="column" spacing={1}>
               <Grid item>
                 <TextField
@@ -74,7 +87,6 @@ export const SignIn = () => {
                   color="primary"
                   type="submit"
                   disabled={loading}
-                  size="large"
                   disableElevation
                 >
                   Sign In
@@ -88,7 +100,7 @@ export const SignIn = () => {
               </Grid>
             </Grid>
           </form>
-        </div>
+        </Card>
       </div>
     </div>
   )

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',