diff --git a/css/styles.css b/css/styles.css index 03ef3c39908106afeb2dadb6711d6a6fa395538d..3e2784e52c8fff4967825c9a4670d782c9356bcc 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 33151f115c7481ed7473b681cb63bbc07a1c3ff6..c0c1afb8035defbfa99777a18709b86cd1bd5de8 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 c068397144dd82f607163855fe46ee8ad25c7db4..e89bbf2d8f632486bb959d992846de7d1cb82e47 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 8d0e3ae6b8e22543742d3c6d58c86efa8cb6a561..45998124f8fb7d2b1c346847bb1ead5f12d3a380 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; - } }