Merge branch 'master' of github.com:traccar/traccar-web into fix-key-issue

3 files changed, 18 insertions, 90 deletions

diff --git a/modern/src/common/theme/components.js b/modern/src/common/theme/components.js
new file mode 100644
index 00000000..f5f3acaa
--- /dev/null
+++ b/modern/src/common/theme/components.js
@@ -0,0 +1,15 @@
+export default {
+  MuiFormControl: {
+    defaultProps: {
+      size: 'small',
+    },
+  },
+  MuiSnackbar: {
+    defaultProps: {
+      anchorOrigin: {
+        vertical: 'bottom',
+        horizontal: 'center',
+      },
+    },
+  },
+};
diff --git a/modern/src/common/theme/index.js b/modern/src/common/theme/index.js
index 02865c23..0cc999ad 100644
--- a/modern/src/common/theme/index.js
+++ b/modern/src/common/theme/index.js
@@ -1,12 +1,12 @@
-import { createTheme } from '@material-ui/core/styles';
+import { createTheme } from '@mui/material/styles';
 import palette from './palette';
-import overrides from './overrides';
 import dimensions from './dimensions';
+import components from './components';
 
 const theme = createTheme({
   palette,
-  overrides,
   dimensions,
+  components,
 });
 
 export default theme;
diff --git a/modern/src/common/theme/overrides.js b/modern/src/common/theme/overrides.js
deleted file mode 100644
index d1fe844c..00000000
--- a/modern/src/common/theme/overrides.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import dimensions from './dimensions';
-
-export default {
-  MuiFormControl: {
-    root: {
-      marginTop: 5,
-      marginBottom: 5,
-    },
-  },
-  MuiInputLabel: {
-    filled: {
-      transform: 'translate(12px, 14px) scale(1)',
-      '&$shrink': {
-        transform: 'translate(12px, -14px) scale(0.72)',
-      },
-    },
-  },
-  MuiFilledInput: {
-    root: {
-      height: dimensions.inputHeight,
-      borderRadius: dimensions.borderRadius,
-      backgroundColor: 'rgba(0, 0, 0, 0.035)',
-    },
-    input: {
-      height: dimensions.inputHeight,
-      borderRadius: dimensions.borderRadius,
-      paddingTop: '11.5px',
-      paddingBottom: '11.5px',
-      boxSizing: 'border-box',
-      '&:-webkit-autofill': {
-        WebkitBoxShadow: '0 0 0 100px #eeeeee inset',
-      },
-    },
-    underline: {
-      '&:before': {
-        borderBottom: 'none',
-      },
-      '&:after': {
-        borderBottom: 'none',
-      },
-      '&:hover:before': {
-        borderBottom: 'none',
-      },
-    },
-  },
-  MuiSelect: {
-    select: {
-      borderRadius: dimensions.borderRadius,
-      '&&:focus': {
-        borderRadius: dimensions.borderRadius,
-      },
-    },
-  },
-  MuiButton: {
-    root: {
-      height: dimensions.inputHeight,
-      marginTop: 5,
-      marginBottom: 5,
-      '&$disabled': {
-        opacity: 0.4,
-        color: undefined,
-      },
-    },
-    contained: {
-      '&$disabled': {
-        opacity: 0.4,
-        color: undefined,
-        backgroundColor: undefined,
-      },
-    },
-  },
-  MuiFormHelperText: {
-    root: {
-      marginBottom: -10,
-    },
-    contained: {
-      marginLeft: 12,
-    },
-  },
-  MuiAutocomplete: {
-    inputRoot: {
-      '&.MuiFilledInput-root': {
-        paddingTop: 0,
-      },
-    },
-  },
-};