diff --git a/src/app/globals.css b/src/app/globals.css index 26becca..8ee74d3 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -1,16 +1,17 @@ @import "tailwindcss"; -@import url('https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;500;600;700&display=swap'); + :root { /* Base units */ /* --vw is set by ThemeProvider */ - --background: #f5deb3;; - --card: #d2b48c;; - --foreground: #4f443e;; - --primary-cta: #ffebcd;; - --secondary-cta: #bcaaa4;; - --accent: #8b4513;; - --background-accent: #ffdead;; + --background: #f5f5f5;; + --card: #ffffff;; + --foreground: #1c1c1c;; + --primary-cta: #2bb889;; + --secondary-cta: #ffffff;; + --accent: #09b97e;; + --background-accent: #a8e8c3;; + /* Base spacing units */ --vw-0_25: calc(var(--vw) * 0.25); --vw-0_5: calc(var(--vw) * 0.5); @@ -520,7 +521,7 @@ html { body { background-color: var(--background); color: var(--foreground); - font-family: 'Merriweather', sans-serif; + font-family: var(--font-manrope), sans-serif; position: relative; min-height: 100vh; overscroll-behavior: none; @@ -533,5 +534,5 @@ h3, h4, h5, h6 { - font-family: 'Merriweather', sans-serif; + font-family: var(--font-manrope), sans-serif; } \ No newline at end of file diff --git a/src/app/page.tsx b/src/app/page.tsx index cca30e7..18411a4 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,17 +1,18 @@ "use client" import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered'; +import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery'; +import TextAbout from '@/components/sections/about/TextAbout'; +import FeatureCardTwentyTwo from '@/components/sections/feature/FeatureCardTwentyTwo'; +import MetricCardOne from '@/components/sections/metrics/MetricCardOne'; +import TeamCardEleven from '@/components/sections/team/TeamCardEleven'; +import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne'; +import PricingCardNine from '@/components/sections/pricing/PricingCardNine'; +import FaqSplitText from '@/components/sections/faq/FaqSplitText'; +import ContactSplitForm from '@/components/sections/contact/ContactSplitForm'; +import FooterMedia from '@/components/sections/footer/FooterMedia'; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { Sparkles, BookOpen, Users, TrendingUp, Award, Target } from "lucide-react"; -import ContactForm from '@/components/form/ContactForm'; -import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; -import TeamCardOne from '@/components/sections/team/TeamCardOne'; -import HeroBillboard1 from '@/components/sections/hero/HeroBillboard1'; -import PricingCardOne from '@/components/sections/pricing/PricingCardOne'; -import SplitAbout from '@/components/sections/about/SplitAbout'; -import TeamCardOne1 from '@/components/sections/team/TeamCardOne1'; -import FooterBase1 from '@/components/sections/footer/FooterBase1'; -import FooterMedia from '@/components/sections/footer/FooterMedia'; export default function TechAcademyPage() { return ( @@ -29,7 +30,7 @@ export default function TechAcademyPage() { > -
- + -
+ +
+ +
+ +
+ +
+ +
+ +
- -
- -
- + +
+ +
+ +
+
-
- +
-
- +
-
- -
+
+ ); } \ No newline at end of file diff --git a/src/components/form/ContactForm.tsx b/src/components/form/ContactForm.tsx index 5c42ffd..5cfcb3e 100644 --- a/src/components/form/ContactForm.tsx +++ b/src/components/form/ContactForm.tsx @@ -92,9 +92,6 @@ const ContactForm = ({ {termsText}

- - {/* Inserted button element */} - ); }; diff --git a/src/components/navbar/NavbarStyleCentered/NavbarStyleCentered.tsx b/src/components/navbar/NavbarStyleCentered/NavbarStyleCentered.tsx index 46e47bb..8cd0c2e 100644 --- a/src/components/navbar/NavbarStyleCentered/NavbarStyleCentered.tsx +++ b/src/components/navbar/NavbarStyleCentered/NavbarStyleCentered.tsx @@ -107,7 +107,6 @@ const NavbarStyleCentered = ({ - New - - ); }; diff --git a/src/components/sections/feature/FeatureCardTwentyTwo.tsx b/src/components/sections/feature/FeatureCardTwentyTwo.tsx index 5f2634c..ffbdda7 100644 --- a/src/components/sections/feature/FeatureCardTwentyTwo.tsx +++ b/src/components/sections/feature/FeatureCardTwentyTwo.tsx @@ -9,7 +9,6 @@ import { useTheme } from "@/providers/themeProvider/ThemeProvider"; import type { LucideIcon } from "lucide-react"; import type { ButtonConfig, CardAnimationType, TitleSegment } from "@/components/cardStack/types"; import type { TextboxLayout, InvertedBackground } from "@/providers/themeProvider/config/constants"; -import { Star } from "lucide-react"; type FeatureItem = { id: string; @@ -157,9 +156,6 @@ const FeatureCardTwentyTwo = ({ ))} -
- -
))} diff --git a/src/components/sections/hero/HeroBillboard.tsx b/src/components/sections/hero/HeroBillboard.tsx index b221105..d9f869c 100644 --- a/src/components/sections/hero/HeroBillboard.tsx +++ b/src/components/sections/hero/HeroBillboard.tsx @@ -106,8 +106,6 @@ const HeroBillboard = ({ imageClassName={cls("z-1", imageClassName)} /> - {/* Inserted button element */} - ); diff --git a/src/components/sections/hero/HeroBillboardGallery.tsx b/src/components/sections/hero/HeroBillboardGallery.tsx index 044caea..548d8b5 100644 --- a/src/components/sections/hero/HeroBillboardGallery.tsx +++ b/src/components/sections/hero/HeroBillboardGallery.tsx @@ -127,9 +127,7 @@ const HeroBillboardGallery = ({ buttonTextClassName={buttonTextClassName} center={true} /> -
- -
+