From 38bfb4bf97cd196ba68174496f206393d8da6b2c Mon Sep 17 00:00:00 2001 From: Manas Date: Wed, 16 Oct 2024 13:28:36 +0530 Subject: [PATCH 1/3] fix: oasis logo issue --- components/Landing/Navbar/Logo/Logo.tsx | 2 +- public/{oasislogo.png => oasislogoNew.png} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename public/{oasislogo.png => oasislogoNew.png} (100%) diff --git a/components/Landing/Navbar/Logo/Logo.tsx b/components/Landing/Navbar/Logo/Logo.tsx index cd81328e..d3472070 100644 --- a/components/Landing/Navbar/Logo/Logo.tsx +++ b/components/Landing/Navbar/Logo/Logo.tsx @@ -10,7 +10,7 @@ export default function OasisLogo() {
Date: Wed, 16 Oct 2024 13:50:17 +0530 Subject: [PATCH 2/3] fix: contactUs pointer events --- ...ochure.module.scss => contact.module.scss} | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) rename app/contact/{brochure.module.scss => contact.module.scss} (93%) diff --git a/app/contact/brochure.module.scss b/app/contact/contact.module.scss similarity index 93% rename from app/contact/brochure.module.scss rename to app/contact/contact.module.scss index 3af11775..3036f58d 100644 --- a/app/contact/brochure.module.scss +++ b/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; } } From e54f76ccfa9e025c3281387670666efeba767994 Mon Sep 17 00:00:00 2001 From: Manas Date: Wed, 16 Oct 2024 13:50:47 +0530 Subject: [PATCH 3/3] fix: contactUs page animation on first time not working properly --- app/contact/page.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/contact/page.tsx b/app/contact/page.tsx index a7657075..538fe044 100644 --- 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 ( <> -
+