bender/0c5408b1-1dbc-40fe-aa1b-6e8be2675cee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

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

3 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
0972431ef8 Update src/app/styles/base.css 2026-03-04 12:04:43 +00:00
bender
1bab987b5e Update src/app/layout.tsx 2026-03-04 12:04:41 +00:00
bender
6f3125d7d5 Merge version_2 into main 
Merge version_2 into main
 2026-03-04 11:56:35 +00:00
2 changed files with 7 additions and 18 deletions
Expand all files Collapse all files

21
src/app/layout.tsx
View File

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

4
src/app/styles/base.css
View File

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