4 Commits

Author SHA1 Message Date
972b85c5e8 Merge version_5 into main
Merge version_5 into main
2026-03-01 19:45:39 +00:00
3a49382823 Update src/app/styles/variables.css 2026-03-01 19:45:35 +00:00
e751265987 Update src/app/layout.tsx 2026-03-01 19:45:34 +00:00
1e4664eb32 Merge version_3 into main
Merge version_3 into main
2026-03-01 19:36:26 +00:00
2 changed files with 18 additions and 18 deletions

View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -39,7 +39,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #15479c;;
--secondary-cta: #ffffff;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;; */
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #15479c;;
--primary-cta-text: #e3deea;;
--secondary-cta: #1f0a0a;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #1f2027;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
--accent: #a8cce8;;
--background-accent: #7ba3cf;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);