mirror of
https://github.com/vercel/commerce.git
synced 2025-07-07 13:21:22 +00:00
Merge branch 'common' of https://github.com/KieIO/grocery-vercel-commerce into m2-quangnhan
This commit is contained in:
commit
18979cf33d
@ -1,7 +1,7 @@
|
|||||||
@import '../../../styles/utilities';
|
@import '../../../styles/utilities';
|
||||||
|
|
||||||
.headingCommon {
|
.headingCommon {
|
||||||
@apply heading-1 font-heading text-left;
|
@apply heading-2 font-heading text-left;
|
||||||
|
|
||||||
&.highlight {
|
&.highlight {
|
||||||
color: var(--negative);
|
color: var(--negative);
|
||||||
|
@ -11,11 +11,11 @@ interface HeadingCommonProps {
|
|||||||
const HeadingCommon = ({ type='default', align='left', children }: HeadingCommonProps) => {
|
const HeadingCommon = ({ type='default', align='left', children }: HeadingCommonProps) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<h1 className={classNames(s.headingCommon, {
|
<h2 className={classNames(s.headingCommon, {
|
||||||
[s[type]]: type,
|
[s[type]]: type,
|
||||||
[s[align]]: align
|
[s[align]]: align
|
||||||
})}
|
})}
|
||||||
>{children}</h1>
|
>{children}</h2>
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -7,12 +7,8 @@
|
|||||||
padding-top: 5.6rem;
|
padding-top: 5.6rem;
|
||||||
padding-bottom: 5.6rem;
|
padding-bottom: 5.6rem;
|
||||||
}
|
}
|
||||||
.heading {
|
|
||||||
@apply heading-2 font-heading;
|
|
||||||
color: var(--white);
|
|
||||||
margin-bottom: 2.4rem;
|
|
||||||
}
|
|
||||||
.sub {
|
.sub {
|
||||||
|
margin-top: 2.4rem;
|
||||||
color: var(--white);
|
color: var(--white);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
import { HeadingCommon } from 'src/components/common'
|
||||||
import FormSubscribe from './FormSubscribe/FormSubscribe'
|
import FormSubscribe from './FormSubscribe/FormSubscribe'
|
||||||
import s from './HomeSubscribe.module.scss'
|
import s from './HomeSubscribe.module.scss'
|
||||||
|
|
||||||
const HomeSubscribe = () => {
|
const HomeSubscribe = () => {
|
||||||
return (
|
return (
|
||||||
<section className={s.homeSubscribe}>
|
<section className={s.homeSubscribe}>
|
||||||
<h2 className={s.heading}>Let's stay in touch</h2>
|
<HeadingCommon type='light'>Let's stay in touch</HeadingCommon>
|
||||||
<div className={s.sub}>Subscribe to our newsletter for fresh news, seasonal arrivals and delicious recipes.</div>
|
<div className={s.sub}>Subscribe to our newsletter for fresh news, seasonal arrivals and delicious recipes.</div>
|
||||||
<FormSubscribe />
|
<FormSubscribe />
|
||||||
</section >
|
</section >
|
||||||
|
@ -39,9 +39,6 @@
|
|||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.heading {
|
|
||||||
@apply heading-2 font-heading;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.videoWrap {
|
.videoWrap {
|
||||||
@apply relative flex justify-center;
|
@apply relative flex justify-center;
|
||||||
|
@ -3,6 +3,7 @@ import React from 'react'
|
|||||||
import s from './HomeVideo.module.scss'
|
import s from './HomeVideo.module.scss'
|
||||||
import LogoBrand from './assets/logo_maggi.png'
|
import LogoBrand from './assets/logo_maggi.png'
|
||||||
import { VideoPlayer } from 'src/components/common'
|
import { VideoPlayer } from 'src/components/common'
|
||||||
|
import HeadingCommon from '../../../common/HeadingCommon/HeadingCommon'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className?: string
|
className?: string
|
||||||
@ -16,9 +17,9 @@ const HomeVideo = ({ }: Props) => {
|
|||||||
<div className={s.logo}>
|
<div className={s.logo}>
|
||||||
<Image src={LogoBrand} />
|
<Image src={LogoBrand} />
|
||||||
</div>
|
</div>
|
||||||
<h2 className={s.heading}>
|
<HeadingCommon>
|
||||||
Maggi Sauce Is The Secret Weapon For Making All Your Food
|
Maggi Sauce Is The Secret Weapon For Making All Your Food
|
||||||
</h2>
|
</HeadingCommon>
|
||||||
</div>
|
</div>
|
||||||
<div className={s.videoWrap}>
|
<div className={s.videoWrap}>
|
||||||
{/* todo: change url video */}
|
{/* todo: change url video */}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user