From 68b3f65dd3e0b781deba69a773f3b928132c3752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= Date: Mon, 11 Jul 2022 21:41:28 +0200 Subject: [PATCH] Fix responsive issues globally --- src/routes/locations.svelte | 10 +++++----- src/style/layout/_modules.scss | 19 ++++++++++++------- src/style/layouts/_poster.scss | 3 +-- src/style/molecules/_poster.scss | 10 +++++----- src/style/pages/_explore.scss | 11 +++++++++-- src/style/pages/_photos.scss | 13 ++++++++++++- src/style/pages/shop/_posters.scss | 1 + 7 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/routes/locations.svelte b/src/routes/locations.svelte index 890e0d4..016756b 100644 --- a/src/routes/locations.svelte +++ b/src/routes/locations.svelte @@ -32,10 +32,10 @@ -
-
- - -
+
+
+ + +
\ No newline at end of file diff --git a/src/style/layout/_modules.scss b/src/style/layout/_modules.scss index 2c679f7..3f4c168 100644 --- a/src/style/layout/_modules.scss +++ b/src/style/layout/_modules.scss @@ -6,19 +6,17 @@ } .wrap { - @include bp (sd) { - display: grid; - } - display: block; grid-column: span var(--columns); - grid-template-columns: 1fr 40%; - grid-column-gap: clamp(32px, 2.5vw, 48px); - padding: 0; @include bp (sm) { + display: grid; grid-column: 2 / span 22; } + @include bp (sd) { + grid-template-columns: 1fr 40%; + grid-column-gap: clamp(32px, 2.5vw, 48px); + } & > *:first-child { @include bp (sd, max) { @@ -32,4 +30,11 @@ margin-bottom: 0; } } + + // With padding + &.is-spaced { + @include bp (sm, max) { + padding: 0 16px; + } + } } \ No newline at end of file diff --git a/src/style/layouts/_poster.scss b/src/style/layouts/_poster.scss index 148899f..e6246d1 100644 --- a/src/style/layouts/_poster.scss +++ b/src/style/layouts/_poster.scss @@ -14,7 +14,7 @@ margin: clamp(72px, 24vw, 180px) 0 clamp(56px, 24vw, 120px); @include bp (sm) { - margin: clamp(112px, 10vw, 200px) 0 clamp(88px, 10vw, 120px); + margin: clamp(112px, 10vw, 200px) 0 clamp(64px, 8vw, 88px); } } :global(h2) { @@ -30,7 +30,6 @@ } @include bp (sm) { grid-column: 2 / span calc(var(--columns) - 1); - margin-bottom: 88px; font-size: clamp(200px, 20vw, 340px); } } diff --git a/src/style/molecules/_poster.scss b/src/style/molecules/_poster.scss index 12803a4..282d78a 100644 --- a/src/style/molecules/_poster.scss +++ b/src/style/molecules/_poster.scss @@ -50,14 +50,14 @@ } & > :global(*) { - background: none; - font-size: rem(14px); - font-weight: 300; - color: $color-tertiary; padding: 0; + font-size: rem(14px); + font-weight: 400; + color: $color-tertiary; + background: none; &:first-child { - margin-right: 12px; + margin-right: 16px; &:hover { background: none; diff --git a/src/style/pages/_explore.scss b/src/style/pages/_explore.scss index 65dc4be..e635640 100644 --- a/src/style/pages/_explore.scss +++ b/src/style/pages/_explore.scss @@ -1,3 +1,10 @@ // Explore Page -// .explore { -// } \ No newline at end of file +:global(.explore) { + overflow: hidden; + + &__locations { + @include bp (sm, max) { + margin-top: 72px; + } + } +} \ No newline at end of file diff --git a/src/style/pages/_photos.scss b/src/style/pages/_photos.scss index 54e101b..6908879 100644 --- a/src/style/pages/_photos.scss +++ b/src/style/pages/_photos.scss @@ -79,6 +79,14 @@ } } + // Container + .container { + @include bp (sm, max) { + padding-left: 0; + padding-right: 0; + } + } + // Modules :global(.grid-modules) { grid-column: span var(--columns); @@ -490,6 +498,8 @@ // See More Photos :global(.button) { grid-column: span var(--columns); + padding-left: 24px; + padding-right: 24px; grid-row: 1; margin: 0 auto; @@ -506,6 +516,8 @@ grid-column: span var(--columns); grid-row: 3; text-align: center; + display: flex; + align-items: baseline; color: rgba($color-text, 0.3); font-family: $font-serif; font-size: rem(64px); @@ -525,7 +537,6 @@ span { display: inline-block; - margin: 0 -6px; &:last-child { margin-right: 0; diff --git a/src/style/pages/shop/_posters.scss b/src/style/pages/shop/_posters.scss index f92cf59..fece985 100644 --- a/src/style/pages/shop/_posters.scss +++ b/src/style/pages/shop/_posters.scss @@ -2,6 +2,7 @@ ** Shop: Posters */ .shop-page__posters { + overflow: hidden; padding: clamp(56px, 10vw, 120px) 20px 72px; background: $color-primary-darker; border-bottom: solid 1px $color-primary-tertiary20 ;