menu fixes

ltonetwork · Mar 26, 2024 · 4383291 · 4383291
1 parent 7e4751d
commit 4383291
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/src/components/global/Sidebar.jsx b/src/components/global/Sidebar.jsx
@@ -99,7 +99,7 @@ const Sidebar = () => {
         <Menu iconShape="square">
           <MenuItem
             onClick={handleToggleCollapse}
-            icon={isCollapsed ? <MenuOutlinedIcon /> : undefined}
+            //icon={isCollapsed ? <MenuOutlinedIcon /> : undefined}
             style={{
               margin: "10px 0 40px 0",
               color: "#17054b",
@@ -111,7 +111,7 @@ const Sidebar = () => {
               alignItems="center"
               ml="15px"
             >
-              <img
+              {/* <img
                 alt="lto-icon"
                 width="30px"
                 src={ltoIcon}
@@ -120,14 +120,16 @@ const Sidebar = () => {
                   marginRight: "2px",
                   borderRadius: "50%",
                 }}
-              />
-              <Typography
-                style={{ fontSize: "16px", fontWeight: "600" }}
-                variant="h6"
-                color="#17054b"
-              >
-                DASHBOARD
-              </Typography>
+              /> */}
+              {isHovered && (
+                <Typography
+                  style={{ fontSize: "24px", fontWeight: "600" }}
+                  variant="h6"
+                  color="#17054b"
+                >
+                  DASHBOARD
+                </Typography>
+              )}
               <IconButton onClick={handleToggleCollapse}>
                 {/* <MenuOutlinedIcon /> */}
               </IconButton>
@@ -192,12 +194,12 @@ const Sidebar = () => {
             />
           </Box>
 
-          {!isCollapsed && (
+          {isHovered && (
             <Box mt="70px" mb="25px">
               <Box display="flex" justifyContent="center" alignItems="center">
                 <img
                   alt="lto-network"
-                  width="150px"
+                  width="180px"
                   src={LOGO}
                   style={{ cursor: "pointer" }}
                 />

diff --git a/src/components/global/Topbar.jsx b/src/components/global/Topbar.jsx
@@ -4,7 +4,7 @@ import { Box, IconButton, useTheme, Typography } from "@mui/material";
 import InputBase from "@mui/material/InputBase";
 import SearchIcon from "@mui/icons-material/Search";
 import ArrowOutwardOutlinedIcon from "@mui/icons-material/ArrowOutwardOutlined";
-import { ltoIcon } from "../../assets";
+import { LOGO, ltoIcon } from "../../assets/index";
 
 const Topbar = () => {
   const theme = useTheme();
@@ -27,12 +27,23 @@ const Topbar = () => {
 
   return (
     <div style={{ backgroundColor: theme.palette.primary.main }}>
+      <Box></Box>
       <Box
         display="flex"
         justifyContent="space-between"
         alignItems="center"
         p={2}
       >
+        <img
+          alt="lto-icon"
+          width="40px"
+          src={ltoIcon}
+          style={{
+            cursor: "pointer",
+            marginRight: "2px",
+            // borderRadius: "50%",
+          }}
+        />
         {/* {isMobile && (
           <Box display="flex" backgroundColor="white" borderRadius="3px">
             <InputBase sx={{ ml: 2, flex: 1 }} placeholder="Search" />