rebase: main

apps/site/src/lib/styles/_bootstrap-utils.scss

@@ -1,3 +1,5 @@
+@import "./zothacks-theme";
+
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
 @import "~bootstrap/scss/variables-dark";

apps/site/src/lib/styles/_zothacks-theme.scss

@@ -1,6 +1,4 @@
 // Common variables for site theme consistency
-@use "./bootstrap.scss";
-
 
 // colors
 $white: #fafaff; // Paper Background color
@@ -17,3 +15,8 @@ $light-blue: #81deeb;
 $blue: #3902fd;
 $purple: #6600b6;
 $navbar-red: #ff0000;
+
+// bootstrap overrides
+$font-family-base: var(--next-font-fuzzy-bubbles);
+$font-size-base: 1.25rem;
+$headings-font-weight: 700;

apps/site/src/views/Home/Home.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import Landing from "./sections/Landing/Landing";
-import About from "./sections/About/About";
-import Mentors from "./sections/Mentors/Mentors";
+import Intro from "./sections/Intro/Intro";
+import Mentor from "./sections/Mentor/Mentor";
 import Sponsors from "./sections/Sponsors/Sponsors";
 import FAQ from "./sections/FAQ/FAQ";
 
@@ -12,8 +12,8 @@ function Home() {
 	return (
 		<div className={styles.home}>
 			<Landing />
-			<About />
-			<Mentors />
+			<Intro />
+			<Mentor />
 			<Sponsors />
 			<FAQ />
 		</div>

apps/site/src/components/Mentor/Mentor.tsx → apps/site/src/views/Home/sections/Mentor/Mentor.tsx

@@ -14,7 +14,7 @@ export default function Mentor() {
 	const width = useWindowWidth();
 
 	const mentorHeader = (
-		<h2 className="mb-3">Interested in becoming a mentor?</h2>
+		<h2 className="mb-3 text-start">Interested in becoming a mentor?</h2>
 	);
 	const mentorDescEl = (
 		<p>