Merge pull request #28 from arduR-O/master

fix: starting page for mobile, margins for mobile, countdown issue, cursor issue, mobile height issue
CodeChefVIT · Aug 30, 2023 · 4cb9f7f · 4cb9f7f
2 parents 06ba833 + 18ed263
commit 4cb9f7f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/cookoff24-landing/src/components/Countdown.js b/cookoff24-landing/src/components/Countdown.js
@@ -37,13 +37,13 @@ const Countdown = () => {
     const interval = setInterval(calculateCountdown, 1000);
 
     return () => clearInterval(interval);
-  });
+  },[]);
 
   return (
-    <div className="min-h-[90vh] md:h-[70vh] w-[80vw] relative xs:my-10 flex flex-col gap-[10vh]">
+    <div className="min-h-[90vh] md:h-[70vh] w-[80vw] relative xs:-my-10 flex flex-col gap-[10vh] xs:gap-[2vh]">
       <div
         id="proxima"
-        className="uppercase text-[16px] md:text-[10px] mx-[17%] md:mx-[10%] text-[#B7AB98] mt-28 mb-10 tracking-[7px]"
+        className="uppercase text-[16px] md:text-[10px] mx-[17%] md:mx-[10%] text-[#B7AB98] mt-28 mb-10 xs:mb-6 tracking-[7px]"
       >
         Countdown
       </div>

diff --git a/cookoff24-landing/src/components/Prizes.js b/cookoff24-landing/src/components/Prizes.js
@@ -9,7 +9,7 @@ const Prizes = () => {
     setIsHovered(hoverState);
   };
   return (
-    <div className="min-h-[100vh] sm:h-[67vh] w-[100vw] text-grey flex flex-col items-start justify-between gap-[3.1rem] py-16" id="prizes">
+    <div className="min-h-[100vh] w-[100vw] text-grey flex flex-col items-start justify-between gap-[3.1rem] py-16 sm:min-h-[80vh]" id="prizes">
       <div
         id="proxima"
         className="text-[16px] md:text-[12px] font-normal tracking-[7px] mx-[13%] md:mx-[10%] text-grey pt-2"

diff --git a/cookoff24-landing/src/components/Welcome.js b/cookoff24-landing/src/components/Welcome.js
@@ -10,7 +10,7 @@ const Welcome = () => {
   console.log("isMid" + isMid);
 
   return (
-    <div className="h-[100vh] w-[100vw] cursor-default flex flex-col justify-center" id="welcome">
+    <div className="h-[100vh] w-[100vw] cursor-default flex flex-col justify-center sm:-mt-16" id="welcome">
       {isMid && <TitleSVGMobile />}
       {!isMid && <TitleSVG />}
       <div className="flex justify-center z-10">

diff --git a/cookoff24-landing/src/pages/index.js b/cookoff24-landing/src/pages/index.js
@@ -107,7 +107,7 @@ const Index = () => {
         )}
         {/* main flex */}
         <div className="flex flex-col justify-center justify-items-center gap-36 ">
-          <div className={`-mt-24 relative text-4xl font-semibold hover:opacity-0 text-black h-[15vh] flex justify-items-center ${currentVaraint=="notDefault"? "opacity-0" : "opacity-100"}`}>Please turn off dark mode</div>
+          <div className={`-mt-24 relative text-4xl font-semibold hover:opacity-0 text-black h-[15vh] flex justify-items-center xs:-mt-64 ${currentVaraint=="notDefault"? "opacity-0" : "opacity-100"}`}>Please turn off dark mode</div>
           {/* icon */}
           <div
             className=" flex justify-center relative before:absolute before:bg-dark-grey before:h-56 before:w-56 before:-z-10 before:-bottom-16 before:rounded-full"

diff --git a/cookoff24-landing/src/pages/landing.js b/cookoff24-landing/src/pages/landing.js
@@ -53,7 +53,7 @@ export default function Home() {
         <link rel="icon" href="/Favicon.png" />
       </Head>
           <FixedNav />
-      <main className="h-[1090vh] sm:h-[950vh] w-[100vw] relative cursor-default overflow-x-hidden">
+      <main className="h-[1090vh] sm:h-[810vh] w-[100vw] relative cursor-default overflow-x-hidden">
         <div className="absolute w-[100vw]">
           <Welcome />
           <About />
@@ -85,6 +85,10 @@ export default function Home() {
             <FillerMask2 />
             <FillerMask2 />
             <FillerMask2 />
+            <FillerMask2 />
+            <FillerMask2 />
+            <FillerMask2 />
+            <FillerMask2 />
           </motion.div>
         )}
       </main>

diff --git a/cookoff24-landing/src/styles/globals.css b/cookoff24-landing/src/styles/globals.css
@@ -93,4 +93,8 @@ body {
 
 #proximaBold {
   font-family: Proxima;
+}
+
+*{
+  user-select: none;
 }