bender/afd8f2b2-63f7-4507-bc24-5519af322672
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #2

Merged
bender merged 2 commits from version_3 into main 2026-03-06 16:29:00 +00:00
Conversation 0 Commits 2 Files Changed 2 +10 -11
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -1,12 +1,11 @@
import type { Metadata } from "next";
import { Kanit } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const kanit = Kanit({
variable: "--font-kanit", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -34,7 +33,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${kanit.variable} antialiased`}>
<body className={`${inter.variable} antialiased`}>
<Tag />
{children}

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

@@ -11,14 +11,14 @@
--background-accent: #ffffff; */
--background: #ffffff;
--card: #f9f9f9;
--foreground: #120006e6;
--primary-cta: #e63946;
--card: #f6f7f4;
--foreground: #080908;
--primary-cta: #0e3a29;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta: #e7eecd;
--secondary-cta-text: #120006e6;
--accent: #e2e2e2;
--background-accent: #c4c4c4;
--accent: #35c18b;
--background-accent: #ecebe4;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);