From 0cc1585953265b99f100ae806296ecb0f668bae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Sat, 2 Oct 2021 13:22:17 +0200 Subject: [PATCH] Fix Modules styling and layout --- src/style/layout/_modules.scss | 4 +++- src/style/organisms/_newsletter.scss | 18 +++++++++--------- src/style/organisms/_shop.scss | 1 - 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/style/layout/_modules.scss b/src/style/layout/_modules.scss index 0629be3..835950b 100644 --- a/src/style/layout/_modules.scss +++ b/src/style/layout/_modules.scss @@ -13,7 +13,9 @@ padding: 0; & > *:first-child { - margin-bottom: 32px; + @include bp (sd, max) { + margin-bottom: 32px; + } } &:last-child { margin-bottom: 0; diff --git a/src/style/organisms/_newsletter.scss b/src/style/organisms/_newsletter.scss index 077a5b1..285e7fb 100644 --- a/src/style/organisms/_newsletter.scss +++ b/src/style/organisms/_newsletter.scss @@ -1,14 +1,18 @@ .newsletter { + padding: 40px 40px 48px; + border-radius: 12px; + + @include bp (sd) { + padding: 64px 60px 72px; + } + &__wrapper { --columns: 20; grid-column: 3 / span var(--columns); - padding: 40px 40px 48px; - border-radius: 12px; @include bp (sd) { --columns: 18; grid-column: 4 / span var(--columns); - padding: 64px 60px 72px; } } @@ -97,14 +101,10 @@ // Variants // Default color &--default { - .newsletter__wrapper { - background-color: $color-tertiary; - } + background-color: $color-tertiary; } // Light &--light { - .newsletter__wrapper { - background-color: $color-cream; - } + background-color: $color-cream; } } \ No newline at end of file diff --git a/src/style/organisms/_shop.scss b/src/style/organisms/_shop.scss index 226de1b..99bcb07 100644 --- a/src/style/organisms/_shop.scss +++ b/src/style/organisms/_shop.scss @@ -8,7 +8,6 @@ display: grid; grid-template-columns: 40% 1fr; grid-template-rows: 1fr; - // grid-auto-rows: minmax(min-content, max-content); height: 100%; }