Merge version_12 into main

Update theme fonts
2026-03-21 23:16:24 +00:00 · 2026-03-21 23:16:20 +00:00 · 2026-03-21 23:16:20 +00:00 · 2026-03-21 22:51:24 +00:00 · 2026-03-21 22:51:18 +00:00 · 2026-03-21 22:37:57 +00:00
7 changed files with 38 additions and 43 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -10,11 +10,11 @@ import { Sparkles, MapPin } from "lucide-react";
 import Link from "next/link";

 const navItems = [
-  { name: "Home", id: "home" },
-  { name: "Menu", id: "menu" },
-  { name: "Order Online", id: "order-online" },
-  { name: "About", id: "about" },
-  { name: "Contact", id: "contact" },
+  { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
+  { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+  { name: "About", id: "/about" },
+  { name: "Contact", id: "/contact" },
 ];

 const footerColumns = [
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -10,11 +10,11 @@ import { MapPin, Zap } from "lucide-react";

 export default function ContactPage() {
  const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
  ];

  const footerColumns = [
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,22 +6,10 @@ import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Open_Sans } from "next/font/google";

-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});

-const manrope = Manrope({
-  variable: "--font-manrope",
-  subsets: ["latin"],
-});

 export const metadata: Metadata = {
  title: "Get Fruity Cafe - Fresh Smoothies & Healthy Eats in Conyers, GA",
@@ -56,6 +44,15 @@ export const metadata: Metadata = {
  },
 };

+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
+  subsets: ["latin"],
+});
+
 export default function RootLayout({
  children,
 }: Readonly<{
@@ -64,9 +61,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${manrope.variable} antialiased`}
-        >
+        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -11,11 +11,11 @@ import Link from "next/link";

 export default function MenuPage() {
  const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
  ];

  const footerColumns = [
--- a/src/app/order-online/page.tsx
+++ b/src/app/order-online/page.tsx
@@ -10,11 +10,11 @@ import { ShoppingCart, Zap } from "lucide-react";
 import Link from "next/link";

 const navItems = [
-  { name: "Home", id: "home" },
-  { name: "Menu", id: "menu" },
-  { name: "Order Online", id: "order-online" },
-  { name: "About", id: "about" },
-  { name: "Contact", id: "contact" },
+  { name: "Home", id: "/" },
+  { name: "Menu", id: "/menu" },
+  { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+  { name: "About", id: "/about" },
+  { name: "Contact", id: "/contact" },
 ];

 const footerColumns = [
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -14,11 +14,11 @@ import { Leaf, Star, Sparkles, MapPin, Zap } from "lucide-react";

 export default function HomePage() {
  const navItems = [
-    { name: "Home", id: "home" },
-    { name: "Menu", id: "menu" },
-    { name: "Order Online", id: "order-online" },
-    { name: "About", id: "about" },
-    { name: "Contact", id: "contact" },
+    { name: "Home", id: "/" },
+    { name: "Menu", id: "/menu" },
+    { name: "Order Online", id: "https://get-fruity-cafe-conyers.food-menu.net/menu/" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" },
  ];

  const footerColumns = [
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }
Author	SHA1	Message	Date
bender	36710d0dca	Merge version_12 into main Merge version_12 into main	2026-03-21 23:16:24 +00:00
bender	fb91f967a2	Update theme fonts	2026-03-21 23:16:20 +00:00
bender	773bad05a8	Update theme fonts	2026-03-21 23:16:20 +00:00
bender	47e843f1e4	Merge version_12 into main Merge version_12 into main	2026-03-21 22:51:24 +00:00
bender	b338d064ce	Update theme colors	2026-03-21 22:51:18 +00:00
bender	f3d95fde77	Merge version_11 into main Merge version_11 into main	2026-03-21 22:37:57 +00:00
bender	bece4ed275	Update src/app/page.tsx	2026-03-21 22:37:53 +00:00
bender	f499816748	Update src/app/order-online/page.tsx	2026-03-21 22:37:52 +00:00
bender	b98daa9ce1	Update src/app/menu/page.tsx	2026-03-21 22:37:52 +00:00
bender	f3a7d40484	Update src/app/contact/page.tsx	2026-03-21 22:37:52 +00:00
bender	198efe04b5	Update src/app/about/page.tsx	2026-03-21 22:37:51 +00:00
bender	553b0b678f	Merge version_10 into main Merge version_10 into main	2026-03-21 22:33:59 +00:00
bender	a0832d4d6b	Update src/app/page.tsx	2026-03-21 22:33:55 +00:00
bender	f5212a29da	Update src/app/order-online/page.tsx	2026-03-21 22:33:55 +00:00
bender	88bd34526b	Update src/app/menu/page.tsx	2026-03-21 22:33:54 +00:00
bender	5987f6b2a8	Update src/app/contact/page.tsx	2026-03-21 22:33:54 +00:00
bender	7af8a58e3b	Update src/app/about/page.tsx	2026-03-21 22:33:53 +00:00
bender	593a8f6a88	Merge version_9 into main Merge version_9 into main	2026-03-21 22:30:47 +00:00