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

Compare commits

merge into: development:version_6
Branches Tags
development:main development:version_10 development:version_9 development:version_7 development:version_8 development:version_6 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:version_7
Branches Tags
development:main development:version_10 development:version_9 development:version_7 development:version_8 development:version_6 development:version_5 development:version_4 development:version_3 development:version_2 development:version_1

2 Commits
version_6 ... version_7

Author SHA1 Message Date
development
451c1af105 Update src/app/layout.tsx 2025-12-19 22:51:35 +00:00
development
8a4acfa136 Update src/app/globals.css 2025-12-19 22:51:35 +00:00
2 changed files with 12 additions and 13 deletions
Expand all files Collapse all files

16
src/app/globals.css
View File

@@ -4,13 +4,13 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
--background: #fffaf5; --background: #faf5f2;
--card: #fff7f0; --card: #f5ede8;
--foreground: #1a0800; --foreground: #3d2417;
--primary-cta: #ff8c42; --primary-cta: #d4704c;
--secondary-cta: #ffffff; --secondary-cta: #ffffff;
--accent: #ffaa70; --accent: #f5d4c8;
--background-accent: #ff8c42; --background-accent: #d9a18f;
/* 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);
@@ -495,7 +495,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-poppins), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4, h4,
h5, h5,
h6 { 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 type { Metadata } from "next";
import { Poppins } 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 poppins = Poppins({ const inter = Inter({
variable: "--font-poppins", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -49,7 +48,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={poppins.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}