bender/3a6e61c2-f89f-4247-95f5-2fbdc2b689c4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

13 Commits
version_4 ... version_6

Author SHA1 Message Date
bender
12770b0ccc Update src/app/styles/variables.css 2026-02-18 16:37:06 +00:00
bender
00fbb6983d Update src/app/shop/page.tsx 2026-02-18 16:37:05 +00:00
bender
23c51ab060 Update src/app/shop/[id]/page.tsx 2026-02-18 16:37:04 +00:00
bender
fa0c2d1096 Update src/app/page.tsx 2026-02-18 16:37:04 +00:00
bender
764a398356 Update src/app/layout.tsx 2026-02-18 16:37:03 +00:00
bender
71bf474d69 Update src/app/blog/page.tsx 2026-02-18 16:37:02 +00:00
bender
0f302cbf5f Merge version_5 into main 
Merge version_5 into main
 2026-02-18 16:31:23 +00:00
bender
b466c9e65f Update src/app/styles/variables.css 2026-02-18 16:31:18 +00:00
bender
476eac78dd Update src/app/layout.tsx 2026-02-18 16:31:17 +00:00
bender
aa3d5a3d76 Merge version_4 into main 
Merge version_4 into main
 2026-02-18 16:18:52 +00:00
bender
a103c39ef9 Merge version_4 into main 
Merge version_4 into main
 2026-02-18 16:18:41 +00:00
bender
e837a437f2 Merge version_4 into main 
Merge version_4 into main
 2026-02-18 16:18:31 +00:00
bender
2508ebfb12 Merge version_4 into main 
Merge version_4 into main
 2026-02-18 16:06:59 +00:00
6 changed files with 22 additions and 53 deletions
Expand all files Collapse all files

2
src/app/blog/page.tsx
View File

@@ -69,4 +69,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

39
src/app/layout.tsx
View File

@@ -3,12 +3,6 @@ import { Archivo } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"],
@@ -36,33 +30,6 @@ export const metadata: Metadata = {
}
};
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -71,7 +38,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body
className={archivo.variable}
>
<Tag />
{children}
@@ -1359,4 +1328,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

@@ -244,4 +244,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

2
src/app/shop/[id]/page.tsx
View File

@@ -233,4 +233,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/shop/page.tsx
View File

@@ -107,4 +107,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

28
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #efe7dd;;
--accent: #ffffff;;
--background-accent: #c6b180;; */
/* --background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;; */
--background: #f5f4ef;;
--card: #dad6cd;;
--foreground: #2a2928;;
--primary-cta: #2a2928;;
--secondary-cta: #efe7dd;;
--accent: #ffffff;;
--background-accent: #c6b180;;
--background: #010912;;
--card: #152840;;
--foreground: #e6f0ff;;
--primary-cta: #cee7ff;;
--secondary-cta: #0e1a29;;
--accent: #3f5c79;;
--background-accent: #004a93;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);