diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig index d33e9d0..1f0ed1c 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/card/price-unit.html.twig @@ -43,7 +43,7 @@ {% if (product.customFields.custom_weightlossplan_day5_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} {% if (product.customFields.custom_weightlossplan_day6_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} {% if weekProductCount >= 1 %} - {{ (price.unitPrice / weekProductCount) | json_encode() | round(2) | replace({'.': ','}) }} € pro Tag + {{ (price.unitPrice / weekProductCount) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Tag {% endif %} {% if product.translated.customFields.deposittype %} diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js index 7907302..d11beb4 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js @@ -35,13 +35,15 @@ $(document).ready(function() { changeDelivery(fp); } - var sticky = $(".thumbnail-container"), - parentContainer = sticky.parents(".aku-cms-factory-element"), - stickyTop = sticky.offset().top; - tagBar(sticky, parentContainer, stickyTop); - $(window).on('resize scroll', function() { + var sticky = $(".thumbnail-container"); + if (sticky.length) { + var parentContainer = sticky.parents(".aku-cms-factory-element"), + stickyTop = sticky.offset().top; tagBar(sticky, parentContainer, stickyTop); - }); + $(window).on('resize scroll', function () { + tagBar(sticky, parentContainer, stickyTop); + }); + } }); function manipulateDateInputValue() { diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss index 2b2d2ff..deac2e5 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss @@ -6,6 +6,12 @@ border: none; } +.card { + .product-rating { + display: none; + } +} + .cart-table-header { color: #222; } 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 374adaa..d68ce56 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 @@ -79,9 +79,8 @@ border-bottom: 1px solid #86b04b; } .product-detail-name { - font-size: 60px; - line-height: 54px; - color: $sw-color-brand-primary; + color: $sw-color-brand-secondary; + line-height: 40px !important; } .product-detail-price { color: $sw-color-brand-primary; diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_review.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_review.scss index 9ab2fa4..24c2f4d 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_review.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_review.scss @@ -1,12 +1,22 @@ -.point-rating { - &.point-blank { - .icon { - color: #B1C3D9; - } - } - &.point-full { - .icon { - color: #B61F34; - } +.product-detail-reviews { + display: block; + .product-detail-reviews-link { + color: $sw-color-brand-secondary; + text-decoration: underline; + &:hover { + text-decoration: none; } + } + .point-rating { + &.point-blank { + .icon { + color: #C9DEB0; + } + } + &.point-full { + .icon { + color: $sw-color-brand-secondary; + } + } + } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig index 97ebf80..ae9944a 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/price-unit.html.twig @@ -43,7 +43,7 @@ {% if (product.customFields.custom_weightlossplan_day5_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} {% if (product.customFields.custom_weightlossplan_day6_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} {% if weekProductCount >= 1 %} - {{ (price.unitPrice / (weekProductCount * 2)) | json_encode() | round(2) | replace({'.': ','}) }} € pro Mahlzeit + {{ (price.unitPrice / (weekProductCount * 2)) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Mahlzeit {% endif %} {% if product.translated.customFields.deposittype %}