crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-22 12:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: fix conflict

Browse Source
This commit is contained in:
unknown
2021-09-08 21:24:48 +07:00
parent 7a01eb1ef5
commit 0699b0dfd7
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/common/BreadcrumbCommon/BreadcrumbCommon.module.scss
View File

@@ -2,10 +2,7 @@
.breadcrumbCommon { .breadcrumbCommon {
color: var(--text-base); color: var(--text-base);
<<<<<<< HEAD
=======
.currentItem { .currentItem {
cursor: default; cursor: default;
} }
>>>>>>> a9f9f06eb9dee2a1ddefe907ff804237a78c5210
} }

4
src/components/common/Layout/Layout.tsx
View File

@@ -2,7 +2,6 @@ import { CommerceProvider } from '@framework'
import { useRouter } from 'next/router' import { useRouter } from 'next/router'
import { FC } from 'react' import { FC } from 'react'
import { useModalCommon } from 'src/components/hooks' import { useModalCommon } from 'src/components/hooks'
import { CartDrawer } from '..'
import Footer from '../Footer/Footer' import Footer from '../Footer/Footer'
import Header from '../Header/Header' import Header from '../Header/Header'
import s from './Layout.module.scss' import s from './Layout.module.scss'
@@ -30,9 +29,6 @@ const Layout: FC<Props> = ({ children }) => {
<Header /> <Header />
<main >{children}</main> <main >{children}</main>
<button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button> <button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button>
<CartDrawer
visible={visibleCartDrawer}
onClose={closeCartDrawer} />
<Footer /> <Footer />
</div> </div>
</CommerceProvider> </CommerceProvider>