Merge branch 'main' of https://github.com/langaracpsc/langaracpsc-next

langaracpsc · Sep 7, 2023 · 743b2ae · 743b2ae
2 parents ea26814 + c88ae3e
commit 743b2ae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/frontend/src/app/hacks/Body.tsx b/frontend/src/app/hacks/Body.tsx
@@ -4,14 +4,14 @@ import {SocialIcons} from "@/app/SocialIcons";
 export function Body()
 {
     return <div className={"grid-rows-6 bg-hacks-bg-black text-white"}> 
-            <div className={"flex flex-col items-center gap-[7vh] max-[850px]:gap-[8vh] mt-[8vh] max-[850px]:mt-[9vh]"}>
+            <div className={"flex flex-col items-center gap-[7vh] max-[850px]:gap-[8vh] mt-[8vh] max-[850px]:mt-[9vh] font-audiowide"}>
                 <div>
                     <Timer EndTime={new Date(2023, 8, 23, 8, 0, 0)}/>
                     <span className={"text-sm max-[850px]:text-sm flex flex-col items-center mt-0"}>left until the hackathon.</span>
                 </div>
                 <div className={"text-xl max-[850px]:text-sm flex flex-col items-center"}>
-                    <a href="https://forms.gle/TmBcsFRup5KfppYU6" target="_blank" rel="noopener noreferrer"
-                    className="text-5xl max-[850px]:text-xl inline-flex items-center m-5 justify-center px-10 py-8 border border-transparent leading-6 font-medium rounded-md text-white bg-lang-orange hover:bg-orange-700 focus:outline-none focus:ring focus:ring-orange-300 active:bg-orange-800 transition duration-150 ease-in-out">
+                    <a href="https://forms.gle/TmBcsFRup5KfppYU6" target="_lank" rel="noopener noreferrer"
+                    className="text-3xl max-[850px]:text-xl inline-flex itembs-center m-5 justify-center px-10 py-8 border border-transparent leading-6 font-medium rounded-md text-white bg-lang-orange hover:bg-orange-700 focus:outline-none focus:ring focus:ring-orange-300 active:bg-orange-800 transition duration-150 ease-in-out">
                         ✨Register Now!✨
                     </a>
                 </div>

diff --git a/frontend/src/app/hacks/Header.tsx b/frontend/src/app/hacks/Header.tsx
@@ -3,28 +3,25 @@ import {IconLabel} from "@/app/hacks/IconLabel";
 
 export function Header()
 {
-    return <div className = {"bg-hacks-nav-black h-full w-full"}>
-
-        <br></br>
-
-        <div className = {"grid grid-rows-2 h-full gap-0"}>
-
-            <div className={"grid items-end h-full font-audiowide"}>
+    return <div className = {"bg-hacks-nav-black h-full w-full font-audiowide"}>
+        <div className = {"grid grid-rows-2 h-full gap-1"}>
+            <div className={"grid items-end h-full mt-2"}>
                 <div className={"flex flex-col gap-2"}>
-                    <div className={"text-7xl max-[1100px]:text-4xl  self-center"}> Langara <span className={"text-lang-orange"}>Hacks</span></div>
-                    <div className={"text max-[850px]:text-2s self-center"}> Collaborate, Create, Innovate </div>
+                    <div className={"text-6xl max-[1100px]:text-3xl  self-center"}> Langara <span className={"text-lang-orange"}>Hacks</span></div>
+                    <div className={"text-s max-[850px]:text-sm self-center"}> Collaborate, Create, Innovate </div>
                 </div>
             </div>
 
             <div className={"grid grid-cols-2"}>
-                <div className={"justify-self-end self-center w-[70vh] max-[850px]:w-[50vh]"}>
-                    <IconLabel iconSrc={"/location_icon.png"} label={"T Gallery, Langara College"} height={25} width={25}/>
+                <div className={"justify-self-end self-center w-[70vh] max-[850px]:w-[40vh]"}>
+                    <IconLabel iconSrc={"/location_icon.png"} label={"T Gallery, \n Langara College"} height={25} width={25}/>
                 </div> 
-                <div className={"justify-self-start self-center w-[40vh] max-[850px]:w-[30vh]"}>
-                    <IconLabel iconSrc={"/calender_icon.png"} label={"8:00 AM - 6:30 PM Sept 23rd, 2023"} height={25} width={25}/>
+                <div className={"justify-self-start self-center w-[40vh] max-[850px]:w-[20vh]"}>
+                    <IconLabel iconSrc={"/calender_icon.png"} label={"8:00 AM - 6:30 PM \n Sept 23rd, 2023"} height={25} width={25}/>
                 </div>
             </div>
 
         </div> 
     </div>
-}
+}
+
diff --git a/frontend/src/app/hacks/IconLabel.tsx b/frontend/src/app/hacks/IconLabel.tsx
@@ -4,6 +4,6 @@ export function IconLabel({iconSrc, label, height, width}: {iconSrc: string, lab
 {
     return <div className={"grid grid-cols-2"}>
         <Image src={iconSrc} alt={"Image"} height={height} width={width} className={"self-center justify-self-end"}></Image>
-        <span className={"text-lg max-[1200px]:text-xs text-white self-center ml-2"}>{label}</span>
+        <span className={"text-lg max-[850px]:text-[10px] max-[850px]:leading-3 whitespace-pre text-white self-center ml-2"}>{label}</span>
     </div>; 
 }
diff --git a/frontend/src/app/hacks/tos/Header.tsx b/frontend/src/app/hacks/tos/Header.tsx
@@ -4,13 +4,10 @@ import {IconLabel} from "@/app/hacks/IconLabel";
 export function Header()
 {
     return <div className = {"m-100px bg-hacks-nav-black w-full"}>
-
-        <br></br>
-
         <div className = {"grid grid-rows-2 h-full"}>
             <div className={"grid items-end"}>
-                <div className={"flex flex-col gap-2"}>
-                    <div className={"text-9xl max-[1100px]:text-5xl self-center"}> <a href="/hacks">Langara <span className={"text-lang-orange"}>Hacks</span></a></div>
+                <div className={"flex fex-col gap-2"}>
+                    <div className={"text-6xl max-[1100px]:text-5xl self-center"}> <a href="/hacks">Langara <span className={"text-lang-orange"}>Hacks</span></a></div>
 
                     <div className={"text-xs max-[850px]:text-m self-center"}> Collaborate, Create, Innovate </div>
                 </div>