development/4dc2707d-a259-4427-887a-700794119b0a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #2.
This commit is contained in:
development
2026-01-23 00:18:18 +00:00
parent c0e1b68499 b97f89b7db
commit e9decd3ef9
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/about/page.tsx
View File

@@ -116,4 +116,4 @@ export default function AboutPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

2
src/app/blog/page.tsx
View File

@@ -171,4 +171,4 @@ export default function BlogPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

2
src/app/contact/page.tsx
View File

@@ -110,4 +110,4 @@ export default function ContactPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

2
src/app/craft/page.tsx
View File

@@ -102,4 +102,4 @@ export default function CraftPage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }

4
src/app/globals.css
View File

@@ -578,7 +578,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-prata), 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;
@@ -591,5 +591,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-prata), sans-serif; font-family: var(--font-inter), sans-serif;
} }

11
src/app/layout.tsx
View File

@@ -1,10 +1,9 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Prata } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
const prata = Prata({ const inter = Inter({
variable: "--font-prata", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
weight: ["400"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -35,7 +34,7 @@ export default function RootLayout({
}>) { }>) {
return ( return (
<html lang="en"> <html lang="en">
<body className={`${prata.variable} antialiased`}> <body className={`${inter.variable} antialiased`}>
{children} {children}
<script <script
@@ -1258,4 +1257,4 @@ export default function RootLayout({
</body> </body>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

@@ -168,4 +168,4 @@ export default function HomePage() {
/> />
</ThemeProvider> </ThemeProvider>
); );
} }