Remove useStyles from Mobile Navigation

CodeForAfrica · Nov 26, 2024 · 69faa7c · 69faa7c
1 parent 8574274
commit 69faa7c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 19 deletions.
diff --git a/apps/climatemappedafrica/src/components/Loading/index.js b/apps/climatemappedafrica/src/components/Loading/index.js
@@ -1,20 +1,16 @@
 import { Box, CircularProgress } from "@mui/material";
-import makeStyles from "@mui/styles/makeStyles";
 import React from "react";
 
-const useStyles = makeStyles(({ typography }) => ({
-  root: {},
-  box: {
-    justifyContent: "center",
-    height: typography.pxToRem(50),
-  },
-}));
-
 function Loading() {
-  const classes = useStyles();
   return (
-    <Box sx={{ display: "flex" }} className={classes.box}>
-      <CircularProgress className={classes.progress} />
+    <Box
+      sx={({ typography }) => ({
+        display: "flex",
+        justifyContent: "center",
+        height: typography.pxToRem(50),
+      })}
+    >
+      <CircularProgress />
     </Box>
   );
 }

diff --git a/apps/climatemappedafrica/src/components/Menu/index.js b/apps/climatemappedafrica/src/components/Menu/index.js
@@ -82,7 +82,11 @@ function Menu({ children, explorePagePath, links, socialLinks, ...props }) {
       alignItems={{ lg: "center" }}
       direction={{ xs: "column", lg: "row" }}
       justifyContent={{ lg: "flex-end" }}
-      className={classes.root}
+      sx={{
+        padding: {
+          lg: 0,
+        },
+      }}
     >
       {links.map((item, index) => (
         <Grid
@@ -129,7 +133,15 @@ function Menu({ children, explorePagePath, links, socialLinks, ...props }) {
             <Typography
               component="span"
               variant="body1"
-              className={classes.label}
+              sx={({ typography }) => ({
+                fontWeight: 600,
+                letterSpacing: "1.6px",
+                fontSize: {
+                  xs: typography.pxToRem(20),
+                  lg: typography.pxToRem(16),
+                },
+                textTransform: "uppercase",
+              })}
             >
               {item.label}
             </Typography>

diff --git a/apps/climatemappedafrica/src/components/Navigation/MobileNavigation/index.js b/apps/climatemappedafrica/src/components/Navigation/MobileNavigation/index.js
@@ -156,8 +156,11 @@ function MobileNavigation({
       container
       alignItems="center"
       justifyContent="space-between"
-      className={classes.logoSection}
-      sx={sx}
+      sx={({ palette, typography }) => ({
+        borderBottom: `2px solid ${palette.background.default}`,
+        padding: `${typography.pxToRem(10)} 0`,
+        ...sx,
+      })}
     >
       <Grid item xs={10}>
         <NextImageButton
@@ -200,13 +203,21 @@ function MobileNavigation({
         TransitionComponent={Transition}
         classes={{ root: classes.dialog, paper: classes.dialogPaper }}
       >
-        <DialogActions className={classes.dialogActions}>
+        <DialogActions
+          sx={{
+            padding: 0,
+          }}
+        >
           <Section className={classes.section}>
             <Grid
               container
               alignItems="center"
               justifyContent="space-between"
-              className={classes.logoSection}
+              sx={({ palette, typography }) => ({
+                borderBottom: `2px solid ${palette.background.default}`,
+                padding: `${typography.pxToRem(10)} 0`,
+                ...sx,
+              })}
             >
               <Grid item xs={10}>
                 <NextImageButton
@@ -239,7 +250,12 @@ function MobileNavigation({
             </Grid>
           </Section>
         </DialogActions>
-        <DialogContent className={classes.dialogContent}>
+        <DialogContent
+          sx={({ typography }) => ({
+            overflow: "hidden",
+            padding: `${typography.pxToRem(40)} 0`,
+          })}
+        >
           <Section className={classes.section}>
             <Menu
               explorePagePath={explorePagePath}