From dc89778e4d113a00756c787a2e7699dd208916de Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Thu, 17 Mar 2022 16:31:29 +0100 Subject: [PATCH] check --- .../component/checkout/offcanvas-item.html.twig | 4 ++-- .../storefront/page/checkout/checkout-item.html.twig | 4 ++-- zenitPlatformAtmosSet2/composer.json | 10 +++++----- .../app/storefront/src/scss/layout/_footer.scss | 11 ++++++++++- .../component/checkout/offcanvas-item.html.twig | 2 +- .../storefront/page/checkout/checkout-item.html.twig | 4 ++-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig index 2ae9e0a..0313d5f 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig @@ -48,9 +48,9 @@ {% if lineItem.payload is defined and lineItem.payload.customFields is defined and lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %}
- {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} + {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} + {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig index ae39185..b9ac529 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig @@ -41,9 +41,9 @@ {% if lineItem.payload is defined and lineItem.payload.customFields is defined and lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %}
- {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} + {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} + {{ "checkout.diaekoItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet2/composer.json b/zenitPlatformAtmosSet2/composer.json index 176c871..28ed516 100644 --- a/zenitPlatformAtmosSet2/composer.json +++ b/zenitPlatformAtmosSet2/composer.json @@ -1,7 +1,7 @@ { "name": "zenit/atmos-set-2", "description": "Theme Atmos by Zenit Design", - "version": "2.4.1", + "version": "2.4.2", "type": "shopware-platform-plugin", "license": "proprietary", "authors": [ @@ -20,12 +20,12 @@ "plugin-icon": "src/Resources/config/plugin.png", "copyright": "(c) by Zenit Design", "label": { - "de-DE": "Theme Atmos | Pro - Set 2", - "en-GB": "Theme Atmos | Pro - Set 2" + "de-DE": "Theme Atmos | Pro - Set 2 Easyfit", + "en-GB": "Theme Atmos | Pro - Set 2 Easyfit" }, "description": { - "de-DE": "Theme Atmos | Pro - Set 2", - "en-GB": "Theme Atmos | Pro - Set 2" + "de-DE": "Theme Atmos | Pro - Set 2 Easyfit", + "en-GB": "Theme Atmos | Pro - Set 2 Easyfit" }, "manufacturerLink": { "de-DE": "https://store.shopware.com/zenit-design.html", diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss index d7a9bc1..69be2ca 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -9,18 +9,27 @@ } .footer-newsletter { + .footer-logo { + max-width: 170px; + } .newsletter-inner-text { font-size: 18px; line-height: 24px; } .footer-newsletter-column-input-email { - border-bottom: 2px solid $sw-color-brand-primary; + border-bottom: 2px solid #FFF; margin: 0 15px; padding: 0; } .form-control, .input-group-append .btn { border: none; + .icon { + color: #FFF; + } + } + .form-control::-webkit-input-placeholder { + color: #FFF; } .form-control { padding-top: 0; diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig index e50b78a..72392b9 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig @@ -50,7 +50,7 @@
{{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig index 666bf71..45964d5 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig @@ -41,9 +41,9 @@ {% if lineItem.payload is defined and lineItem.payload.customFields is defined and lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %}
- {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %}