bender/d0fab969-e686-4cf8-89d1-e58205012b1e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_4 bender:version_3 bender:version_2 bender:version_1

9 Commits
version_2 ... main

Author SHA1 Message Date
bender
5c34e44a83 Merge version_4 into main 
Merge version_4 into main
 2026-04-17 22:45:02 +00:00
bender
afb9816d7e Update src/app/styles/base.css 2026-04-17 22:44:56 +00:00
bender
9b5ef376b4 Update src/app/layout.tsx 2026-04-17 22:44:55 +00:00
bender
8dabd82f1d Merge version_3 into main 
Merge version_3 into main
 2026-04-17 22:38:55 +00:00
bender
58ba41d86d Update src/app/about/page.tsx 2026-04-17 22:38:52 +00:00
bender
63cd975d13 Merge version_3 into main 
Merge version_3 into main
 2026-04-17 22:38:31 +00:00
bender
de97d345b4 Update src/app/about/page.tsx 2026-04-17 22:38:28 +00:00
bender
7e05cc4c43 Merge version_2 into main 
Merge version_2 into main
 2026-04-17 22:33:03 +00:00
bender
b625f59421 Merge version_2 into main 
Merge version_2 into main
 2026-04-17 22:32:36 +00:00
3 changed files with 11 additions and 14 deletions
Expand all files Collapse all files

7
src/app/about/page.tsx
View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import TextAbout from '@/components/sections/about/TextAbout';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
export default function AboutPage() {
return (
@@ -35,9 +35,10 @@ export default function AboutPage() {
</div>
<div id="about" data-section="about" className="py-24">
<TextAbout
<TextSplitAbout
title="Our mission is to transform visions into reality through uncompromising quality and innovative construction solutions."
description={["At DC Construction, we build more than just structures; we build enduring relationships based on integrity, transparency, and a relentless pursuit of excellence in every square meter."]}
useInvertedBackground={false}
title="About DC Construction"
/>
</div>

14
src/app/layout.tsx
View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google";
import { Figtree } from "next/font/google";
@@ -19,14 +20,9 @@ export const metadata: Metadata = {
},
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
const figtree = Figtree({
variable: "--font-figtree", subsets: ["latin"],
});
export default function RootLayout({
@@ -37,7 +33,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body className={`${figtree.variable} antialiased`}>
<Tag />
{children}
<script

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter), sans-serif;
font-family: var(--font-figtree), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-libre-baskerville), serif;
font-family: var(--font-figtree), serif;
}