bender/db4e20db-da89-46ff-ada8-19f4b821c042
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #5

Merged
bender merged 2 commits from version_1 into main 2026-03-04 11:57:02 +00:00
Conversation 0 Commits 2 Files Changed 2 +10 -8
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/layout.tsx
View File

@@ -3,10 +3,8 @@ import { Figtree } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Poppins } from "next/font/google";
const figtree = Figtree({
variable: "--font-figtree", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Kviten | Premium Floral Design & Arrangements", description: "Exquisite handcrafted flower arrangements for weddings, events, and special occasions. Premium quality blooms delivered with artistry and care.", keywords: "flowers, florist, arrangements, wedding flowers, event flowers, premium bouquets, floral design", metadataBase: new URL("https://kviten.com"),
@@ -29,6 +27,12 @@ export const metadata: Metadata = {
}
};
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -37,9 +41,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${figtree.variable} antialiased`}
>
<body className={`${poppins.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-figtree), 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-figtree), sans-serif;
font-family: var(--font-poppins), sans-serif;
}