From c1be057c0ff5d7ec4b4aa99fb54d642dd19cb7b2 Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 26 Jun 2019 16:59:23 +0200 Subject: [PATCH 1/2] Fix lateral scroll scroll issue --- assets/components/base.scss | 3 +++ assets/components/molecules/search/search.scss | 10 ---------- assets/components/site.scss | 13 +++++++++++++ 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 assets/components/site.scss diff --git a/assets/components/base.scss b/assets/components/base.scss index d2fbc1a63..5d8ffe1a1 100644 --- a/assets/components/base.scss +++ b/assets/components/base.scss @@ -12,6 +12,9 @@ @import '../config/wordpress'; @import '../../node_modules/tablesaw/src/tables.stack-mixin.scss'; +// site: +@import './site.scss'; + // Don't edit the following sections, they should always be preceded by a blank // line and have exactly those names for the `$ yo toolbox:generate` command // to work diff --git a/assets/components/molecules/search/search.scss b/assets/components/molecules/search/search.scss index 1477ff7cb..d6864392e 100644 --- a/assets/components/molecules/search/search.scss +++ b/assets/components/molecules/search/search.scss @@ -88,13 +88,3 @@ } } } - -.site { - position: relative; - top: 0; - transition: top .3s ease-in-out; - - .search-open & { - top: $mm-lang-height; - } -} \ No newline at end of file diff --git a/assets/components/site.scss b/assets/components/site.scss new file mode 100644 index 000000000..ebc21ba4a --- /dev/null +++ b/assets/components/site.scss @@ -0,0 +1,13 @@ +body { + overflow-x: hidden; +} + +.site { + position: relative; + top: 0; + transition: top .3s ease-in-out; + + .search-open & { + top: $mm-lang-height; + } +} \ No newline at end of file From cc33234601f05aa8fb3d5f2fe06c6129e46c6ae1 Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 26 Jun 2019 17:24:55 +0200 Subject: [PATCH 2/2] Fix display of social media feeds for smaller screens --- .../social-feed-group/social-feed-group.scss | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/assets/components/organisms/social-feed-group/social-feed-group.scss b/assets/components/organisms/social-feed-group/social-feed-group.scss index 541ae7a0f..cc337d23a 100644 --- a/assets/components/organisms/social-feed-group/social-feed-group.scss +++ b/assets/components/organisms/social-feed-group/social-feed-group.scss @@ -1,12 +1,20 @@ @charset 'utf-8'; .social-feed-group { + margin-left: -16px; + margin-right: -16px; padding: 4rem 0; + + .social-feed { + padding-left: 0; + padding-right: 0; + } - @include media-breakpoint-up(lg) { + @include media-breakpoint-up(xl) { display: flex; flex-flow: row nowrap; align-items: stretch; + margin: 0; padding: 2rem 0; .social-feed-container { @@ -19,6 +27,7 @@ .social-feed { height: 100%; + padding: 2.2rem 1.5rem 1.5rem; } &:first-child { @@ -33,17 +42,18 @@ } .social-feed-container { + align-items: center; display: flex; flex-flow: column nowrap; - @include media-breakpoint-up(lg) { + @include media-breakpoint-up(xl) { flex-flow: row nowrap; } .social-feed { margin-bottom: 3rem; - @include media-breakpoint-up(lg) { + @include media-breakpoint-up(xl) { margin-bottom: 0; height: 100%; }