bender/ccb3c3a9-1427-4014-95f2-1ddc0e77fc5a
1
0
Fork 0
Code Issues Pull Requests 1 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 #5.
This commit is contained in:
bender
2026-03-01 19:45:39 +00:00
parent 1e4664eb32 3a49382823
commit 972b85c5e8
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/layout.tsx
View File

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

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

@@ -2,23 +2,23 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #060000;; /* --background: #f5f5f5;;
--card: #1d0d0d;; --card: #ffffff;;
--foreground: #ffe6e6;; --foreground: #1c1c1c;;
--primary-cta: #ff3d4a;; --primary-cta: #15479c;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--accent: #7b2d2d;; --accent: #a8cce8;;
--background-accent: #b8111f;; */ --background-accent: #7ba3cf;; */
--background: #060000;; --background: #f5f5f5;;
--card: #1d0d0d;; --card: #ffffff;;
--foreground: #ffe6e6;; --foreground: #1c1c1c;;
--primary-cta: #ff3d4a;; --primary-cta: #15479c;;
--primary-cta-text: #e3deea;; --primary-cta-text: #e3deea;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--secondary-cta-text: #1f2027;; --secondary-cta-text: #1f2027;;
--accent: #7b2d2d;; --accent: #a8cce8;;
--background-accent: #b8111f;; --background-accent: #7ba3cf;;
/* 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);