Skip to content
Snippets Groups Projects
Commit cb337fbc authored by Martin Leblanc's avatar Martin Leblanc
Browse files

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
parents f806d61c 775b82c4
No related branches found
No related tags found
1 merge request!41ISTWCMS-4489: changing custom layouts to not use extra wrapper class so that...
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 70 deletions
layouts/uw-1-col/layout--uw-1-col.html.twig
+ 0
− 4
View file @ cb337fbc
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
%} %}
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper">
{{ content.first }} {{ content.first }}
</div>
</div> </div>
</section> </section>
layouts/uw-2-col/layout--uw-2-col.html.twig
+ 2
− 6
View file @ cb337fbc
...@@ -9,15 +9,11 @@ ...@@ -9,15 +9,11 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
</section> </section>
layouts/uw-3-col/layout--uw-3-col.html.twig
+ 3
− 9
View file @ cb337fbc
...@@ -9,21 +9,15 @@ ...@@ -9,21 +9,15 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}> <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
<div class="layout__region--wrapper"> {{ content.third }}
{{ content.third }}
</div>
</div> </div>
</section> </section>
layouts/uw-4-col/layout--uw-4-col.html.twig
+ 4
− 12
View file @ cb337fbc
...@@ -9,27 +9,19 @@ ...@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}> <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
<div class="layout__region--wrapper"> {{ content.third }}
{{ content.third }}
</div>
</div> </div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}> <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
<div class="layout__region--wrapper"> {{ content.fourth }}
{{ content.fourth }}
</div>
</div> </div>
</section> </section>
layouts/uw-5-col/layout--uw-5-col.html.twig
+ 5
− 15
View file @ cb337fbc
...@@ -9,33 +9,23 @@ ...@@ -9,33 +9,23 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}> <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
<div class="layout__region--wrapper"> {{ content.third }}
{{ content.third }}
</div>
</div> </div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}> <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.fifth.addClass('layout__region', 'layout__region--fifth') }}> <div {{ region_attributes.fifth.addClass('layout__region', 'layout__region--fifth') }}>
<div class="layout__region--wrapper"> {{ content.fifth }}
{{ content.fifth }}
</div>
</div> </div>
</section> </section>
layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
+ 4
− 12
View file @ cb337fbc
...@@ -9,27 +9,19 @@ ...@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}> <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
<div class="layout__region--wrapper"> {{ content.third }}
{{ content.third }}
</div>
</div> </div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}> <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
<div class="layout__region--wrapper"> {{ content.fourth }}
{{ content.fourth }}
</div>
</div> </div>
</section> </section>
layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
+ 4
− 12
View file @ cb337fbc
...@@ -9,27 +9,19 @@ ...@@ -9,27 +9,19 @@
<section{{ attributes.addClass(classes) }}> <section{{ attributes.addClass(classes) }}>
<div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}> <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
<div class="layout__region--wrapper"> {{ content.first }}
{{ content.first }}
</div>
</div> </div>
<div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}> <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
<div class="layout__region--wrapper"> {{ content.second }}
{{ content.second }}
</div>
</div> </div>
<div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}> <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
<div class="layout__region--wrapper"> {{ content.third }}
{{ content.third }}
</div>
</div> </div>
<div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}> <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
<div class="layout__region--wrapper"> {{ content.fourth }}
{{ content.fourth }}
</div>
</div> </div>
</section> </section>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment