bender/abc4671f-c548-4dc1-b39c-e05ac05bc4b0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
..
compare: bender:main
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

4 Commits
version_2 ... main

Author SHA1 Message Date
bender
8a96653dab Merge version_3 into main 
Merge version_3 into main
 2026-03-05 16:40:36 +00:00
bender
fdc72ddd53 Update src/app/styles/base.css 2026-03-05 16:40:32 +00:00
bender
262703cabc Update src/app/layout.tsx 2026-03-05 16:40:31 +00:00
bender
9176b72e84 Merge version_2 into main 
Merge version_2 into main
 2026-03-05 16:37:25 +00:00
2 changed files with 6 additions and 12 deletions
Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -1,22 +1,16 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import { Source_Sans_3 } from "next/font/google"; import { DM_Sans } 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({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({ const inter = Inter({
variable: "--font-inter", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
const sourceSans3 = Source_Sans_3({ const dmSans = DM_Sans({
variable: "--font-source-sans-3", subsets: ["latin"], variable: "--font-dm-sans", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -37,7 +31,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${halant.variable} ${inter.variable} ${sourceSans3.variable} antialiased`} className={`${inter.variable} ${dmSans.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-source-sans-3), sans-serif; font-family: var(--font-dm-sans), 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-source-sans-3), sans-serif; font-family: var(--font-dm-sans), sans-serif;
} }