From 9dcecc62460c27b037fe7e56416afe6172404ef0 Mon Sep 17 00:00:00 2001
From: Desmond Kyeremeh <elDekyfin@gmail.com>
Date: Tue, 20 Jul 2021 21:33:52 +0000
Subject: Updated Main page

---
 modern/src/MainPage.js         | 17 ++++++++---------
 modern/src/theme/dimensions.js |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'modern/src')

diff --git a/modern/src/MainPage.js b/modern/src/MainPage.js
index c411ec5a..a53cec1a 100644
--- a/modern/src/MainPage.js
+++ b/modern/src/MainPage.js
@@ -9,7 +9,7 @@ import useMediaQuery from '@material-ui/core/useMediaQuery';
 import AddIcon from '@material-ui/icons/Add';
 import CloseIcon from '@material-ui/icons/Close';
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
-import ListIcon from '@material-ui/icons/List';
+import ListIcon from '@material-ui/icons/ViewList';
 
 import DevicesList from './DevicesList';
 import Map from './map/Map';
@@ -18,7 +18,7 @@ import AccuracyMap from './map/AccuracyMap';
 import GeofenceMap from './map/GeofenceMap';
 import CurrentPositionsMap from './map/CurrentPositionsMap';
 import CurrentLocationMap from './map/CurrentLocationMap';
-import BottomNav from "./components/BottomNav"
+import BottomNav from './components/BottomNav';
 import t from './common/localization';
 
 const useStyles = makeStyles((theme) => ({
@@ -27,13 +27,13 @@ const useStyles = makeStyles((theme) => ({
   },
   sidebar: {
     display: 'flex',
-    flexDirection: "column",
+    flexDirection: 'column',
     position: 'absolute',
     left: 0,
     top: 0,
     margin: theme.spacing(1.5),
     width: theme.dimensions.drawerWidthDesktop,
-    bottom: theme.spacing(9.5),
+    bottom: theme.spacing(8),
     zIndex: 1301,
     transition: 'transform .5s ease',
     [theme.breakpoints.down('md')]: {
@@ -57,12 +57,12 @@ const useStyles = makeStyles((theme) => ({
     padding: theme.spacing(0, 1),
     '& > *': {
       margin: theme.spacing(0, 1),
-    }
+    },
   },
   deviceList: {
     flex: 1,
     overflow: 'auto',
-    paddingTop: theme.spacing(1.5),
+    padding: theme.spacing(1.5, 0),
   },
   sidebarToggle: {
     position: 'absolute',
@@ -71,7 +71,6 @@ const useStyles = makeStyles((theme) => ({
     borderRadius: '0px',
     [theme.breakpoints.down('md')]: {
       left: theme.spacing(0),
-      top: theme.spacing(7),
     },
   },
   sidebarToggleBg: {
@@ -113,9 +112,9 @@ const MainPage = () => {
         classes={{ containedPrimary: classes.sidebarToggleBg }}
         className={classes.sidebarToggle}
         onClick={handleClose}
-        startIcon={<ListIcon />}
         disableElevation
       >
+        <ListIcon />
         {!isPhone ? t('deviceTitle') : ''}
       </Button>
       <div className={`${classes.sidebar} ${collapsed && classes.sidebarCollapsed}`}>
@@ -150,7 +149,7 @@ const MainPage = () => {
           <DevicesList />
         </div>
       </div>
-      
+
       <BottomNav showOnDesktop />
     </div>
   );
diff --git a/modern/src/theme/dimensions.js b/modern/src/theme/dimensions.js
index fcdbaee5..b6edc5e9 100644
--- a/modern/src/theme/dimensions.js
+++ b/modern/src/theme/dimensions.js
@@ -9,4 +9,5 @@ export default {
   columnWidthNumber: 130,
   columnWidthString: 160,
   columnWidthBoolean: 130,
+  bottomNavMaxWidth: '400px',
 };
-- 
cgit v1.2.3