Merge branch 'feature/ISWCMS-4489-ebremner-layout-drag-n-drop' into '8.x-1.x'

ISTWCMS-4489: changing custom layouts to not use extra wrapper class so that...

See merge request !41

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>

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>

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>

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>

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>

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>

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>