bender/6ec556f3-1ccd-4a52-892d-84ea4ebbf670
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_8 into main #17

Merged
bender merged 2 commits from version_8 into main 2026-03-04 20:47:50 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -6
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/layout.tsx
View File

@@ -1,16 +1,23 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import { Public_Sans } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Belle Precisions - Permanent Makeup in Hot Springs, AR", description: "Professional permanent eyeliner enhancement and cosmetic makeup services in Hot Springs, Arkansas. 5-star rated, women-owned clinic specializing in precision beauty treatments."
};
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: {
@@ -18,7 +25,7 @@ export default function RootLayout({
}) {
return (
<html lang="en">
<body className={inter.variable}>{children}
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>{children}
<script
dangerouslySetInnerHTML={{
__html: `

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