development/96dedb33-f43c-43ca-a7dd-9ced702fbbeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
development merged 4 commits from version_1 into main 2026-02-09 12:29:59 +00:00
Conversation 0 Commits 4 Files Changed 2 +23 -4
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/layout.tsx
View File

@@ -1,8 +1,9 @@
import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Plus_Jakarta_Sans } from "next/font/google";
import { Inter } from "next/font/google";
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
@@ -30,6 +31,24 @@ export const metadata: Metadata = {
}
};
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -39,7 +58,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${interTight.variable} antialiased`}
className={{plusJakartaSans.variable} {inter.variable}} {inter.variable}} antialiased`}
>
<Tag />
{children}

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

@@ -11,7 +11,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-inter), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-inter-tight), sans-serif;
font-family: var(--font-plus-jakarta-sans), sans-serif;
}