feat(SW-350): fix merge conflicts
This commit is contained in:
@@ -13,5 +13,5 @@ export default async function BookingWidgetPage() {
|
||||
return null
|
||||
}
|
||||
|
||||
return <BookingWidget type="full" />
|
||||
return <BookingWidget />
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ export default async function RootLayout({
|
||||
<SkipToMainContent />
|
||||
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
|
||||
{header}
|
||||
<BookingWidget type="full" />
|
||||
<BookingWidget />
|
||||
{children}
|
||||
<Footer />
|
||||
<TokenRefresher />
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user