From 14b443976b0cf12f612afb6fe5c4dcf3d623b03f Mon Sep 17 00:00:00 2001 From: Christopher Dosin Date: Thu, 26 Nov 2020 10:30:08 +0200 Subject: [PATCH] Mobile columns (#9) * all columns full width on mobile * Updated composer version --- CHANGELOG.md | 3 +++ composer.json | 2 +- .../block/cms-block-grid-2-2-2-2-2-2.html.twig | 12 ++++++------ .../storefront/block/cms-block-grid-2-8-2.html.twig | 6 +++--- .../storefront/block/cms-block-grid-3-3-6.html.twig | 6 +++--- .../storefront/block/cms-block-grid-3-6-3.html.twig | 6 +++--- .../storefront/block/cms-block-grid-3-9.html.twig | 4 ++-- .../storefront/block/cms-block-grid-4-4-4.html.twig | 6 +++--- .../storefront/block/cms-block-grid-4-8.html.twig | 4 ++-- .../storefront/block/cms-block-grid-6-3-3.html.twig | 6 +++--- .../storefront/block/cms-block-grid-6-6.html.twig | 4 ++-- .../storefront/block/cms-block-grid-8-4.html.twig | 4 ++-- .../storefront/block/cms-block-grid-9-3.html.twig | 4 ++-- 13 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d294a49..8932454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.0.7 +- all columns on mobile are full width + # 1.0.6 - adjusted responsive columns of grid 3-3-3-3 diff --git a/composer.json b/composer.json index 7c61915..380ad12 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "sas/cms-grid-blocks", "description": "CMS grid blocks", "type": "shopware-platform-plugin", - "version": "v1.0.6", + "version": "v1.0.7", "license": "proprietary", "authors": [ { diff --git a/src/Resources/views/storefront/block/cms-block-grid-2-2-2-2-2-2.html.twig b/src/Resources/views/storefront/block/cms-block-grid-2-2-2-2-2-2.html.twig index 15bee2e..332c1a7 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-2-2-2-2-2-2.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-2-2-2-2-2-2.html.twig @@ -3,7 +3,7 @@ {% block block_grid_2_2_2_2_2_2_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_2_2_2_2_2_2_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_2_2_2_2_2_2_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_2_2_2_2_2_2_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_2_2_2_2_2_2_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_2_2_2_2_2_2_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -33,7 +33,7 @@ {% block block_grid_2_2_2_2_2_2_col_4 %} {% set element = block.slots.getSlot('col-4') %} -
+
{% block block_grid_2_2_2_2_2_2_col_4_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -43,7 +43,7 @@ {% block block_grid_2_2_2_2_2_2_col_5 %} {% set element = block.slots.getSlot('col-5') %} -
+
{% block block_grid_2_2_2_2_2_2_col_5_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -53,7 +53,7 @@ {% block block_grid_2_2_2_2_2_2_col_6 %} {% set element = block.slots.getSlot('col-6') %} -
+
{% block block_grid_2_2_2_2_2_2_col_6_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-2-8-2.html.twig b/src/Resources/views/storefront/block/cms-block-grid-2-8-2.html.twig index dc8930d..d74e54a 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-2-8-2.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-2-8-2.html.twig @@ -3,7 +3,7 @@ {% block block_grid_2_8_2_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_2_8_2_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_2_8_2_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_2_8_2_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_2_8_2_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_2_8_2_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-3-3-6.html.twig b/src/Resources/views/storefront/block/cms-block-grid-3-3-6.html.twig index ea0ba5f..db638c0 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-3-3-6.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-3-3-6.html.twig @@ -3,7 +3,7 @@ {% block block_grid_3_3_6_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_3_3_6_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_3_3_6_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_3_3_6_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_3_3_6_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_3_3_6_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-3-6-3.html.twig b/src/Resources/views/storefront/block/cms-block-grid-3-6-3.html.twig index 6333585..0c2a36e 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-3-6-3.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-3-6-3.html.twig @@ -3,7 +3,7 @@ {% block block_grid_3_6_3_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_3_6_3_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_3_6_3_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_3_6_3_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_3_6_3_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_2_8_2_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-3-9.html.twig b/src/Resources/views/storefront/block/cms-block-grid-3-9.html.twig index 57dc3d4..9fceb4a 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-3-9.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-3-9.html.twig @@ -3,7 +3,7 @@ {% block block_grid_3_9_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_3_9_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_3_9_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_3_9_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-4-4-4.html.twig b/src/Resources/views/storefront/block/cms-block-grid-4-4-4.html.twig index 9884b82..a175504 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-4-4-4.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-4-4-4.html.twig @@ -3,7 +3,7 @@ {% block block_grid_4_4_4_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_4_4_4_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_4_4_4_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_4_4_4_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_4_4_4_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_4_4_4_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-4-8.html.twig b/src/Resources/views/storefront/block/cms-block-grid-4-8.html.twig index 8877d9f..262b408 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-4-8.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-4-8.html.twig @@ -3,7 +3,7 @@ {% block block_grid_4_8_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_4_8_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_4_8_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_4_8_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-6-3-3.html.twig b/src/Resources/views/storefront/block/cms-block-grid-6-3-3.html.twig index 166502b..8f92e40 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-6-3-3.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-6-3-3.html.twig @@ -3,7 +3,7 @@ {% block block_grid_6_3_3_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_6_3_3_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_6_3_3_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_6_3_3_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -23,7 +23,7 @@ {% block block_grid_6_3_3_col_3 %} {% set element = block.slots.getSlot('col-3') %} -
+
{% block block_grid_6_3_3_col_3_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-6-6.html.twig b/src/Resources/views/storefront/block/cms-block-grid-6-6.html.twig index 1c97e02..29ed06f 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-6-6.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-6-6.html.twig @@ -3,7 +3,7 @@ {% block block_grid_6_6_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_6_6_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_6_6_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_6_6_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-8-4.html.twig b/src/Resources/views/storefront/block/cms-block-grid-8-4.html.twig index 17f2650..3d22819 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-8-4.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-8-4.html.twig @@ -3,7 +3,7 @@ {% block block_grid_8_4_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_8_4_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_8_4_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_8_4_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} diff --git a/src/Resources/views/storefront/block/cms-block-grid-9-3.html.twig b/src/Resources/views/storefront/block/cms-block-grid-9-3.html.twig index 776ac23..e1362b1 100644 --- a/src/Resources/views/storefront/block/cms-block-grid-9-3.html.twig +++ b/src/Resources/views/storefront/block/cms-block-grid-9-3.html.twig @@ -3,7 +3,7 @@ {% block block_grid_9_3_col_1 %} {% set element = block.slots.getSlot('col-1') %} -
+
{% block block_grid_9_3_col_1_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %} @@ -13,7 +13,7 @@ {% block block_grid_9_3_col_2 %} {% set element = block.slots.getSlot('col-2') %} -
+
{% block block_grid_9_3_col_2_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing %} {% endblock %}