development/f1726c70-db63-44e9-8030-c1c87ec5f2f8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: development:version_2
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1
...
pull from: development:main
Branches Tags
development:main development:version_4 development:version_3 development:version_2 development:version_1

7 Commits
version_2 ... main

Author SHA1 Message Date
development
34f5a70dc6 Merge version_4 into main 
Merge version_4 into main
 2026-01-08 16:02:23 +00:00
development
bb201a7824 Update src/app/page.tsx 2026-01-08 16:02:18 +00:00
development
3d35c021c5 Update src/app/layout.tsx 2026-01-08 16:02:17 +00:00
development
f6c9030c1f Update src/app/globals.css 2026-01-08 16:02:17 +00:00
development
b5deb839de Merge version_3 into main 
Merge version_3 into main
 2026-01-08 15:57:34 +00:00
development
c59dfd3ce3 Update src/app/page.tsx 2026-01-08 15:57:29 +00:00
development
02c2d75e88 Merge version_2 into main 
Merge version_2 into main
 2026-01-08 15:54:10 +00:00
3 changed files with 9 additions and 9 deletions
Expand all files Collapse all files

4
src/app/globals.css
View File

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

10
src/app/layout.tsx
View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next";
import { Fira_Code } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const firaCode = Fira_Code({
variable: "--font-fira-code", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
@@ -34,7 +34,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${firaCode.variable} antialiased`}
className={`${inter.variable} antialiased`}
>
<Tag />
{children}
@@ -1260,4 +1260,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

4
src/app/page.tsx
View File

@@ -124,7 +124,7 @@ export default function LandingPage() {
useInvertedBackground="noInvert"
buttons={[
{ text: "Reserve Now", href: "https://example.com/reserve" },
{ text: "Call: (212) 555-VAULT", href: "tel:+12125555828" }
{ text: "View Hours", href: "https://example.com/hours" }
]}
/>
</div>
@@ -159,4 +159,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}