Merge pull request #17 from POSUA-NITS/footer

Transition to the Hamburger
POSUA-NITS · Mar 26, 2024 · 6bc353d · 6bc353d
2 parents f383ea1 + ac4ebb7
commit 6bc353d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 45 deletions.
diff --git a/src/Components/Shared/Footer/Footer.module.scss b/src/Components/Shared/Footer/Footer.module.scss
@@ -1,21 +1,15 @@
-// @import url('https://fonts.googleapis.com/css2?family=Philosopher:ital,wght@0,400;0,700;1,400;1,700&display=swap');
-
 .Container {
-  // font-family: 'Philosopher', sans-serif;
-  // bottom: 0;
   background-color: beige;
   background-image: url(https://res.cloudinary.com/dp92qug2f/image/upload/v1711374389/footerbg_posua24_zhs2zn.webp);
   background-repeat: no-repeat;
   background-size: cover;
   background-position: center;
-  // text-align: center; // Center align content
   display: flex; // Use flexbox layout
   flex-direction: column;
   justify-content: center; // Center align items horizontally
   align-items: center; // Center align items vertically
   padding-bottom: 2vw;
   box-shadow: inset 0 0 0 1000px rgba(0, 0, 0, 0.326);
-  // position: relative;
 }
 
 .content div {
@@ -42,37 +36,14 @@
     color: white;
   }
 }
-/* Footer.module.scss */
 
 .Contact div,
 .address div,
 .socialmedia div,
 .mail div {
   font-size: 1em; /* Adjust the font size as needed */
-  // margin-right: 1rem;
-  // position: relative;
 }
 
-//  .Cntct div,
-//  .Add div,
-//  .Soc div,
-//  .email div {
-//   position: relative;
-//  }
-
-// .Cntct::after,
-// .Add::after,
-// .Soc::after,
-// .email::after {
-//   content: "";
-//   position: absolute;
-//   left: 0;
-//   bottom: -5px; /* Adjust the position of the underline */
-//   height: 2px; /* Adjust the height of the underline */
-//   width: 100%;
-//   background-color: #fff; /* Color of the underline */
-// }
-
 .posua {
   display: flex;
   flex-direction: column;
@@ -90,19 +61,16 @@
 }
 .Contact {
   display: flex;
-  // min-width: 200px;
   flex-direction: column;
   font-size: clamp(12px, 5vw, 16px);
 }
 .address {
   display: flex;
-  // min-width: 200px;
   flex-direction: column;
   font-size: 16px;
 }
 .socialmedia {
   display: flex;
-  // min-width: 200px;
   flex-direction: column;
   font-size: 16px;
 }
@@ -112,7 +80,6 @@
     font-size: 1.75vw;
     font-family: "Philosopher", sans-serif;
     font-weight: 500;
-    // margin-bottom: 0.25vw;
     @media (max-width: 660px) {
       font-size: 4.5vw;
       margin-bottom: 1vw;
@@ -122,8 +89,6 @@
 
 @media screen and (max-width: 768px) {
   .Container {
-    // background-image: url("https://res.cloudinary.com/dclhahfvz/image/upload/v1711020725/mobileviewFooter_mwcskl.png");
-    // background-size: cover;
     display: flex;
     flex-direction: row;
     .posua {

diff --git a/src/Components/Shared/Navbar/Navbar.jsx b/src/Components/Shared/Navbar/Navbar.jsx
@@ -88,7 +88,7 @@ const Navbar = () => {
             }
             alt="Logo"
             className={styles.logo}
-            // className={`${styles.logo} ${selectedItem === "Events" ? styles.logoWithBackground : ""}`}
+            // className={${styles.logo} ${selectedItem === "Events" ? styles.logoWithBackground : ""}}
           />
         </Link>{" "}
         <NavItem
@@ -108,7 +108,7 @@ const Navbar = () => {
         />
       </div>
       <div
-        className={`${styles.hamburgerMenu} mr-[80vw] md:mr-0  transition-all duration-300 ease-in-out  ${isMenuOpen ? "opacity-0 " : " opacity-100 "}`}
+        className={`${styles.hamburgerMenu} mr-[80vw] md:mr-0  transition-all duration-300 ease-in-out ${isMenuOpen ? "opacity-0" : "opacity-100"}`}
         onClick={toggleMenu}
       >
         <div className={styles.bar}></div>
@@ -137,7 +137,7 @@ const Navbar = () => {
       )}
 
       <div
-        className={`${styles.mobileMenu} transition-all duration-500 ease-in-out  ${isMenuOpen ? styles.open : "translate-x-[-100%]"} `}
+        className={`${styles.mobileMenu} transition-all duration-500 ease-in-out  ${isMenuOpen ? styles.open : `${styles.open} translate-x-[-100%]`} `}
       >
         <div className={`${styles.mobileLinks}   `}>
           {/* <div className=" mr-[80vw] text-[2rem] text-[#E27B4E] font-medium" onClick={closeMenu}>X</div> */}

diff --git a/src/Components/Shared/Navbar/Navbar.module.scss b/src/Components/Shared/Navbar/Navbar.module.scss
@@ -12,10 +12,10 @@
   backdrop-filter: blur(12.5px);
   color: #202020;
   padding: 0 1rem;
-  z-index: 1000;
+  z-index: 999;
 }
 body {
-  margin-top: 60px; /* Adjust body margin to accommodate fixed navbar */
+  margin-top: 60px; /* body margin to accommodate fixed navbar */
 }
 
 /* Styles for when the navbar is fixed */
@@ -39,8 +39,8 @@ body {
   z-index: 1;
 }
 .eventsClicked .logo {
-  background-color: transparent; /* Reset background color */
-  mix-blend-mode: unset; /* Reset mix-blend-mode */
+  background-color: transparent;
+  mix-blend-mode: unset;
 }
 
 .links {
@@ -59,8 +59,8 @@ body {
     color 0.3s,
     background-color 0.3s;
   position: relative;
-  font-family: "Alata", sans-serif; /* Set font family */
-  font-weight: 500; /* Set font weight */
+  font-family: "Alata", sans-serif;
+  font-weight: 500;
 }
 
 .navItem:hover {
@@ -95,7 +95,7 @@ body {
     z-index: 10000;
   }
   body {
-    margin-top: 60px; /* Adjust body margin for fixed navbar */
+    margin-top: 60px; /* body margin for fixed navbar */
   }
   .logo {
     margin-bottom: 1rem;