scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(SW-350): fix merge conflicts

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/[lang]/(live)/@bookingwidget/page.tsx
View File

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

2
app/[lang]/(live-current)/layout.tsx
View File

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

2
components/Forms/BookingWidget/FormContent/formContent.module.css
View File

@@ -97,7 +97,7 @@
@media screen and (min-width: 768px) and (max-width: 1366px) { @media screen and (min-width: 768px) and (max-width: 1366px) {
.inputContainer { .inputContainer {
padding: var(--Spacing-x2); padding: var(--Spacing-x2) var(--Spacing-x2);
} }
.buttonContainer { .buttonContainer {
padding-right: var(--Spacing-x2); padding-right: var(--Spacing-x2);

5
components/Forms/BookingWidget/form.module.css
View File

@@ -27,10 +27,7 @@
} }
} }
@media screen and (min-width: 767px) { @media screen and (min-width: 1367px) {
.section {
padding: var(--Spacing-x1) var(--Spacing-x5);
}
.default { .default {
padding: var(--Spacing-x-one-and-half) var(--Spacing-x2) padding: var(--Spacing-x-one-and-half) var(--Spacing-x2)
var(--Spacing-x-one-and-half) var(--Spacing-x1); var(--Spacing-x-one-and-half) var(--Spacing-x1);