diff --git a/pages/checkout.tsx b/pages/checkout.tsx index f2bc93517..ae502f0e9 100644 --- a/pages/checkout.tsx +++ b/pages/checkout.tsx @@ -1,6 +1,5 @@ -import { Layout } from 'src/components/common'; +import { LayoutCheckout } from 'src/components/common'; import { CheckoutPage } from 'src/components/modules/checkout'; -import { HomeBanner, HomeCategories, HomeCollection, HomeCTA, HomeFeature, HomeRecipe, HomeSubscribe, HomeVideo } from 'src/components/modules/home'; export default function Checkout() { return ( @@ -10,4 +9,4 @@ export default function Checkout() { ) } -Checkout.Layout = Layout +Checkout.Layout = LayoutCheckout diff --git a/src/components/common/LayoutCheckout/LayoutCheckout.module.scss b/src/components/common/LayoutCheckout/LayoutCheckout.module.scss new file mode 100644 index 000000000..8a32d20a7 --- /dev/null +++ b/src/components/common/LayoutCheckout/LayoutCheckout.module.scss @@ -0,0 +1,17 @@ +@import "../../../styles/utilities"; +.layoutCheckout { + display: flex; + flex-direction: column; + min-height: 100vh; + > main { + flex: 1; + position: relative; + } + .footer { + @apply spacing-horizontal; + padding-top: 3rem; + padding-left: 3.2rem; + padding-bottom: 3rem; + background-color: var(--gray); + } +} diff --git a/src/components/common/LayoutCheckout/LayoutCheckout.tsx b/src/components/common/LayoutCheckout/LayoutCheckout.tsx new file mode 100644 index 000000000..06c632418 --- /dev/null +++ b/src/components/common/LayoutCheckout/LayoutCheckout.tsx @@ -0,0 +1,20 @@ +import s from './LayoutCheckout.module.scss' + +interface Props { + children?: any, +} + +const LayoutCheckout = ({ children }: Props) => { + return ( +
+
{children}
+ +
+ ) +} + +export default LayoutCheckout \ No newline at end of file diff --git a/src/components/common/index.ts b/src/components/common/index.ts index 868d49e29..7b82399f6 100644 --- a/src/components/common/index.ts +++ b/src/components/common/index.ts @@ -47,3 +47,4 @@ export { default as StaticImage} from './StaticImage/StaticImage' export { default as EmptyCommon} from './EmptyCommon/EmptyCommon' export { default as CustomShapeSvg} from './CustomShapeSvg/CustomShapeSvg' export { default as RecommendedRecipes} from './RecommendedRecipes/RecommendedRecipes' +export { default as LayoutCheckout} from './LayoutCheckout/LayoutCheckout' \ No newline at end of file diff --git a/src/components/modules/checkout/CheckoutBill/CheckoutBill.module.scss b/src/components/modules/checkout/CheckoutBill/CheckoutBill.module.scss index 403bdb76b..84dea0f06 100644 --- a/src/components/modules/checkout/CheckoutBill/CheckoutBill.module.scss +++ b/src/components/modules/checkout/CheckoutBill/CheckoutBill.module.scss @@ -3,7 +3,7 @@ min-width: 100%; @screen lg { max-width: 56.3rem; - @apply flex justify-between flex-col border-l-2 border-solid border-line; + @apply flex justify-between flex-col; } .title { display: none; diff --git a/src/components/modules/checkout/CheckoutInfo/CheckoutInfo.module.scss b/src/components/modules/checkout/CheckoutInfo/CheckoutInfo.module.scss index cadf9f684..b1ac88a1f 100644 --- a/src/components/modules/checkout/CheckoutInfo/CheckoutInfo.module.scss +++ b/src/components/modules/checkout/CheckoutInfo/CheckoutInfo.module.scss @@ -1,11 +1,13 @@ .warpper{ @apply w-full; padding: 3.2rem; + @screen lg { + padding-right: 8.8rem; + } .title{ margin-bottom: 3.2rem; @apply flex justify-between items-center; .viewCart{ - margin-right: 5.6rem; @apply text-primary font-bold; display: block; cursor: pointer; diff --git a/src/components/modules/checkout/CheckoutInfo/components/CustomerInfoForm/CustomerInfoForm.module.scss b/src/components/modules/checkout/CheckoutInfo/components/CustomerInfoForm/CustomerInfoForm.module.scss index f8bfbe11f..863a716b8 100644 --- a/src/components/modules/checkout/CheckoutInfo/components/CustomerInfoForm/CustomerInfoForm.module.scss +++ b/src/components/modules/checkout/CheckoutInfo/components/CustomerInfoForm/CustomerInfoForm.module.scss @@ -2,7 +2,10 @@ .warpper{ @apply u-form; @screen md { - padding: 0 5.6rem; + padding-left: 5.6rem; + .button { + min-width: 22rem; + } } .bottom{ margin-top: 2.4rem; diff --git a/src/components/modules/checkout/CheckoutPage/CheckoutPage.module.scss b/src/components/modules/checkout/CheckoutPage/CheckoutPage.module.scss index 1661f243c..ec7b19dc2 100644 --- a/src/components/modules/checkout/CheckoutPage/CheckoutPage.module.scss +++ b/src/components/modules/checkout/CheckoutPage/CheckoutPage.module.scss @@ -1,7 +1,7 @@ @import "../../../../styles/utilities"; .warrper{ - @apply flex; - .right{ + @apply flex w-full h-full absolute; + .right { display: none; @screen lg { display: block; @@ -11,10 +11,10 @@ min-width: 56.3rem; } } - .left{ - @apply w-full; + .left { + @apply w-full border-r-2 border-solid border-line; } - .mobile{ + .mobile { @apply hidden; &.isShow{ @apply block; @@ -22,7 +22,7 @@ @apply hidden; } } - .modal{ + .modal { background: rgba(0, 0, 0, 0.5); position: fixed; left: 0;