Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
2025-12-27 04:54:20 +00:00
2 changed files with 13 additions and 13 deletions

View File

@@ -4,13 +4,13 @@
/* Base units */
/* --vw is set by ThemeProvider */
--background: #ffffff;;
--card: #fafafa;;
--foreground: #000000;;
--primary-cta: #9933ff;;
--secondary-cta: #ffffff;;
--accent: #e5e5e5;;
--background-accent: #f5f5f5;;
--background: #080000;
--card: #1e0d0d;
--foreground: #ffe6e6;
--primary-cta: #ff7a7a;
--secondary-cta: #1e0909;
--accent: #7b4242;
--background-accent: #65292c;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-fraunces), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-fraunces), sans-serif;
font-family: var(--font-inter), sans-serif;
}

View File

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