From e64dc1408cf14a5d8ef86f166c8d7a14f6f87921 Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Wed, 12 May 2021 22:36:52 -0400
Subject: [PATCH] ISTWCMS-4835: fixing inverted l layouts
---
css/styles.css | 6 +-----
css/uw-dashboards.css | 6 +-----
source/_patterns/03-layouts/layout/_layout.twig | 12 ++++++++----
.../_layout--inverted-l-right.scss | 6 +-----
4 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/css/styles.css b/css/styles.css
index 03ef3c39..3e2784e5 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -2237,7 +2237,7 @@ svg:not(:root) {
grid-column: 1 / 2;
grid-row: 1 / 2; }
-.layout--uw-inverted-l-right .layout__region--first {
+.layout--uw-inverted-l-right .layout__region--second {
grid-column: 2 / 3;
grid-row: 1 / 2; }
@@ -2245,10 +2245,6 @@ svg:not(:root) {
grid-column: 1 / 3;
grid-row: 2 / 3; }
-.layout--uw-inverted-l-right .layout__region--fourth {
- grid-column: 3 / 4;
- grid-row: 1 / 3; }
-
.layout__region {
outline: 2px dashed #2f91da;
padding: 1.5rem;
diff --git a/css/uw-dashboards.css b/css/uw-dashboards.css
index 33151f11..c0c1afb8 100644
--- a/css/uw-dashboards.css
+++ b/css/uw-dashboards.css
@@ -658,7 +658,7 @@
grid-column: 1 / 2;
grid-row: 1 / 2; }
-.layout--uw-inverted-l-right .layout__region--first {
+.layout--uw-inverted-l-right .layout__region--second {
grid-column: 2 / 3;
grid-row: 1 / 2; }
@@ -666,10 +666,6 @@
grid-column: 1 / 3;
grid-row: 2 / 3; }
-.layout--uw-inverted-l-right .layout__region--fourth {
- grid-column: 3 / 4;
- grid-row: 1 / 3; }
-
.layout__region {
outline: 2px dashed #2f91da;
padding: 1.5rem;
diff --git a/source/_patterns/03-layouts/layout/_layout.twig b/source/_patterns/03-layouts/layout/_layout.twig
index c0683971..e89bbf2d 100644
--- a/source/_patterns/03-layouts/layout/_layout.twig
+++ b/source/_patterns/03-layouts/layout/_layout.twig
@@ -52,12 +52,16 @@
</div>
{% if inverted_l_left or inverted_l_right %}
- {% if inverted_l_left and loop.index == 1 or loop.index == 4 %}
- </div>
+ {% if inverted_l_left %}
+ {% if loop.index == 1 or loop.index == 4 %}
+ </div>
+ {% endif %}
{% endif %}
- {% if inverted_l_right and loop.index == 3 or loop.index == 4 %}
- </div>
+ {% if inverted_l_right %}
+ {% if loop.index == 3 or loop.index == 4 %}
+ </div>
+ {% endif %}
{% endif %}
{% endif %}
diff --git a/source/_patterns/03-layouts/layout/layout--inverted-l-right/_layout--inverted-l-right.scss b/source/_patterns/03-layouts/layout/layout--inverted-l-right/_layout--inverted-l-right.scss
index 8d0e3ae6..45998124 100644
--- a/source/_patterns/03-layouts/layout/layout--inverted-l-right/_layout--inverted-l-right.scss
+++ b/source/_patterns/03-layouts/layout/layout--inverted-l-right/_layout--inverted-l-right.scss
@@ -32,7 +32,7 @@
grid-row: 1 / 2;
}
- .layout__region--first {
+ .layout__region--second {
grid-column: 2 / 3;
grid-row: 1 / 2;
}
@@ -42,8 +42,4 @@
grid-row: 2 / 3;
}
- .layout__region--fourth {
- grid-column: 3 / 4;
- grid-row: 1 / 3;
- }
}
--
GitLab