Merge pull request #15 from emilymarkova/Logo

Logo
emilymarkova · Jul 22, 2024 · ea279de · ea279de
2 parents 36f252c + 6171994
commit ea279de
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="./logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta

diff --git a/public/logo.png b/public/logo.png
diff --git a/src/Components/NavBar.css b/src/Components/NavBar.css
@@ -10,4 +10,9 @@
 
 .nav-button {
   color: "#B2DBD7",
+}
+
+.logo {
+  max-width: 50px;
+  max-height: 50spx;
 }
diff --git a/src/Components/NavBar.tsx b/src/Components/NavBar.tsx
@@ -10,7 +10,7 @@ import Avatar from "@mui/material/Avatar";
 import Button from "@mui/material/Button";
 import Tooltip from "@mui/material/Tooltip";
 import MenuItem from "@mui/material/MenuItem";
-import AdbIcon from "@mui/icons-material/Adb";
+import Logo from "../assets/logo.png";
 import { Link as RouterLink } from "react-router-dom";
 import { getAuth, onAuthStateChanged } from "firebase/auth";
 import { signOut } from "firebase/auth";
@@ -105,19 +105,7 @@ function NavBar() {
                 justifyContent: "center",
               }}
             >
-              <AdbIcon
-                sx={{
-                  display: {
-                    xs: "none",
-                    sm: "none",
-                    md: "flex",
-                    lg: "flex",
-                    xl: "flex",
-                  },
-                  mr: 1,
-                }}
-              />
-
+              <img className="logo" src={Logo} alt="logo"/>
               <Typography
                 variant="h4"
                 noWrap
@@ -210,18 +198,7 @@ function NavBar() {
                 ))}
               </Menu>
             </Box>
-            <AdbIcon
-              sx={{
-                display: {
-                  xs: "flex",
-                  sm: "flex",
-                  md: "none",
-                  lg: "none",
-                  xl: "none",
-                },
-                mr: 1,
-              }}
-            />
+
             <Typography
               variant="h5"
               className="navBar"

diff --git a/src/assets/logo.png b/src/assets/logo.png