Merge version_23 into main

Merge version_23 into main

src/app/page.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
 import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
@@ -21,7 +21,7 @@ export default function LandingPage() {
     <ThemeProvider
       defaultButtonVariant="shift-hover"
       defaultTextAnimation="reveal-blur"
-      borderRadius="soft"
+      borderRadius="pill"
       contentWidth="medium"
       sizing="mediumLarge"
       background="circleGradient"
@@ -31,15 +31,18 @@ export default function LandingPage() {
       headingFontWeight="normal"
     >
       <div id="nav" data-section="nav">
-        <NavbarStyleApple
+        <NavbarLayoutFloatingInline
           brandName="Crimson Seoul"
           navItems={[
-            { name: "About", id: "about" },
+            { name: "Products", id: "#products" },
-            { name: "Menu", id: "menu" },
+            { name: "Features", id: "#features" },
-            { name: "Experience", id: "experience" },
+            { name: "Gallery", id: "#gallery" }
-            { name: "Testimonials", id: "testimonials" },
-            { name: "Reserve", id: "contact" }
           ]}
+          button={{
+            text: "Reserve",
+            href: "#contact",
+            variant: "primary"
+          }}
         />
       </div>
 

src/app/styles/variables.css

@@ -3,20 +3,20 @@
   /* --vw is set by ThemeProvider */
 
   /* --background: #fffafa;;
-  --card: #fff7f7;;
+  --card: #ff0000;;
   --foreground: "Inter", sans-serif;;
-  --primary-cta: #e63946;;
+  --primary-cta: #800080;;
   --secondary-cta: "Inter", sans-serif;;
-  --accent: #f5c4c7;;
+  --accent: #90ee90;;
-  --background-accent: #f09199;; */
+  --background-accent: #20b2aa;; */
 
-  --background: #fffafa;;
+  --background: #ffffff;;
-  --card: #fff7f7;;
+  --card: #ff0000;;
   --foreground: "Inter", sans-serif;;
-  --primary-cta: #e63946;;
+  --primary-cta: #800080;;
   --secondary-cta: "Inter", sans-serif;;
-  --accent: #f5c4c7;;
+  --accent: #90ee90;;
-  --background-accent: #f09199;;
+  --background-accent: #20b2aa;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);

src/components/sections/feature/FeatureCardTwentyFive.tsx

@@ -160,6 +160,11 @@ const FeatureCardTwentyFive = ({
                 </div>
               ))}
             </div>
+            <div className="mt-5">
+              <button className={cls("bg-primary text-background px-4 py-2 rounded-theme transition-colors hover:bg-primary-dark", textBoxButtonClassName)}>
+                Take a Look at Dishes
+              </button>
+            </div>
           </div>
         );
       })}

src/components/sections/hero/HeroLogoBillboardSplit.tsx

@@ -87,7 +87,7 @@ const HeroLogoBillboardSplit = ({
     return (
         <section
             aria-label={ariaLabel}
-            className={cls("relative w-full py-hero-page-padding", className)}
+            className={cls("relative w-full py-48 pb-32", className)}
         >
             <HeroBackgrounds {...background} />
             <div className={cls("w-content-width mx-auto flex flex-col gap-6 md:gap-15 relative z-10", containerClassName)}>
@@ -120,7 +120,7 @@ const HeroLogoBillboardSplit = ({
                 </div>
 
                 {frameStyle === "browser" ? (
-                    <div className={cls("w-full overflow-hidden rounded-theme-capped card", mediaWrapperClassName)}>
+                    <div className={cls("w-full overflow-hidden rounded-theme-capped card mt-4", mediaWrapperClassName)}>
                         <div className={cls("relative z-1 bg-background border-b border-foreground/10 px-4 py-3 flex items-center gap-4", browserBarClassName)}>
                             <div className="flex items-center gap-2">
                                 <div className="h-3 w-auto aspect-square rounded-theme bg-accent" />
@@ -145,7 +145,7 @@ const HeroLogoBillboardSplit = ({
                         </div>
                     </div>
                 ) : (
-                    <div className={cls("w-full overflow-hidden rounded-theme-capped card p-4", mediaWrapperClassName)}>
+                    <div className={cls("w-full overflow-hidden rounded-theme-capped card p-4 mt-4", mediaWrapperClassName)}>
                         <MediaContent
                             imageSrc={imageSrc}
                             videoSrc={videoSrc}