Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-02-25 18:09:09 +00:00
2 changed files with 11 additions and 21 deletions

View File

@@ -1,29 +1,19 @@
import type { Metadata } from "next";
import { Poppins } from "next/font/google";
import { Bebas_Neue } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const poppins = Poppins({
variable: "--font-poppins",
subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
const bebasNeue = Bebas_Neue({
variable: "--font-bebas-neue", subsets: ["latin"],
weight: ["400"],
});
export const metadata: Metadata = {
title: "UrbanStyle - Premium Urban Fashion & Streetwear",
description: "Shop authentic urban fashion and premium streetwear. Discover curated collections with fast shipping, exceptional service, and membership rewards. Join 50K+ happy customers.",
keywords: "urban fashion, streetwear, contemporary apparel, urban style, clothing store, premium fashion",
openGraph: {
title: "UrbanStyle - Urban Fashion Store",
description: "Premium urban fashion and streetwear collections",
siteName: "UrbanStyle",
type: "website",
},
title: "UrbanStyle - Premium Urban Fashion & Streetwear", description: "Shop authentic urban fashion and premium streetwear. Discover curated collections with fast shipping, exceptional service, and membership rewards. Join 50K+ happy customers.", keywords: "urban fashion, streetwear, contemporary apparel, urban style, clothing store, premium fashion", openGraph: {
title: "UrbanStyle - Urban Fashion Store", description: "Premium urban fashion and streetwear collections", siteName: "UrbanStyle", type: "website"},
twitter: {
card: "summary_large_image",
title: "UrbanStyle - Urban Fashion Store",
},
card: "summary_large_image", title: "UrbanStyle - Urban Fashion Store"},
robots: {
index: true,
follow: true,
@@ -39,7 +29,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${poppins.variable} antialiased`}
className={`${bebasNeue.variable} antialiased`}
>
<Tag />
{children}
@@ -1414,4 +1404,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

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