development/20edd09e-cbfc-403d-82df-776994a360e3
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-28 10:23:47 +00:00
parent 3b858f81b4 f678592612
commit 74bd0b0eb7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -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-inter), sans-serif; font-family: var(--font-lato), 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-inter), sans-serif; font-family: var(--font-lato), sans-serif;
} }

9
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter } from "next/font/google"; import { Lato } 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 inter = Inter({ const lato = Lato({
variable: "--font-inter", variable: "--font-lato",
subsets: ["latin"], subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -44,7 +45,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${inter.variable} antialiased`} className={`${lato.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}