3 Commits

Author SHA1 Message Date
694c300287 Update src/app/styles/base.css 2026-02-27 13:51:14 +00:00
3363a711db Update src/app/layout.tsx 2026-02-27 13:51:13 +00:00
9d45aa9dc5 Merge version_3 into main
Merge version_3 into main
2026-02-27 13:39:29 +00:00
2 changed files with 7 additions and 6 deletions

View File

@@ -1,11 +1,12 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Rubik } from "next/font/google"; import { IBM_Plex_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 rubik = Rubik({ const ibmPlexSans = IBM_Plex_Sans({
variable: "--font-rubik", subsets: ["latin"], variable: "--font-ibm-plex-sans", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -27,7 +28,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={`${rubik.variable} antialiased`} className={`${ibmPlexSans.variable} antialiased`}
> >
<Tag /> <Tag />
{children} {children}

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-rubik), sans-serif; font-family: var(--font-ibm-plex-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-rubik), sans-serif; font-family: var(--font-ibm-plex-sans), sans-serif;
} }