development/b5721454-5bc5-4d47-93de-c7329e369326
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

2 Commits
version_5 ... version_6

Author SHA1 Message Date
development
6352309040 Update src/app/layout.tsx 2025-12-29 22:12:24 +00:00
development
44a2d67f3d Update src/app/globals.css 2025-12-29 22:12:23 +00:00
2 changed files with 6 additions and 6 deletions
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-lora), 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-lora), sans-serif; font-family: var(--font-inter), sans-serif;
} }

8
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Lora } 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 lora = Lora({ const inter = Inter({
variable: "--font-lora", variable: "--font-inter",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -44,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={lora.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}