Merge version_1 into main #15

Merged
bender merged 2 commits from version_1 into main 2026-03-13 22:44:44 +00:00
2 changed files with 10 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Open_Sans } from "next/font/google";
@@ -13,8 +14,14 @@ export const metadata: Metadata = {
description: 'Premium cigars, kratom, vapes & glass in Lake County. 10 years of expert service, best prices, huge selection. Visit today.',
};
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
variable: "--font-inter",
subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans",
subsets: ["latin"],
});
export default function RootLayout({
@@ -25,7 +32,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${inter.variable} antialiased`}>
<body className={`${inter.variable} ${openSans.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-open-sans), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;