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

Merge version_6 into main #5

Merged
development merged 2 commits from version_6 into main 2025-12-29 22:12:29 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -6
2 changed files with 6 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 {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-lora), 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-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 { Lora } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const lora = Lora({
variable: "--font-lora",
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
@@ -44,7 +44,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={lora.variable}
className={inter.variable}
>
<Tag />
{children}