feat(SW-350): fix merge conflicts

This commit is contained in:
Pontus Dreij
2024-10-07 14:18:04 +02:00
parent 795f4f218b
commit 2650b3d5d7
4 changed files with 4 additions and 7 deletions

View File

@@ -13,5 +13,5 @@ export default async function BookingWidgetPage() {
return null
}
return <BookingWidget type="full" />
return <BookingWidget />
}

View File

@@ -65,7 +65,7 @@ export default async function RootLayout({
<SkipToMainContent />
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
{header}
<BookingWidget type="full" />
<BookingWidget />
{children}
<Footer />
<TokenRefresher />

View File

@@ -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);

View File

@@ -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);