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

@@ -6,7 +6,7 @@
padding: 20px 20px 24px;
@include bp (sm) {
padding: 24px 32px 0 32px;
padding: 24px 32px;
}
// Heading
@@ -148,4 +148,4 @@
height: 100%;
background: rgba($color-primary, 0.9);
}
}
}