From 2df3827308d8d2e3ec16a32bac5f7667bc2618e2 Mon Sep 17 00:00:00 2001 From: Desmond Kyeremeh Date: Tue, 29 Jun 2021 03:52:31 +0000 Subject: Updated disabled button style --- modern/src/theme/overrides.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js index c8d64a9..846859f 100644 --- a/modern/src/theme/overrides.js +++ b/modern/src/theme/overrides.js @@ -44,6 +44,17 @@ export default { MuiButton: { root: { height: dimensions.inputHeight, + '&$disabled': { + opacity: .4, + color: undefined, + } + }, + contained: { + '&$disabled': { + opacity: .4, + color: undefined, + backgroundColor: undefined + } } } }; -- cgit v1.2.3 From a6b0e4b8128233e2583dcd32f66657d3461ce41d Mon Sep 17 00:00:00 2001 From: Desmond Kyeremeh Date: Tue, 29 Jun 2021 05:59:43 +0000 Subject: Pad inputs and buttons --- modern/src/theme/overrides.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js index 846859f..bf171ff 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,8 @@ export default { MuiButton: { root: { height: dimensions.inputHeight, + marginTop: 5, + marginBottom: 5, '&$disabled': { opacity: .4, color: undefined, @@ -56,5 +59,17 @@ export default { backgroundColor: undefined } } + }, + MuiFormHelperText: { + root: { + marginBottom: -10 + } + }, + MuiAutocomplete: { + inputRoot: { + '&.MuiFilledInput-root': { + paddingTop: 0 + } + } } }; -- cgit v1.2.3 From 94ed7577a3fc84442fc8c3f2274ffdfa030bff87 Mon Sep 17 00:00:00 2001 From: Desmond Kyeremeh Date: Tue, 29 Jun 2021 06:10:07 +0000 Subject: Updated padding for login, report filters and registration --- modern/src/components/registration/LoginForm.js | 2 +- modern/src/components/registration/RegisterForm.js | 2 +- modern/src/reports/ReportFilter.js | 14 +------------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/components/registration/LoginForm.js index d2a57a2..382b4fd 100644 --- a/modern/src/components/registration/LoginForm.js +++ b/modern/src/components/registration/LoginForm.js @@ -59,7 +59,7 @@ const LoginForm = () => { return ( - + {useMediaQuery(theme.breakpoints.down('md')) && diff --git a/modern/src/components/registration/RegisterForm.js b/modern/src/components/registration/RegisterForm.js index a532d09..29089db 100644 --- a/modern/src/components/registration/RegisterForm.js +++ b/modern/src/components/registration/RegisterForm.js @@ -52,7 +52,7 @@ const RegisterForm = () => { onClose={() => history.push('/login')} autoHideDuration={6000} message={t('loginCreated')} /> - + diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js index 8055d30..b9817d5 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 ( - + {t('reportDevice')} -- cgit v1.2.3 From 7ecb8dac8315231f75c1aadac901d98f28e6c316 Mon Sep 17 00:00:00 2001 From: Desmond Kyeremeh Date: Wed, 30 Jun 2021 17:28:58 +0000 Subject: Align input helper text and label --- modern/src/theme/overrides.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js index bf171ff..cd6c5a5 100644 --- a/modern/src/theme/overrides.js +++ b/modern/src/theme/overrides.js @@ -63,6 +63,9 @@ export default { MuiFormHelperText: { root: { marginBottom: -10 + }, + contained: { + marginLeft: 12 } }, MuiAutocomplete: { -- cgit v1.2.3 From a6bd780f7570a813d87741b25effe886803f9d10 Mon Sep 17 00:00:00 2001 From: Desmond Kyeremeh Date: Wed, 30 Jun 2021 17:29:21 +0000 Subject: Updated Registration form --- modern/src/components/registration/RegisterForm.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modern/src/components/registration/RegisterForm.js b/modern/src/components/registration/RegisterForm.js index 29089db..b2a8222 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), -- cgit v1.2.3