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

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_11 bender:version_9 bender:version_10 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_2
Branches Tags
bender:main bender:version_11 bender:version_9 bender:version_10 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

9 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
e1ffb58177 Update src/app/styles/base.css 2026-03-04 12:00:19 +00:00
bender
817b8e97e6 Update src/app/page.tsx 2026-03-04 12:00:18 +00:00
bender
9c3e18a66d Update src/app/layout.tsx 2026-03-04 12:00:17 +00:00
bender
a720417509 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:57:37 +00:00
bender
8115047572 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:57:02 +00:00
bender
dc7e935de1 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:56:31 +00:00
bender
37fd6d8969 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:55:23 +00:00
bender
c1e3545218 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:55:03 +00:00
bender
114b865dcc Merge version_1 into main 
Merge version_1 into main
 2026-03-04 11:46:54 +00:00
3 changed files with 12 additions and 20 deletions
Expand all files Collapse all files

26
src/app/layout.tsx
View File

@@ -1,12 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Figtree } from "next/font/google"; import { Poppins } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; 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 = { 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"), 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({ export default function RootLayout({
children, children,
}: Readonly<{ }: Readonly<{
@@ -48,7 +38,9 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${libreBaskerville.variable} ${inter.variable} antialiased`}> <body
className={`${poppins.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}
@@ -1422,4 +1414,4 @@ export default function RootLayout({
</ServiceWrapper> </ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

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

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-inter), sans-serif; font-family: var(--font-poppins), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-libre-baskerville), serif; font-family: var(--font-poppins), serif;
} }