bender/8fcd2391-1a35-49ec-aedf-d99de10c2b77
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-04-18 20:57:59 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -11
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/layout.tsx
View File

@@ -6,20 +6,22 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Libre_Baskerville } from "next/font/google";
const halant = Halant({
variable: "--font-halant",
export const metadata: Metadata = { title: 'Lumina Skincare | Clean, Science-Backed Beauty Essentials', description: 'Discover Lumina Skincare. Elevate your daily ritual with high-performance, dermatologist-tested formulas designed to reveal your skin\'s natural radiance.' };
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export const metadata: Metadata = { title: 'Lumina Skincare | Clean, Science-Backed Beauty Essentials', description: 'Discover Lumina Skincare. Elevate your daily ritual with high-performance, dermatologist-tested formulas designed to reveal your skin\'s natural radiance.' };
export default function RootLayout({
children,
}: Readonly<{
@@ -28,9 +30,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} antialiased`}
>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<Tag />
{children}
<script

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-libre-baskerville), serif;
}