From f7ada6916541047f8ddf6eb2d1a45ddc3b9dead0 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Thu, 6 May 2021 14:47:56 +0530 Subject: More code improvement --- modern/src/theme/overrides.js | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 modern/src/theme/overrides.js (limited to 'modern/src/theme/overrides.js') diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js new file mode 100644 index 0000000..021770b --- /dev/null +++ b/modern/src/theme/overrides.js @@ -0,0 +1,48 @@ +import dimensions from './dimensions'; + +export default { + MuiFormControl: { + root: { + height: dimensions.inputHeight, + } + }, + MuiInputLabel: { + filled: { + transform: 'translate(12px, 14px) scale(1)', + '&$shrink' :{ + transform: 'translate(12px, -12px) scale(0.75)' + } + }, + }, + MuiFilledInput: { + root: { + height: dimensions.inputHeight, + borderRadius: dimensions.borderRadius, + }, + input: { + height: dimensions.inputHeight, + borderRadius: dimensions.borderRadius, + paddingTop: '10px', + boxSizing: 'border-box', + '&:-webkit-autofill': { + WebkitBoxShadow: '0 0 0 100px #eeeeee inset', + }, + }, + underline: { + "&:before": { + borderBottom: 'none', + }, + "&:after": { + borderBottom: 'none', + }, + "&:hover:before": { + borderBottom: 'none', + }, + } + }, + MuiButton: { + root: { + height: dimensions.inputHeight, + } + } +}; -- cgit v1.2.3 From 8b7e1491fa1003172e1d653ce1fd774ebee8451e Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Fri, 7 May 2021 13:22:04 +0530 Subject: More code improvement --- modern/src/LoginPage.js | 19 +++++++++++++------ modern/src/theme/dimensions.js | 9 ++++----- modern/src/theme/overrides.js | 2 ++ modern/src/theme/palette.js | 4 ++-- 4 files changed, 21 insertions(+), 13 deletions(-) (limited to 'modern/src/theme/overrides.js') diff --git a/modern/src/LoginPage.js b/modern/src/LoginPage.js index 18638d2..f029cbc 100644 --- a/modern/src/LoginPage.js +++ b/modern/src/LoginPage.js @@ -21,9 +21,9 @@ const useStyles = makeStyles(theme => ({ alignItems: 'center', background: theme.palette.common.purple, paddingBottom: theme.spacing(5), - width: `${theme.dimensions.sidebarWidth}%`, + width: theme.dimensions.sidebarWidth, [theme.breakpoints.down('md')]: { - width: `${theme.dimensions.minSidebarWidth}px`, + width: theme.dimensions.tabletSidebarWidth, }, [theme.breakpoints.down('xs')]: { width: '0px', @@ -35,11 +35,18 @@ const useStyles = makeStyles(theme => ({ justifyContent: 'center', alignItems: 'center', flex: 1, - //padding: theme.spacing(0, 25, 0, 0), - boxShadow: '-2px 0px 16px rgba(0, 0, 0, 0.25)' + boxShadow: '-2px 0px 16px rgba(0, 0, 0, 0.25)', + [theme.breakpoints.up('lg')]: { + padding: theme.spacing(0, 25, 0, 0) + }, }, form: { - maxWidth: theme.dimensions.maxFormWidth, + maxWidth: theme.spacing(52), + padding: theme.spacing(5), + width: "100%", + }, + logo: { + textAlign: 'center', }, })); @@ -94,7 +101,7 @@ const LoginPage = () => {
- + {matches && } diff --git a/modern/src/theme/dimensions.js b/modern/src/theme/dimensions.js index bc20cb9..e36fc23 100644 --- a/modern/src/theme/dimensions.js +++ b/modern/src/theme/dimensions.js @@ -1,7 +1,6 @@ export default { - inputHeight: 42, - borderRadius: 4, - maxFormWidth: 335, - sidebarWidth: 28, - minSidebarWidth: 52 + inputHeight: '42px', + borderRadius: '4px', + sidebarWidth: '28%', + tabletSidebarWidth: '52px' }; diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js index 021770b..28ac746 100644 --- a/modern/src/theme/overrides.js +++ b/modern/src/theme/overrides.js @@ -18,6 +18,7 @@ export default { root: { height: dimensions.inputHeight, borderRadius: dimensions.borderRadius, + background: 'rgba(0, 0, 0, 0.035)', }, input: { height: dimensions.inputHeight, @@ -43,6 +44,7 @@ export default { MuiButton: { root: { height: dimensions.inputHeight, + textTransform: 'none' } } }; diff --git a/modern/src/theme/palette.js b/modern/src/theme/palette.js index 24aefce..5a54b77 100644 --- a/modern/src/theme/palette.js +++ b/modern/src/theme/palette.js @@ -1,7 +1,7 @@ import { deepPurple, green } from '@material-ui/core/colors'; -const traccarPurple = deepPurple[500]; -const traccarGreen = green[500]; +const traccarPurple = '#333366'; +const traccarGreen = '#4CAF50'; const traccarWhite = '#FFF'; export default { -- cgit v1.2.3 From 47f8bd006edf77b1325ecb36e594eed2fa0dd26e Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Fri, 7 May 2021 16:22:54 +0530 Subject: Replacing button with link for Reset Password --- modern/src/LoginPage.js | 8 +++----- modern/src/theme/overrides.js | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'modern/src/theme/overrides.js') diff --git a/modern/src/LoginPage.js b/modern/src/LoginPage.js index f029cbc..30275e5 100644 --- a/modern/src/LoginPage.js +++ b/modern/src/LoginPage.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import { useHistory } from 'react-router-dom'; import { sessionActions } from './store'; -import { Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormControl, Button, TextField, Paper } from '@material-ui/core'; +import { Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormControl, Button, TextField, Paper, Link } from '@material-ui/core'; import { useTheme } from '@material-ui/core/styles'; import RegisterDialog from './RegisterDialog'; import { useSelector } from 'react-redux'; @@ -156,11 +156,9 @@ const LoginPage = () => { - + - + {t('loginReset')} diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js index 28ac746..c8d64a9 100644 --- a/modern/src/theme/overrides.js +++ b/modern/src/theme/overrides.js @@ -44,7 +44,6 @@ export default { MuiButton: { root: { height: dimensions.inputHeight, - textTransform: 'none' } } }; -- cgit v1.2.3