From a5824dbbad016d75871811d831e2b677cfcb0cdb Mon Sep 17 00:00:00 2001
From: Kevin Paxman <kpaxman@uwaterloo.ca>
Date: Fri, 17 Mar 2023 11:07:56 -0400
Subject: [PATCH] ISTWCMS-5898: fix spacing not showing when there was no
section separator, along with layout builder issues
---
src/patterns/03-layouts/layout/_layout.scss | 27 +++++++--------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/patterns/03-layouts/layout/_layout.scss b/src/patterns/03-layouts/layout/_layout.scss
index 1a3a3c93..a58a2a0f 100644
--- a/src/patterns/03-layouts/layout/_layout.scss
+++ b/src/patterns/03-layouts/layout/_layout.scss
@@ -10,33 +10,25 @@
&--75 {
--section-margin: calc(var(--base-section-margin) * 0.75);
&.layout {
+ margin-bottom: var(--section-margin);
+ padding-bottom: var(--section-margin);
&.card__media {
margin-bottom: 0 !important;
}
- &.uw-section-separator--bottom:not(.is-layout-builder-highlighted) {
- margin-bottom: var(--section-margin);
- padding-bottom: var(--section-margin);
- }
}
}
&--50 {
--section-margin: calc(var(--base-section-margin) * 0.5);
&.layout {
margin-bottom: var(--section-margin);
- &.uw-section-separator--bottom:not(.is-layout-builder-highlighted) {
- margin-bottom: var(--section-margin);
- padding-bottom: var(--section-margin);
- }
+ padding-bottom: var(--section-margin);
}
}
&--25 {
--section-margin: calc(var(--base-section-margin) * 0.25);
&.layout {
margin-bottom: var(--section-margin);
- &.uw-section-separator--bottom:not(.is-layout-builder-highlighted) {
- margin-bottom: var(--section-margin);
- padding-bottom: var(--section-margin);
- }
+ padding-bottom: var(--section-margin);
}
}
&--none {
@@ -48,11 +40,9 @@
}
&--default {
--section-margin: var(--base-section-margin);
- &.layout{
- &.uw-section-separator--bottom:not(.is-layout-builder-highlighted) {
- margin-bottom: var(--section-margin);
- padding-bottom: var(--section-margin);
- }
+ &.layout {
+ margin-bottom: var(--section-margin);
+ padding-bottom: var(--section-margin);
}
}
&.layout {
@@ -87,13 +77,13 @@
}
}
}
-
.layout {
--layout-border-width: var(--size-xs);
@include uw-contained-width(var(--layout-max-width-narrow));
@media(min-width: $screen-xl) {
@include uw-contained-width(var(--layout-max-width));
}
+ padding-top: var(--size-2);
// Set default spacing to match old block spacing if no classes
&:not(.uw-section-spacing--default, .uw-section-spacing--none, .uw-section-spacing--75, .uw-section-spacing--50, .uw-section-spacing--25) {
margin-bottom: var(--section-margin);
@@ -154,6 +144,7 @@
.layout-builder__region {
padding: var(--size-1) 0 0;
}
+
&.layout--uw-1-col{
.block-inline-blockuw-cbl-banner-images,
.block-inline-blockuw-cbl-image,
--
GitLab