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

Merge version_5 into main

Browse Source 
Merge version_5 into main
This commit was merged in pull request #10.
This commit is contained in:
bender
2026-02-18 16:31:23 +00:00
parent aa3d5a3d76 b466c9e65f
commit 0f302cbf5f
2 changed files with 17 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/layout.tsx
View File

@@ -3,12 +3,6 @@ import { Archivo } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; 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({ const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"], 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({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -71,7 +38,9 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}> <body
className={archivo.variable}
>
<Tag /> <Tag />
{children} {children}

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

@@ -2,21 +2,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f4ef;; /* --background: #080000;;
--card: #dad6cd;; --card: #1e0d0d;;
--foreground: #2a2928;; --foreground: #ffe6e6;;
--primary-cta: #2a2928;; --primary-cta: #ff3d4a;;
--secondary-cta: #efe7dd;; --secondary-cta: #1f0a0a;;
--accent: #ffffff;; --accent: #7b2d2d;;
--background-accent: #c6b180;; */ --background-accent: #b8111f;; */
--background: #f5f4ef;; --background: #080000;;
--card: #dad6cd;; --card: #1e0d0d;;
--foreground: #2a2928;; --foreground: #ffe6e6;;
--primary-cta: #2a2928;; --primary-cta: #ff3d4a;;
--secondary-cta: #efe7dd;; --secondary-cta: #1f0a0a;;
--accent: #ffffff;; --accent: #7b2d2d;;
--background-accent: #c6b180;; --background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);