From 66eb9c1a687b5e254b0f9c8b6cb8ffbf9e2fc524 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 8 May 2022 14:31:29 -0700
Subject: Remove extra nesting

---
 modern/public/index.html | 2 +-
 modern/public/styles.css | 6 ++++++
 modern/src/App.js        | 9 ++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'modern')

diff --git a/modern/public/index.html b/modern/public/index.html
index f4d436c0..f0307b7b 100644
--- a/modern/public/index.html
+++ b/modern/public/index.html
@@ -13,6 +13,6 @@
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
-    <div id="root" style="height: 100%;"></div>
+    <div id="root" class="root"></div>
   </body>
 </html>
diff --git a/modern/public/styles.css b/modern/public/styles.css
index e0fed800..841c95d1 100644
--- a/modern/public/styles.css
+++ b/modern/public/styles.css
@@ -12,6 +12,12 @@ canvas {
   -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
 }
 
+.root {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
 .maplibregl-popup-content {
   padding: 10px !important;
 }
diff --git a/modern/src/App.js b/modern/src/App.js
index 5c5c2591..64c3e24f 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -53,11 +53,6 @@ import AccumulatorsPage from './settings/AccumulatorsPage';
 import CommandSendPage from './settings/CommandSendPage';
 
 const useStyles = makeStyles(() => ({
-  root: {
-    display: 'flex',
-    flexDirection: 'column',
-    height: '100%',
-  },
   page: {
     flexGrow: 1,
     overflow: 'auto',
@@ -114,7 +109,7 @@ const App = () => {
           <Route exact path="/reset-password" component={ResetPasswordPage} />
           <Route>
             {!initialized ? (<LinearProgress />) : (
-              <div className={classes.root}>
+              <>
                 <div className={classes.page}>
                   <Switch>
                     <Route exact path="/" component={MainPage} />
@@ -158,7 +153,7 @@ const App = () => {
                     <BottomMenu />
                   </div>
                 )}
-              </div>
+              </>
             )}
           </Route>
         </Switch>
-- 
cgit v1.2.3