development/3c614173-572e-469f-8080-3e26b759e384
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_1
Branches Tags
development:main development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_3 development:version_2 development:version_1

6 Commits
version_1 ... main

Author SHA1 Message Date
development
9d52b5e0d0 Merge version_3 into main 
Merge version_3 into main
 2026-01-19 23:09:32 +00:00
development
34be93d3a2 Update src/app/page.tsx 2026-01-19 23:09:28 +00:00
development
d88ad3a565 Update src/app/layout.tsx 2026-01-19 23:09:27 +00:00
development
540f3f6fc7 Merge version_2 into main 
Merge version_2 into main
 2026-01-19 23:07:16 +00:00
development
2119af8840 Update src/app/layout.tsx 2026-01-19 23:07:12 +00:00
development
633fd447bc Update src/app/globals.css 2026-01-19 23:07:11 +00:00
3 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -509,7 +509,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;
@@ -522,5 +522,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,12 +1,11 @@
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";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
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 = {
@@ -39,7 +38,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${prata.variable} antialiased`} className={`${inter.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}
@@ -1265,4 +1264,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

@@ -213,4 +213,4 @@ export default function LandingPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }