aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-03-18 23:22:36 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-03-18 23:22:36 -0700
commit10f244d54f795bbeebc280248e26f9c078a639fd (patch)
tree6b475566656f8c22d6551e815bee7ae206d56649
parent3096af9224bed447d0be5de392dbebe5d3965fbd (diff)
downloadetbsa-traccar-web-10f244d54f795bbeebc280248e26f9c078a639fd.tar.gz
etbsa-traccar-web-10f244d54f795bbeebc280248e26f9c078a639fd.tar.bz2
etbsa-traccar-web-10f244d54f795bbeebc280248e26f9c078a639fd.zip
Fix deprecated usages
-rw-r--r--modern/src/LoginPage.js18
-rw-r--r--modern/src/MainToolbar.js2
2 files changed, 10 insertions, 10 deletions
diff --git a/modern/src/LoginPage.js b/modern/src/LoginPage.js
index ac4a51c..c094fa3 100644
--- a/modern/src/LoginPage.js
+++ b/modern/src/LoginPage.js
@@ -11,23 +11,23 @@ const styles = theme => ({
root: {
width: 'auto',
display: 'block', // Fix IE11 issue.
- marginLeft: theme.spacing.unit * 3,
- marginRight: theme.spacing.unit * 3,
- [theme.breakpoints.up(400 + theme.spacing.unit * 3 * 2)]: {
+ marginLeft: theme.spacing(3),
+ marginRight: theme.spacing(3),
+ [theme.breakpoints.up(400 + theme.spacing(3 * 2))]: {
width: 400,
marginLeft: 'auto',
marginRight: 'auto',
},
},
paper: {
- marginTop: theme.spacing.unit * 8,
+ marginTop: theme.spacing(8),
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
- padding: `${theme.spacing.unit * 3}px`,
+ padding: `${theme.spacing(3)}px`,
},
logo: {
- margin: `${theme.spacing.unit * 2}px 0 ${theme.spacing.unit}px`
+ margin: `${theme.spacing(2)}px 0 ${theme.spacing(1)}px`
},
buttons: {
width: '100%',
@@ -36,7 +36,7 @@ const styles = theme => ({
},
button: {
flex: '1 1 0',
- margin: `${theme.spacing.unit * 3}px ${theme.spacing.unit}px 0`
+ margin: `${theme.spacing(3)}px ${theme.spacing(1)}px 0`
},
});
@@ -119,7 +119,7 @@ class LoginPage extends Component {
<Button
type="button"
- variant="raised"
+ variant="contained"
disabled
className={classes.button}
onClick={this.handleRegister}>
@@ -128,7 +128,7 @@ class LoginPage extends Component {
<Button
type="submit"
- variant="raised"
+ variant="contained"
color="primary"
disabled={!email || !password}
className={classes.button}>
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index 2e6049d..c5af9d8 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -77,7 +77,7 @@ class MainToobar extends Component {
onClick={this.openDrawer}>
<MenuIcon />
</IconButton>
- <Typography variant="title" color="inherit" className={classes.flex}>
+ <Typography variant="h6" color="inherit" className={classes.flex}>
Traccar
</Typography>
<Button color="inherit" onClick={this.handleLogout}>Logout</Button>