From 775b82c4a616c2b2f8bd8d770a447d0fd77e899a Mon Sep 17 00:00:00 2001
From: ebremner <ebremner@uwaterloo.ca>
Date: Thu, 4 Feb 2021 15:09:46 -0500
Subject: [PATCH] ISTWCMS-4489: changing custom layouts to not use extra
wrapper class so that layout builder drag and drop works
---
layouts/uw-1-col/layout--uw-1-col.html.twig | 4 ----
layouts/uw-2-col/layout--uw-2-col.html.twig | 8 ++------
layouts/uw-3-col/layout--uw-3-col.html.twig | 12 +++--------
layouts/uw-4-col/layout--uw-4-col.html.twig | 16 ++++-----------
layouts/uw-5-col/layout--uw-5-col.html.twig | 20 +++++--------------
.../layout--uw-inverted-l-left.html.twig | 16 ++++-----------
.../layout--uw-inverted-l-right.html.twig | 16 ++++-----------
7 files changed, 22 insertions(+), 70 deletions(-)
diff --git a/layouts/uw-1-col/layout--uw-1-col.html.twig b/layouts/uw-1-col/layout--uw-1-col.html.twig
index 2e66e82b..dec62b58 100644
--- a/layouts/uw-1-col/layout--uw-1-col.html.twig
+++ b/layouts/uw-1-col/layout--uw-1-col.html.twig
@@ -7,11 +7,7 @@
%}
<section{{ attributes.addClass(classes) }}>
-
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
{{ content.first }}
- </div>
</div>
-
</section>
diff --git a/layouts/uw-2-col/layout--uw-2-col.html.twig b/layouts/uw-2-col/layout--uw-2-col.html.twig
index d940ff06..2ea47398 100644
--- a/layouts/uw-2-col/layout--uw-2-col.html.twig
+++ b/layouts/uw-2-col/layout--uw-2-col.html.twig
@@ -9,15 +9,11 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
</section>
diff --git a/layouts/uw-3-col/layout--uw-3-col.html.twig b/layouts/uw-3-col/layout--uw-3-col.html.twig
index 81aae1af..e3874ab3 100644
--- a/layouts/uw-3-col/layout--uw-3-col.html.twig
+++ b/layouts/uw-3-col/layout--uw-3-col.html.twig
@@ -9,21 +9,15 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
- <div class="layout__region--wrapper">
- {{ content.third }}
- </div>
+ {{ content.third }}
</div>
</section>
diff --git a/layouts/uw-4-col/layout--uw-4-col.html.twig b/layouts/uw-4-col/layout--uw-4-col.html.twig
index dfc2dabd..d98de7c1 100644
--- a/layouts/uw-4-col/layout--uw-4-col.html.twig
+++ b/layouts/uw-4-col/layout--uw-4-col.html.twig
@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
- <div class="layout__region--wrapper">
- {{ content.third }}
- </div>
+ {{ content.third }}
</div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
- <div class="layout__region--wrapper">
- {{ content.fourth }}
- </div>
+ {{ content.fourth }}
</div>
</section>
diff --git a/layouts/uw-5-col/layout--uw-5-col.html.twig b/layouts/uw-5-col/layout--uw-5-col.html.twig
index 69e3be2f..13f0fadf 100644
--- a/layouts/uw-5-col/layout--uw-5-col.html.twig
+++ b/layouts/uw-5-col/layout--uw-5-col.html.twig
@@ -9,33 +9,23 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
- <div class="layout__region--wrapper">
- {{ content.third }}
- </div>
+ {{ content.third }}
</div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.fifth.addClass('layout__region', 'layout__region--fifth') }}>
- <div class="layout__region--wrapper">
- {{ content.fifth }}
- </div>
+ {{ content.fifth }}
</div>
</section>
diff --git a/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig b/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
index efc824c4..b6cc5fca 100644
--- a/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
+++ b/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
- <div class="layout__region--wrapper">
- {{ content.third }}
- </div>
+ {{ content.third }}
</div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
- <div class="layout__region--wrapper">
- {{ content.fourth }}
- </div>
+ {{ content.fourth }}
</div>
</section>
diff --git a/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig b/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
index 50e6bca8..ef5e9c7a 100644
--- a/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
+++ b/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
- <div class="layout__region--wrapper">
- {{ content.first }}
- </div>
+ {{ content.first }}
</div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
- <div class="layout__region--wrapper">
- {{ content.second }}
- </div>
+ {{ content.second }}
</div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
- <div class="layout__region--wrapper">
- {{ content.third }}
- </div>
+ {{ content.third }}
</div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
- <div class="layout__region--wrapper">
- {{ content.fourth }}
- </div>
+ {{ content.fourth }}
</div>
</section>
--
GitLab