Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-04-13 05:11:25 +00:00
2 changed files with 13 additions and 13 deletions

View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import HeroSplitDoubleCarousel from '@/components/sections/hero/HeroSplitDoubleCarousel';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductCardThree from '@/components/sections/product/ProductCardThree';
@@ -141,14 +141,14 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
<FooterLogoEmphasis
logoText="Khojiakbar Z."
columns={[
{ title: "Socials", items: [
{ label: "Instagram (@aqlx.uz)", href: "https://www.instagram.com/aqlx.uz" },
{ items: [
{ label: "Instagram", href: "https://www.instagram.com/aqlx.uz" },
{ label: "LinkedIn", href: "#" }
]},
{ title: "Explore", items: [
{ items: [
{ label: "Experience", href: "#experience" },
{ label: "Projects", href: "#projects" }
]}
@@ -158,4 +158,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #ffffff;
--card: #f9f9f9;
--foreground: #120a00e6;
--primary-cta: #15479c;
--background: #f7f6f7;
--card: #ffffff;
--foreground: #25190c;
--primary-cta: #ff6207;
--primary-cta-text: #ffffff;
--secondary-cta: #FF7B05;
--secondary-cta: #ffffff;
--secondary-cta-text: #ffffff;
--accent: #e2e2e2;
--background-accent: #FF7B05;
--accent: #ffce93;
--background-accent: #e8cfa8;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);