development/3b8c87b3-d9a7-4b94-873f-2d03aa7fb4dc
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_7 into main

Browse Source 
Merge version_7 into main
This commit was merged in pull request #6.
This commit is contained in:
development
2025-12-19 22:51:40 +00:00
parent 179ff91b72 451c1af105
commit df849cf62e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */
/* --vw is set by ThemeProvider */
--background: #fffaf5;
--card: #fff7f0;
--foreground: #1a0800;
--primary-cta: #ff8c42;
--background: #faf5f2;
--card: #f5ede8;
--foreground: #3d2417;
--primary-cta: #d4704c;
--secondary-cta: #ffffff;
--accent: #ffaa70;
--background-accent: #ff8c42;
--accent: #f5d4c8;
--background-accent: #d9a18f;
/* 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-poppins), 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-poppins), sans-serif;
font-family: var(--font-inter), sans-serif;
}

9
src/app/layout.tsx
View File

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