Merge branch 'main' of github.com:lopatoj/hackrice14

Allen-Mikhailov · Sep 22, 2024 · 9b48794 · 9b48794
2 parents 3cf51fd + 2cec7e7
commit 9b48794
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/client/src/assets/motivibes.png → client/public/motivibes.png b/client/src/assets/motivibes.png → client/public/motivibes.png
diff --git a/client/src/index.css b/client/src/index.css
@@ -35,7 +35,7 @@ a:hover {
 body {
   margin: 0;
   display: flex;
-  overflow-y: scroll;
+  /* overflow-y: scroll; */
   background-image: url('./assets/5dots.webp');
   color: rgb(255,255,255)
 

diff --git a/client/src/pages/Navbar/Navbar.tsx b/client/src/pages/Navbar/Navbar.tsx
@@ -64,7 +64,7 @@ function BaseNavbar() {
       <Navbar collapseOnSelect expand="lg" className="bg-body-tertiary" data-bs-theme="dark" style={{backgroundImage:"linear-gradient(to top, rgba(20,21,21,0), rgba(40,40,40,1)", backgroundColor:"rgba(0,0,0,0)"}} >
       <Container >
         <Navbar.Brand as={Link} to="">
-          <img src="src/assets/motivibes.png" alt="logo" style={{width:40,height:40,marginRight:20}}></img>
+          <img src="motivibes.png" alt="logo" style={{width:40,height:40,marginRight:20}}></img>
 
           Moti-Vibes
           </Navbar.Brand>
@@ -73,7 +73,6 @@ function BaseNavbar() {
           <Nav className="me-auto">
             <Nav.Link as={Link} to="userinfo">User Profile</Nav.Link>
             <Nav.Link as={Link} to="todo">Todo</Nav.Link>
-            <Nav.Link as={Link} to="chat">Test chat</Nav.Link>
             <Nav.Link as={Link} to="chatSelect">Chat</Nav.Link>
           </Nav>
           {user?<SignedIn/>:<SignedOut/>}