diff --git a/src/app/globals.css b/src/app/globals.css index 50049f2..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: #f0e1d2;; - --card: #d7c1ab;; - --foreground: #332d26;; - --primary-cta: #a07b58;; - --secondary-cta: #8b6e55;; - --accent: #e6a066;; - --background-accent: #f7d9b8;; + --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 015112b..18411a4 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -2,23 +2,24 @@ 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 HeroBillboard1 from '@/components/sections/hero/HeroBillboard1'; -import ButtonTextUnderline from '@/components/button/ButtonTextUnderline'; -import TeamCardOne1 from '@/components/sections/team/TeamCardOne1'; -import FooterBase1 from '@/components/sections/footer/FooterBase1'; export default function TechAcademyPage() { return ( +
+ +
+
-
- +
-
- +
+
+
-
- +
- -
- -
+
+
); } \ No newline at end of file diff --git a/src/components/sections/contact/ContactSplitForm.tsx b/src/components/sections/contact/ContactSplitForm.tsx index 67fb378..64d6707 100644 --- a/src/components/sections/contact/ContactSplitForm.tsx +++ b/src/components/sections/contact/ContactSplitForm.tsx @@ -200,9 +200,4 @@ const ContactSplitForm = ({ ContactSplitForm.displayName = "ContactSplitForm"; -// Inserted button element -
- -
- export default ContactSplitForm; diff --git a/src/components/sections/team/TeamCardEleven.tsx b/src/components/sections/team/TeamCardEleven.tsx index aafd651..07e43ed 100644 --- a/src/components/sections/team/TeamCardEleven.tsx +++ b/src/components/sections/team/TeamCardEleven.tsx @@ -138,9 +138,6 @@ const TeamCardEleven = ({ )}> {member.detail}

- );