bender/7d6245c5-448c-4e80-8eb9-c88b8ef64474
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main

Browse Source 
Merge version_3 into main
This commit was merged in pull request #6.
This commit is contained in:
bender
2026-06-10 20:56:20 +00:00
parent f92ee61c88 3709dd3b90
commit ec7b632715
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/layout.tsx
View File

@@ -8,6 +8,7 @@ import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Open_Sans } from "next/font/google"; import { Open_Sans } from "next/font/google";
import { DM_Sans } from "next/font/google"; import { DM_Sans } from "next/font/google";
import { Manrope } from "next/font/google";
@@ -35,12 +36,13 @@ export const metadata: Metadata = {
}; };
const dmSans = DM_Sans({
variable: "--font-dm-sans", const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"], subsets: ["latin"],
}); });
const inter = Inter({ const dmSans = DM_Sans({
variable: "--font-inter", variable: "--font-dm-sans",
subsets: ["latin"], subsets: ["latin"],
}); });
@@ -52,7 +54,7 @@ export default function RootLayout({
return ( return (
<html lang="de" suppressHydrationWarning> <html lang="de" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${dmSans.variable} ${inter.variable} antialiased`}> <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
<Tag /> <Tag />
{children} {children}
<script <script

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-inter), 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-dm-sans), sans-serif; font-family: var(--font-manrope), sans-serif;
} }