Merge branch 'main' into err53/tech-73-add-subtitles-for-images

deltahacks · Dec 27, 2023 · 04143a2 · 04143a2
2 parents 01b3241 + dddec75
commit 04143a2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/components/FAQ.astro b/src/components/FAQ.astro
@@ -81,6 +81,11 @@ const questions: Array<{
     answer:
       "Projects are judged by event sponsors and experts from the tech sector. Projects are presented to judges at the exposition and evaluated on multiple factors such as presentation, creativity, practical application, and originality.",
   },
+  {
+    question: "What's happening January 12th?",
+    answer:
+      "Our IN PERSON Hackathon event days are January 13th-14th. Friday the 12th will consist of VIRTUAL Pre Hackathon Events to get you prepped and excited for the main hackathon!! Join us for our Meme Contest & Online Team Match Making, Beginners Guide to Hackathon, A Leetcode Workshop, and end the Night playing games with McMaster Extra Life!",
+  },
 ];
 ---
 

diff --git a/src/components/Hero.astro b/src/components/Hero.astro
@@ -41,7 +41,7 @@ const { id } = Astro.props;
         class="tagline text-xl font-semibold leading-6 tracking-tight text-cyan-900 sm:w-4/5"
       >
         The annual hackathon for change, taking place at McMaster University
-        from January 12 to 14, 2024.
+        from January 13 to 14, 2024.
       </p>
     </div>
 

diff --git a/src/components/MLHLarge.astro b/src/components/MLHLarge.astro
@@ -1,6 +1,6 @@
 <a
   id="mlh-trust-badge-large"
-  class="fixed right-16 top-0 z-50 block w-36 min-w-min max-w-md"
+  class="fixed right-0 top-0 z-50 block w-36 min-w-min max-w-md"
   href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2024-season&utm_content=blue"
   target="_blank"
 >

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -28,7 +28,7 @@ import MLH from "../components/MLHLarge.astro";
   <div
     class="bg-[url('/dotted_line_bg_ver2.svg')] bg-[length:auto_98%] bg-[70%_10px] bg-no-repeat md:bg-[url('/dotted_line_bg_ver1.svg')] md:bg-cover md:bg-top"
   >
-    <div class="hidden lg:top-0 lg:flex">
+    <div class="fixed z-50 hidden lg:top-0 lg:flex">
       <MLH />
     </div>
     <WhoAreWe id="WhoAreWe" />