From 603c444f4fcffc72c56d45645f6ea242cbbf3c41 Mon Sep 17 00:00:00 2001
From: ivke995 <ivanivic842@gmail.com>
Date: Thu, 25 Sep 2025 13:16:30 +0200
Subject: [PATCH 1/3] feat: add new background for contact form

---
 .../src/components/BaseContactForm.astro        |  6 +++---
 apps/website/src/components/contact/Hero.astro  | 17 ++++++++---------
 .../staff-agmentation/GetYourPlanForm.astro     |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/website/src/components/BaseContactForm.astro b/apps/website/src/components/BaseContactForm.astro
index 14a5eee3..b4e7a989 100644
--- a/apps/website/src/components/BaseContactForm.astro
+++ b/apps/website/src/components/BaseContactForm.astro
@@ -17,7 +17,7 @@ const { onDark, classNames, formId, formClassNames } = Astro.props;
 <base-contact-form data-id={formId} class={classnames(classNames)}>
   <form
     class={classnames(
-      "group/contact-us flex flex-col gap-2 relative",
+      "group/contact-us flex flex-col gap-2 bg-white rounded-xl px-7 relative",
       formClassNames,
     )}
     id={formId}
@@ -104,8 +104,8 @@ const { onDark, classNames, formId, formClassNames } = Astro.props;
           class={classnames(
             "[&>em]:not-italic [&_b]:text-[#67a807] [&>em]:font-semibold cursor-pointer text-sm sm:text-base",
             {
-              "text-secondary": !onDark,
-              "text-neutral-50": onDark,
+              "text-neutral": !onDark,
+              "text-secondary": onDark,
             },
           )}
         />
diff --git a/apps/website/src/components/contact/Hero.astro b/apps/website/src/components/contact/Hero.astro
index ea8428ba..cc1f095e 100644
--- a/apps/website/src/components/contact/Hero.astro
+++ b/apps/website/src/components/contact/Hero.astro
@@ -61,19 +61,18 @@ import RightArrow from "../icons/RightArrow.astro";
           </span>
         </p>
       </div>
-
-      <BaseContactForm
+        <BaseContactForm
         formId="contact-us"
         onDark
-        classNames="col-span-6 md:col-span-12 lg:col-span-6 xl:col-span-5 lg:col-start-7 md:p-12 lg:pl-0"
-      >
+        classNames="col-span-6 md:col-span-12 lg:col-span-6 xl:col-span-5 lg:col-start-7 md:p-12 lg:pl-0 mb-7 md:mb-0"
+        >
         <span
-          slot="submit-button-content"
-          class="flex items-center justify-center gap-2.5 text-sm sm:text-base"
+        slot="submit-button-content"
+        class="flex items-center justify-center gap-2.5 text-sm sm:text-base"
         >
-          Get a free build review <RightArrow />
-        </span>
-      </BaseContactForm>
+        Get a free build review <RightArrow />
+      </span>
+    </BaseContactForm>
     </div>
   </div>
 </Section>
diff --git a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
index 9abc5606..1530efec 100644
--- a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
+++ b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
@@ -8,11 +8,12 @@ import * as formContent from "../../content/contact/get-your-plan-form.md";
 <div class="col-span-6 lg:col-span-5 lg:col-start-2 md:row-start-2">
   <form
     id="get-your-plan-form"
-    class="group/contact-us mx-auto flex-col gap-2"
+    class="group/contact-us mx-auto bg-white rounded-xl flex-col py-1 gap-2 px-7"
     novalidate
   >
     <Field
       isTextArea={false}
+      classNames=""
       onDark
       inputProps={{
         name: "form-full-name",
@@ -60,7 +61,7 @@ import * as formContent from "../../content/contact/get-your-plan-form.md";
           set:html={formContent.frontmatter.consent}
           id="form-consent-text"
           for="form-consent"
-          class="text-neutral-50 [&>em]:not-italic [&>em]:font-semibold cursor-pointer"
+          class="text-[#3C3843] [&>em]:not-italic [&>em]:font-semibold cursor-pointer"
         />
       </div>
       <button

From 506780423048accbc541ebf1dfdeb79f16ff4b52 Mon Sep 17 00:00:00 2001
From: ivke995 <ivanivic842@gmail.com>
Date: Thu, 25 Sep 2025 13:54:38 +0200
Subject: [PATCH 2/3] fix: edit col start and span for lg screens

---
 apps/website/src/components/staff-agmentation/GetYourPlan.astro | 2 +-
 .../src/components/staff-agmentation/GetYourPlanForm.astro      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/website/src/components/staff-agmentation/GetYourPlan.astro b/apps/website/src/components/staff-agmentation/GetYourPlan.astro
index db225077..07eb84b2 100644
--- a/apps/website/src/components/staff-agmentation/GetYourPlan.astro
+++ b/apps/website/src/components/staff-agmentation/GetYourPlan.astro
@@ -48,7 +48,7 @@ import "../../styles/loader.css";
       />
     </div>
     <div
-      class="col-span-6 flex flex-wrap gap-7 items-center md:col-span-11 lg:col-start-2 lg:col-span-8 lg:row-start-1 xl:col-start-2 xl:col-span-5"
+      class="col-span-6 flex flex-wrap gap-7 items-center md:col-span-11 lg:col-start-1 lg:col-span-7 lg:row-start-1 xl:col-start-2 xl:col-span-5"
     >
       <h2 class="font-medium leading-none text-[32px] text-white tracking-[-0.7px]">
         Get Your <span class="text-crocoder-yellow"
diff --git a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
index 1530efec..be49730d 100644
--- a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
+++ b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
@@ -5,7 +5,7 @@ import "../../styles/loader.css";
 import * as formContent from "../../content/contact/get-your-plan-form.md";
 ---
 
-<div class="col-span-6 lg:col-span-5 lg:col-start-2 md:row-start-2">
+<div class="col-span-6 lg:col-span-6 lg:col-start-1 md:row-start-2 xl:col-start-2 xl:col-span-5">
   <form
     id="get-your-plan-form"
     class="group/contact-us mx-auto bg-white rounded-xl flex-col py-1 gap-2 px-7"

From 08fd7dab5f1b9ea868c26463ed7daa0fc8c34fcc Mon Sep 17 00:00:00 2001
From: ivke995 <ivanivic842@gmail.com>
Date: Thu, 25 Sep 2025 14:46:47 +0200
Subject: [PATCH 3/3] fix: add more padding and text style for contact forms

---
 .../website/src/components/BaseContactForm.astro |  4 ++--
 apps/website/src/components/contact/Hero.astro   | 16 ++++++++--------
 .../staff-agmentation/GetYourPlanForm.astro      |  4 +---
 .../components/vibe-code-mvp/GetInTouch.astro    |  5 ++---
 .../src/components/vibe-code-mvp/Hero.astro      |  3 +--
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/website/src/components/BaseContactForm.astro b/apps/website/src/components/BaseContactForm.astro
index b4e7a989..98dbb0ff 100644
--- a/apps/website/src/components/BaseContactForm.astro
+++ b/apps/website/src/components/BaseContactForm.astro
@@ -104,8 +104,8 @@ const { onDark, classNames, formId, formClassNames } = Astro.props;
           class={classnames(
             "[&>em]:not-italic [&_b]:text-[#67a807] [&>em]:font-semibold cursor-pointer text-sm sm:text-base",
             {
-              "text-neutral": !onDark,
-              "text-secondary": onDark,
+              "text-secondary": !onDark,
+              "text-neutral-50": onDark,
             },
           )}
         />
diff --git a/apps/website/src/components/contact/Hero.astro b/apps/website/src/components/contact/Hero.astro
index cc1f095e..fcee15af 100644
--- a/apps/website/src/components/contact/Hero.astro
+++ b/apps/website/src/components/contact/Hero.astro
@@ -61,18 +61,18 @@ import RightArrow from "../icons/RightArrow.astro";
           </span>
         </p>
       </div>
-        <BaseContactForm
+      <BaseContactForm
         formId="contact-us"
-        onDark
         classNames="col-span-6 md:col-span-12 lg:col-span-6 xl:col-span-5 lg:col-start-7 md:p-12 lg:pl-0 mb-7 md:mb-0"
-        >
+        formClassNames="py-7"
+      >
         <span
-        slot="submit-button-content"
-        class="flex items-center justify-center gap-2.5 text-sm sm:text-base"
+          slot="submit-button-content"
+          class="flex items-center justify-center gap-2.5 text-sm sm:text-base"
         >
-        Get a free build review <RightArrow />
-      </span>
-    </BaseContactForm>
+          Get a free build review <RightArrow />
+        </span>
+      </BaseContactForm>
     </div>
   </div>
 </Section>
diff --git a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
index be49730d..a38334f3 100644
--- a/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
+++ b/apps/website/src/components/staff-agmentation/GetYourPlanForm.astro
@@ -8,13 +8,12 @@ import * as formContent from "../../content/contact/get-your-plan-form.md";
 <div class="col-span-6 lg:col-span-6 lg:col-start-1 md:row-start-2 xl:col-start-2 xl:col-span-5">
   <form
     id="get-your-plan-form"
-    class="group/contact-us mx-auto bg-white rounded-xl flex-col py-1 gap-2 px-7"
+    class="group/contact-us mx-auto bg-white rounded-xl flex-col py-7 gap-2 px-7"
     novalidate
   >
     <Field
       isTextArea={false}
       classNames=""
-      onDark
       inputProps={{
         name: "form-full-name",
         id: "form-full-name",
@@ -31,7 +30,6 @@ import * as formContent from "../../content/contact/get-your-plan-form.md";
     />
     <Field
       isTextArea={false}
-      onDark
       inputProps={{
         name: "form-email",
         id: "form-email",
diff --git a/apps/website/src/components/vibe-code-mvp/GetInTouch.astro b/apps/website/src/components/vibe-code-mvp/GetInTouch.astro
index 1bff6f40..95302efd 100644
--- a/apps/website/src/components/vibe-code-mvp/GetInTouch.astro
+++ b/apps/website/src/components/vibe-code-mvp/GetInTouch.astro
@@ -45,12 +45,11 @@ import Section from "../Section.astro";
     </p>
   </div>
   <div
-    class="max-md:px-4 md:col-span-12 md:px-8 lg:px-0 lg:mt-28 lg:flex lg:flex-col row-start-2 col-start-1 col-span-6 lg:col-span-5 lg:col-start-7 lg:row-start-1"
+    class="max-md:px-4 md:col-span-12 md:px-8 lg:px-0 lg:mt-0 lg:flex lg:flex-col row-start-2 col-start-1 col-span-6 lg:col-span-5 lg:col-start-7 lg:row-start-1"
   >
     <BaseContactForm
       formId="vibe-code-contact-us-footer"
-      onDark
-      formClassNames="pb-6 lg:pb-12 max-sm:gap-0"
+      formClassNames="my-24 py-7 max-sm:gap-0"
     >
       <span
         slot="submit-button-content"
diff --git a/apps/website/src/components/vibe-code-mvp/Hero.astro b/apps/website/src/components/vibe-code-mvp/Hero.astro
index 393c376c..c518621e 100644
--- a/apps/website/src/components/vibe-code-mvp/Hero.astro
+++ b/apps/website/src/components/vibe-code-mvp/Hero.astro
@@ -90,8 +90,7 @@ import RightArrow from "../icons/RightArrow.astro";
       >
         <BaseContactForm
           formId="vibe-code-contact-us-hero"
-          onDark
-          formClassNames="lg:-top-6 max-lg:max-w-3xl max-lg:mx-auto"
+          formClassNames="lg:-top-6 py-7 max-lg:max-w-3xl max-lg:mx-auto"
         >
           <span
             slot="submit-button-content"