From 2650b3d5d70f2e631893e41ffeaf5a1564c5e985 Mon Sep 17 00:00:00 2001
From: Pontus Dreij <pontus.dreij@scandichotels.com>
Date: Mon, 7 Oct 2024 14:18:04 +0200
Subject: [PATCH] feat(SW-350): fix merge conflicts

---
 app/[lang]/(live)/@bookingwidget/page.tsx                    | 2 +-
 app/[lang]/(live-current)/layout.tsx                         | 2 +-
 .../Forms/BookingWidget/FormContent/formContent.module.css   | 2 +-
 components/Forms/BookingWidget/form.module.css               | 5 +----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/[lang]/(live)/@bookingwidget/page.tsx b/app/[lang]/(live)/@bookingwidget/page.tsx
index b2dd7e1b6..13a414cba 100644
--- a/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -13,5 +13,5 @@ export default async function BookingWidgetPage() {
     return null
   }
 
-  return <BookingWidget type="full" />
+  return <BookingWidget />
 }
diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx
index ac6deaf17..ec3be8b3c 100644
--- a/app/[lang]/(live-current)/layout.tsx
+++ b/app/[lang]/(live-current)/layout.tsx
@@ -65,7 +65,7 @@ export default async function RootLayout({
         <SkipToMainContent />
         <ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
           {header}
-          <BookingWidget type="full" />
+          <BookingWidget />
           {children}
           <Footer />
           <TokenRefresher />
diff --git a/components/Forms/BookingWidget/FormContent/formContent.module.css b/components/Forms/BookingWidget/FormContent/formContent.module.css
index 1addcc761..37f03cc75 100644
--- a/components/Forms/BookingWidget/FormContent/formContent.module.css
+++ b/components/Forms/BookingWidget/FormContent/formContent.module.css
@@ -97,7 +97,7 @@
 
 @media screen and (min-width: 768px) and (max-width: 1366px) {
   .inputContainer {
-    padding: var(--Spacing-x2);
+    padding: var(--Spacing-x2) var(--Spacing-x2);
   }
   .buttonContainer {
     padding-right: var(--Spacing-x2);
diff --git a/components/Forms/BookingWidget/form.module.css b/components/Forms/BookingWidget/form.module.css
index f0e4184d1..8514dffd7 100644
--- a/components/Forms/BookingWidget/form.module.css
+++ b/components/Forms/BookingWidget/form.module.css
@@ -27,10 +27,7 @@
   }
 }
 
-@media screen and (min-width: 767px) {
-  .section {
-    padding: var(--Spacing-x1) var(--Spacing-x5);
-  }
+@media screen and (min-width: 1367px) {
   .default {
     padding: var(--Spacing-x-one-and-half) var(--Spacing-x2)
       var(--Spacing-x-one-and-half) var(--Spacing-x1);