diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
index 83be6e1..4c76bcf 100644
--- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
+++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
@@ -1,10 +1,23 @@
.is-act-cartpage {
+ .cart-add-product-container {
+ @media (min-width: 768px) {
+ max-width: 50%;
+ flex: 0 0 50%;
+ }
+ .cart-add-product {
+ max-width: 100%;
+ .btn-secondary {
+ background-color: $sw-color-brand-primary;
+ border-color: $sw-color-brand-primary;
+ }
+ }
+ }
.checkout {
.cart-item {
&.is-discount {
.cart-item-remove {
form {
- display: none;
+ display: none;
}
}
}
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
index c2abca5..d82969d 100644
--- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
+++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
@@ -11,6 +11,20 @@
} %}
{% block zen_page_product_detail_custom_field_global_content %}
+ {% if page.product.translated.customFields.custom_ingredients_content|length > 0 %}
+
+
{{ "customFields.custom_ingredients_content"|trans }}:
+ {{ page.product.translated.customFields.custom_ingredients_content|raw }}
+
+ {% block page_product_detail_description_content_properties %}
+
+ {% if page.product.sortedProperties|length > 0 %}
+ {% sw_include '@Storefront/storefront/page/product-detail/properties.html.twig' %}
+ {% endif %}
+
+ {% endblock %}
+
+ {% endif %}
{% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %}
{{ "customFields.custom_nutrition"|trans }} pro 100 {% if (page.product.unit.name == "kg") or (page.product.unit.name == "g") %}g{% elseif page.product.unit.name == "Liter" %}ml{% endif %}:
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss
index a7c1e61..11921fd 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss
@@ -71,7 +71,7 @@
}
}
}
-.is-lo-full-width .container {
+.header-inner .container {
max-width: 1120px;
}
.nav-header>.container {
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
index 4b875df..c3b084f 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/checkout/_cart.scss
@@ -1,4 +1,17 @@
.is-act-cartpage {
+ .cart-add-product-container {
+ @media (min-width: 768px) {
+ max-width: 50%;
+ flex: 0 0 50%;
+ }
+ .cart-add-product {
+ max-width: 100%;
+ .btn-secondary {
+ background-color: $sw-color-brand-primary;
+ border-color: $sw-color-brand-primary;
+ }
+ }
+ }
.checkout {
.cart-item {
&.is-discount {
diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
index 5406d18..29ad244 100644
--- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
+++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss
@@ -1,4 +1,10 @@
.is-ctl-product {
+ .cms-page {
+ @media (min-width: 992px) {
+ padding-left: 36px;
+ padding-right: 36px;
+ }
+ }
.product-detail-media {
padding-right: 40px;
.gallery-slider-image {
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
index c2abca5..d82969d 100644
--- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
+++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig
@@ -11,6 +11,20 @@
} %}
{% block zen_page_product_detail_custom_field_global_content %}
+ {% if page.product.translated.customFields.custom_ingredients_content|length > 0 %}
+
+
{{ "customFields.custom_ingredients_content"|trans }}:
+ {{ page.product.translated.customFields.custom_ingredients_content|raw }}
+
+ {% block page_product_detail_description_content_properties %}
+
+ {% if page.product.sortedProperties|length > 0 %}
+ {% sw_include '@Storefront/storefront/page/product-detail/properties.html.twig' %}
+ {% endif %}
+
+ {% endblock %}
+
+ {% endif %}
{% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %}
{{ "customFields.custom_nutrition"|trans }} pro 100 {% if (page.product.unit.name == "kg") or (page.product.unit.name == "g") %}g{% elseif page.product.unit.name == "Liter" %}ml{% endif %}: