development/ae0825cd-385b-4d36-a7f2-78c5131185e2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
development merged 3 commits from version_2 into main 2026-01-06 10:20:31 +00:00
Conversation 0 Commits 3 Files Changed 3 +15 -9
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/globals.css
View File

@@ -495,7 +495,7 @@ html {
body {
background-color: var(--background);
color: var(--foreground);
font-family: var(--font-montserrat), sans-serif;
font-family: var(--font-playfair-display --font-roboto), sans-serif;
position: relative;
min-height: 100vh;
overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
h4,
h5,
h6 {
font-family: var(--font-montserrat), sans-serif;
font-family: var(--font-playfair-display --font-roboto), sans-serif;
}

16
src/app/layout.tsx
View File

@@ -1,14 +1,20 @@
import type { Metadata } from "next";
import { Montserrat } from "next/font/google";
import { Playfair_Display, Roboto } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const montserrat = Montserrat({
variable: "--font-montserrat",
const playfairDisplay = Playfair_Display({
variable: "--font-playfair-display",
subsets: ["latin"],
});
const roboto = Roboto({
variable: "--font-roboto",
subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
});
export const metadata: Metadata = {
title: "Prestige Motors | Luxury & Performance Vehicles",
description: "Discover premium vehicles at Prestige Motors. Expert selection, transparent pricing, and exceptional service. Browse our luxury inventory today.",
@@ -51,7 +57,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={montserrat.variable}
className={`${playfairDisplay.variable} ${roboto.variable}`}
>
<Tag />
{children}
@@ -1277,4 +1283,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleMinimal from "@/components/navbar/NavbarStyleMinimal";
@@ -261,4 +261,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}