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:
2021-11-07 12:07:18 +01:00
7 changed files with 130 additions and 9 deletions

View File

@@ -53,6 +53,7 @@
@import "molecules/issue";
@import "molecules/newsletter-form";
@import "molecules/poster";
@import "molecules/notification-cart";
@import "molecules/cart-item";
// Organisms
@@ -72,4 +73,4 @@
@import "pages/viewer-photo";
// Misc
@import "animations";
@import "animations";