Merge branch 'v2' into v2-shop
# Conflicts: # src/components/molecules/PosterCart.svelte # src/routes/shop/__layout.svelte # src/style/atoms/_button-circle.scss # src/style/organisms/_cart.scss # src/style/pages/_shop.scss # src/style/style.scss
This commit is contained in:
@@ -7,6 +7,7 @@
|
||||
import ButtonCart from '$components/atoms/ButtonCart.svelte'
|
||||
import PosterLayout from '$components/layouts/PosterLayout.svelte'
|
||||
import Poster from '$components/molecules/Poster.svelte'
|
||||
import NotificationCart from '$components/molecules/NotificationCart.svelte'
|
||||
import EmailForm from '$components/molecules/EmailForm.svelte'
|
||||
import Cart from '$components/organisms/Cart.svelte'
|
||||
|
||||
@@ -102,6 +103,10 @@
|
||||
</dl>
|
||||
|
||||
<ButtonCart />
|
||||
|
||||
<div class="shop-location__notifications">
|
||||
<NotificationCart />
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<section class="shop-page__about grid">
|
||||
@@ -221,4 +226,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user