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

Merge version_2 into main #7

Merged
bender merged 3 commits from version_2 into main 2026-03-04 12:00:24 +00:00
Conversation 0 Commits 3 Files Changed 3 +12 -20
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next";
import { Figtree } from "next/font/google";
import { Poppins } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Poppins } from "next/font/google";
import { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
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,17 +30,6 @@ export const metadata: Metadata = {
}
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -48,7 +38,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}>
<body
className={`${poppins.variable} antialiased`}
>
<Tag />
{children}
@@ -1422,4 +1414,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

2
src/app/page.tsx
View File

@@ -215,4 +215,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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), 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-libre-baskerville), serif;
font-family: var(--font-poppins), serif;
}