aboutsummaryrefslogtreecommitdiff
path: root/modern
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-06-30 10:31:37 -0700
committerGitHub <noreply@github.com>2021-06-30 10:31:37 -0700
commit0c712a70f56995e7af329846835d6d1f0343a2f1 (patch)
tree34a038a787aa84ab4bd2a2a9388c53266c4c88b9 /modern
parent249f0437362ffbd3e14aa04a482ce03eb7e351e4 (diff)
parenta6bd780f7570a813d87741b25effe886803f9d10 (diff)
downloadtrackermap-web-0c712a70f56995e7af329846835d6d1f0343a2f1.tar.gz
trackermap-web-0c712a70f56995e7af329846835d6d1f0343a2f1.tar.bz2
trackermap-web-0c712a70f56995e7af329846835d6d1f0343a2f1.zip
Merge pull request #871 from dkyeremeh/inputs-fix
Inputs fix
Diffstat (limited to 'modern')
-rw-r--r--modern/src/components/registration/LoginForm.js2
-rw-r--r--modern/src/components/registration/RegisterForm.js6
-rw-r--r--modern/src/reports/ReportFilter.js14
-rw-r--r--modern/src/theme/overrides.js35
4 files changed, 38 insertions, 19 deletions
diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/components/registration/LoginForm.js
index d2a57a2c..382b4fdc 100644
--- a/modern/src/components/registration/LoginForm.js
+++ b/modern/src/components/registration/LoginForm.js
@@ -59,7 +59,7 @@ const LoginForm = () => {
return (
<StartPage>
- <Grid container direction='column' spacing={3}>
+ <Grid container direction='column' spacing={2}>
{useMediaQuery(theme.breakpoints.down('md')) &&
<Grid item className={classes.logoContainer}>
<svg height="64" width="240">
diff --git a/modern/src/components/registration/RegisterForm.js b/modern/src/components/registration/RegisterForm.js
index a532d09c..b2a8222a 100644
--- a/modern/src/components/registration/RegisterForm.js
+++ b/modern/src/components/registration/RegisterForm.js
@@ -8,7 +8,9 @@ import t from './../../common/localization';
const useStyles = makeStyles(theme => ({
register: {
fontSize: theme.spacing(3),
- fontWeight: 500
+ fontWeight: 500,
+ marginLeft: theme.spacing(2),
+ textTransform: "uppercase"
},
link: {
fontSize: theme.spacing(3),
@@ -52,7 +54,7 @@ const RegisterForm = () => {
onClose={() => history.push('/login')}
autoHideDuration={6000}
message={t('loginCreated')} />
- <Grid container direction='column' spacing={3}>
+ <Grid container direction='column' spacing={2}>
<Grid container item>
<Grid item>
<Typography className={classes.link} color='primary'>
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 8055d30c..b9817d52 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -4,19 +4,7 @@ import { useSelector } from 'react-redux';
import moment from 'moment';
import t from '../common/localization';
-const useStyles = makeStyles(theme => ({
- gridContainer: {
- margin: theme.spacing(0, -1),
- '& > .MuiGrid-item': {
- padding: theme.spacing(1.5, 1)
- }
- }
-}));
-
const ReportFilter = ({ children, handleSubmit, showOnly }) => {
-
- const classes = useStyles();
-
const devices = useSelector(state => Object.values(state.devices.items));
const [deviceId, setDeviceId] = useState();
const [period, setPeriod] = useState('today');
@@ -68,7 +56,7 @@ const ReportFilter = ({ children, handleSubmit, showOnly }) => {
}
return (
- <Grid container spacing={2} className={classes.gridContainer}>
+ <Grid container spacing={2}>
<Grid item xs={12} sm={period === 'custom' ? 3 : 6}>
<FormControl variant="filled" fullWidth>
<InputLabel>{t('reportDevice')}</InputLabel>
diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js
index c8d64a9d..cd6c5a5a 100644
--- a/modern/src/theme/overrides.js
+++ b/modern/src/theme/overrides.js
@@ -3,14 +3,15 @@ import dimensions from './dimensions';
export default {
MuiFormControl: {
root: {
- height: dimensions.inputHeight,
+ marginTop: 5,
+ marginBottom: 5
}
},
MuiInputLabel: {
filled: {
transform: 'translate(12px, 14px) scale(1)',
'&$shrink' :{
- transform: 'translate(12px, -12px) scale(0.75)'
+ transform: 'translate(12px, -14px) scale(0.72)'
}
},
},
@@ -18,7 +19,7 @@ export default {
root: {
height: dimensions.inputHeight,
borderRadius: dimensions.borderRadius,
- background: 'rgba(0, 0, 0, 0.035)',
+ backgroundColor: 'rgba(0, 0, 0, 0.035)',
},
input: {
height: dimensions.inputHeight,
@@ -44,6 +45,34 @@ export default {
MuiButton: {
root: {
height: dimensions.inputHeight,
+ marginTop: 5,
+ marginBottom: 5,
+ '&$disabled': {
+ opacity: .4,
+ color: undefined,
+ }
+ },
+ contained: {
+ '&$disabled': {
+ opacity: .4,
+ color: undefined,
+ backgroundColor: undefined
+ }
+ }
+ },
+ MuiFormHelperText: {
+ root: {
+ marginBottom: -10
+ },
+ contained: {
+ marginLeft: 12
+ }
+ },
+ MuiAutocomplete: {
+ inputRoot: {
+ '&.MuiFilledInput-root': {
+ paddingTop: 0
+ }
}
}
};