From dc11cd28ad88bd1b6681f234aa479e8e978898bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Sun, 3 Oct 2021 12:42:25 +0200 Subject: [PATCH] Fix some styles --- src/style/_typography.scss | 30 +++++++++++++++++++++------- src/style/atoms/_badge.scss | 16 +++++++-------- src/style/organisms/_newsletter.scss | 3 ++- src/style/organisms/_shop.scss | 4 ++-- src/style/pages/_homepage.scss | 6 +++++- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/style/_typography.scss b/src/style/_typography.scss index 856c210..82ea9d4 100644 --- a/src/style/_typography.scss +++ b/src/style/_typography.scss @@ -1,6 +1,6 @@ -// TYPOGRAPHY - -// Titles +/* ========================================================================== + TITLES +========================================================================== */ // Huge .title-huge { font-size: clamp(200px, 38vw, 700px); @@ -8,6 +8,7 @@ font-weight: 200; letter-spacing: -0.04em; } + // Medium .title-medium { font-family: $font-serif; @@ -26,13 +27,19 @@ } -// Texts + +/* ========================================================================== + TEXT +========================================================================== */ +// Large .text-large { font-size: rem(32px); font-family: $font-sans; font-weight: 400; line-height: 1.5; } + +// Medium .text-medium { font-size: rem(20px); font-family: $font-sans; @@ -44,16 +51,25 @@ line-height: 1.5; } } -.text-small { + +// Normal +.text-normal { font-size: rem(22px); font-weight: 400; line-height: 1.5; } +// Small +.text-small { + font-size: rem(20px); + font-weight: 400; + line-height: 1.5; +} + +// Label .text-label { font-size: rem(12px); line-height: 1.4; text-transform: uppercase; letter-spacing: 1px; -} - +} \ No newline at end of file diff --git a/src/style/atoms/_badge.scss b/src/style/atoms/_badge.scss index 490535f..38d5b97 100644 --- a/src/style/atoms/_badge.scss +++ b/src/style/atoms/_badge.scss @@ -1,21 +1,21 @@ .badge { display: flex; align-items: center; + justify-content: center; + min-height: 16px; margin: 0 auto; padding: 0 6px; - background-color: $color-secondary-light; - border-radius: 100vh; - text-transform: uppercase; - color: $color-primary-darker; + text-align: center; + background: $color-secondary-light; font-weight: 500; + text-transform: uppercase; letter-spacing: 1px; line-height: 1; - min-height: 16px; + color: $color-primary-darker; + border-radius: 100vh; // Small size &--small { - span { - font-size: rem(7px); - } + font-size: rem(7px); } } \ No newline at end of file diff --git a/src/style/organisms/_newsletter.scss b/src/style/organisms/_newsletter.scss index 285e7fb..6a40194 100644 --- a/src/style/organisms/_newsletter.scss +++ b/src/style/organisms/_newsletter.scss @@ -18,9 +18,10 @@ h3 { color: $color-secondary; + margin-bottom: 16px; } p { - margin: 12px 0 40px; + margin-bottom: 40px; color: $color-text; font-weight: 300; } diff --git a/src/style/organisms/_shop.scss b/src/style/organisms/_shop.scss index 99bcb07..fdb8750 100644 --- a/src/style/organisms/_shop.scss +++ b/src/style/organisms/_shop.scss @@ -42,12 +42,12 @@ // Title .title-medium { color: $color-lightpurple; - margin-bottom: 8px; + margin-bottom: 16px; } p { font-weight: 300; - margin-bottom: 28px; + margin-bottom: 24px; } .detail { diff --git a/src/style/pages/_homepage.scss b/src/style/pages/_homepage.scss index 23a1a66..f2b28e5 100644 --- a/src/style/pages/_homepage.scss +++ b/src/style/pages/_homepage.scss @@ -146,7 +146,11 @@ // CTAS &__ctas { text-align: center; - margin-bottom: 72px; + margin-bottom: 96px; + + @include bp (sm) { + margin-bottom: 160px; + } p { font-family: $font-sans;