🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

:%s

pages/index.tsx

@@ -1,6 +1,6 @@
 
-<<<<<<< HEAD
 import {  FeaturedProductCard, Layout, ProductCaroucel, RecipeCard } from 'src/components/common'
+import { HomeBanner, HomeCTA, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
 import image5 from "../public/assets/images/image5.png"
 import image6 from "../public/assets/images/image6.png"
 import image7 from "../public/assets/images/image7.png"
@@ -113,23 +113,17 @@ const recipe:RecipeCardProps[] = [{
   description:"The broth for Bun Bo Hue is prepared by slowly simmering various types of beef and pork bones (ox tail, beef shank, pork neck bones, pork feet,...",
   imageSrc: image14.src
 }]
-=======
-import { Layout } from 'src/components/common';
-import { HomeBanner, HomeCTA, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
+
 
 export default function Home() {
   return (
     <>
-<<<<<<< HEAD
       <CollectionCarcoucel data={dataTest} itemKey="product-1" title="VEGGIE" subTitle= "Last call! Shop deep deals on 100+ bulk picks while you can." />
       <HomeRecipe data={recipe}  itemKey="product-2" title="Special Recipes"/>
-=======
       <HomeBanner />
       <HomeVideo />
       <HomeCTA />
       <HomeSubscribe />
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
     </>
   )
 }

src/components/common/ButtonCommon/ButtonCommon.module.scss

@@ -65,14 +65,8 @@
   }
 
   &.ghost {
-<<<<<<< HEAD
-    @apply bg-white;
-    color: var(--text-active);
-    border: 1px solid var(--text-active);
-=======
     @apply bg-white text-primary;
     border: 1px solid var(--primary);
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
     &.loading {
       &::before {
         border-top-color: var(--text-active);

src/components/modules/home/index.ts

@@ -1,8 +1,5 @@
 export { default as HomeBanner } from './HomeBanner/HomeBanner'
-<<<<<<< HEAD
 export { default as CollectionCarcoucel } from './CollectionCarcoucel/CollectionCarcoucel'
-=======
 export { default as HomeCTA } from './HomeCTA/HomeCTA'
 export { default as HomeSubscribe } from './HomeSubscribe/HomeSubscribe'
 export { default as HomeVideo } from './HomeVideo/HomeVideo'
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d

tailwind.config.js

@@ -45,7 +45,6 @@ module.exports = {
         'negative-border-line': 'var(--negative-border-line)',
         'negative-light': 'var(--negative-light)',
 
-<<<<<<< HEAD
         'line': 'var(--border-line)',
         'background': 'var(--background)',
         'white': 'var(--white)',
@@ -54,8 +53,6 @@ module.exports = {
 
         
         'disabled': 'var(--text-disabled)',
-=======
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
         line: 'var(--border-line)',
         background: 'var(--background)',
         white: 'var(--white)',