Merge branch 'main' into prod

dvm-bitspilani · Oct 16, 2024 · 77f0024 · 77f0024
2 parents ea7f132 + e54f76c
commit 77f0024
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/app/contact/brochure.module.scss → app/contact/contact.module.scss b/app/contact/brochure.module.scss → app/contact/contact.module.scss
@@ -1,4 +1,4 @@
-.brochureBack {
+.contactBack {
   position: fixed;
   height: 100%;
   width: 100%;
@@ -31,10 +31,10 @@
 .contactPage {
   position: fixed;
   top: 0rem;
-  height: 100lvh;
+  height: 100%;
   width: 100vw;
-  opacity: 1;
-  pointer-events: none;
+  //opacity: 1;
+  //pointer-events: auto;
   overflow-x: hidden;
   overflow-y: scroll;
 
@@ -137,21 +137,6 @@
   }
 }
 
-// @media (max-width: 2100px) and (min-width: 1400px) {
-//   .contactPage {
-//     .heading {
-//       margin-top: 5.5rem;
-
-//       h2 {
-//         font-size: 72px;
-//       }
-//     }
-
-//     .cardContainer {
-//       margin-top: 5rem;
-//     }
-//   }
-// }
 
 @media (max-width: 2100px) and (min-width: 1800px) {
   .contactPage {
@@ -187,7 +172,7 @@
       margin-top: 4rem;
 
       h2 {
-        font-size: 65px;
+        font-size: 58px;
       }
     }
 
@@ -217,11 +202,13 @@
 
 @media (max-width: 1000px) {
   .contactPage {
+    height: fit-content;
+
     .heading {
       h2 {
-        font-size: 62px;
+        font-size: 52px;
         font-weight: 400;
-        line-height: 43px;
+        line-height: normal;
         box-shadow: none;
       }
     }

diff --git a/app/contact/page.tsx b/app/contact/page.tsx
@@ -1,6 +1,7 @@
 "use client";
-import React, { useEffect } from "react";
-import styles from "./brochure.module.scss";
+
+import React, { useLayoutEffect } from "react";
+import styles from "./contact.module.scss";
 
 import Grid from "@/components/Landing/Grid/Grid";
 import Grunge from "@/components/Landing/Backdrop/Grunge";
@@ -30,7 +31,8 @@ import RegBtn from "@/components/Landing/Navbar/RegBtn/RegBtn";
 import CursorEffect from "@/components/CursorEffect/CursorEffect";
 
 export default function Brochure() {
-  useEffect(() => {
+
+  useLayoutEffect(() => {
     const container = document.querySelector("#contactCard") as HTMLElement;
     const cards = container?.querySelectorAll(
       ".card"
@@ -181,11 +183,12 @@ export default function Brochure() {
       }
     }
   }, []);
+
   return (
     <>
       <PrePreloader />
       <CursorEffect />
-      <div className={styles.brochureBack}>
+      <div className={styles.contactBack}>
         <Glow />
         <Grunge />
         <Grid />

diff --git a/components/Landing/Navbar/Logo/Logo.tsx b/components/Landing/Navbar/Logo/Logo.tsx
@@ -10,7 +10,7 @@ export default function OasisLogo() {
         <div className={styles.logo}>
             <Image
                 id="oasisLogo"
-                src="/oasislogo.png"
+                src="/oasislogoNew.png"
                 alt="oasis logo landing"
                 width={logoAspectRatio * logoHeight}
                 height={logoHeight}

diff --git a/public/oasislogo.png → public/oasislogoNew.png b/public/oasislogo.png → public/oasislogoNew.png