Merge version_4 into main #5

Merged
bender merged 2 commits from version_4 into main 2026-06-07 12:09:05 +00:00
2 changed files with 8 additions and 9 deletions

View File

@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Public_Sans } from "next/font/google";
import { Poppins } from "next/font/google";
@@ -15,13 +16,11 @@ export const metadata: Metadata = {
description: 'An intelligent spreadsheet planner and reservation system leveraging custom algorithms (QuickSort, Binary Search, Hash Maps) and Gemini 2.5 Flash API for efficient itinerary and budget management, designed for academic and personal projects.',
};
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
@@ -32,7 +31,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
<body className={`${poppins.variable} antialiased`}>
<Tag />
{children}
<script

View File

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