diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss index 8b26f4d..4347328 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss @@ -1,5 +1,6 @@ @import 'layout/header'; @import 'layout/header-minimal'; +@import 'layout/container'; @import 'layout/footer'; @import 'component/card'; @import 'component/cms-block'; @@ -10,4 +11,5 @@ @import 'page/content/breadcrumb'; @import 'page/checkout/register'; @import 'page/checkout/cart'; -@import 'page/product-detail/product-detail'; \ No newline at end of file +@import 'page/product-detail/product-detail'; +@import 'page/product-detail/review'; \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_forms.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_forms.scss index 52ed438..37689d1 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_forms.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_forms.scss @@ -26,16 +26,7 @@ .custom-control-label { &:before { - top: 0; - width: 18px; - height: 18px; border: 2px solid $sw-color-brand-primary; - border-radius: 3px; - } - &:after { - top: 0; - width: 18px; - height: 18px; } a { color: #222; diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_product-box.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_product-box.scss index fe006e7..c2b882e 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_product-box.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_product-box.scss @@ -36,6 +36,12 @@ .product-cheapest-price { display: none; } + .filterIcon { + position: absolute; + width: 32px; + right: 15px; + bottom: 15px; + } } .cms-block.easyfit { diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss new file mode 100644 index 0000000..b0c079e --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss @@ -0,0 +1,37 @@ +body.is-act-home { + @include media-breakpoint-down(xs) { + .cms-section.bg-image { + background-position: center left; + } + } + @include media-breakpoint-up(sm) { + .content-main { + margin-left: -20px; + margin-right: -20px; + .cms-section-default.full-width { + padding-left: 5px; + padding-right: 5px; + } + } + } + @include media-breakpoint-up(md) { + .content-main { + margin-left: -40px; + margin-right: -40px; + .cms-section-default.full-width { + padding-left: 10px; + padding-right: 10px; + } + } + } + @include media-breakpoint-up(xl) { + .content-main { + margin-left: -80px; + margin-right: -80px; + .cms-section-default.full-width { + padding-left: 20px; + padding-right: 20px; + } + } + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header-minimal.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header-minimal.scss index bd176ad..49abf0b 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header-minimal.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header-minimal.scss @@ -1,3 +1,7 @@ +.header-minimal { + border-bottom: 1px solid #ACCD93; +} + @media (min-width: 768px) { .header-minimal-contact { span { 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 d9221a1..496ce5c 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -9,10 +9,23 @@ } } +.header-search { + border-bottom: 2px solid #222; + color: #222; + font-size: 18px; + line-height: 24px; + font-weight: 400; + .header-search-input::-webkit-input-placeholder { + color: #222; + } +} + @media (min-width: 992px) { .header-main .header-inner { padding-top: 15px; padding-bottom: 25px; + background: #fff; + border-bottom: 1px solid #ACCD93; } } @@ -71,7 +84,6 @@ font-size: 18px; font-weight: 500; letter-spacing: 0.5px; - line-height: 18px; padding: 0; .main-navigation-link-text { &:after { 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 1a134dc..dc92597 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 @@ -46,7 +46,7 @@ } .checkout-aside-container { - background-color: #E9F4FC; + background-color: #E8F4DF; padding-top: 1rem; padding-bottom: 2rem; a[data-toggle="modal"] { @@ -77,6 +77,7 @@ .form-control { font-size: 18px; padding-left: 0; + border-bottom: 0; &::-webkit-input-placeholder { 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 9cfc783..374adaa 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 @@ -73,8 +73,11 @@ } .product-detail-buy { border-radius: 3px; - background-color: #E9F4FC; + background-color: #e8f4df; padding-top: 40px; + .product-detail-short-description { + border-bottom: 1px solid #86b04b; + } .product-detail-name { font-size: 60px; line-height: 54px; 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 new file mode 100644 index 0000000..9ab2fa4 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_review.scss @@ -0,0 +1,12 @@ +.point-rating { + &.point-blank { + .icon { + color: #B1C3D9; + } + } + &.point-full { + .icon { + color: #B61F34; + } + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig index be10a7e..b318ec2 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig @@ -3,7 +3,7 @@ {% set element = block.slots.getSlot('left') %} {% set config = element.fieldConfig.elements %} -
+
{% block block_gallery_buybox_column_left_inner %} {% sw_include "@Storefront/storefront/element/cms-element-" ~ element.type ~ ".html.twig" ignore missing with { @@ -16,7 +16,7 @@ {% block block_gallery_buybox_column_right %} {% set element = block.slots.getSlot('right') %} -
+
{# ... add headline here #} {% block page_product_detail_headline %}
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig index 2f86555..5e7e007 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig @@ -22,11 +22,9 @@ {% sw_icon 'checkmark-circle' %}
{% if customizedProductsCount == 1 %} -

Ihr Paket wurde erfolgreich zum Warenkorb hinzugefügt – ein guter Start!

-

Wählen Sie bis zu 2 weitere Pläne für Ihr optimales Abnehmprogramm und sparen Sie ab 100 € Bestellsumme die Versandkosten.

+ {{ "checkout.easyfitProgramNoticeFirst"|trans|sw_sanitize }} {% elseif customizedProductsCount == 2 %} -

Ihr zweites Paket wurde zum Warenkorb hinzugefügt - Sie sparen die Versandkosten!

-

Wählen Sie ein weiteres Paket für Ihr optimales, mehrwöchiges Abnehmprogramm.

+ {{ "checkout.easyfitProgramNoticeSecond"|trans|sw_sanitize }} {% endif %}
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 e757fd6..e50b78a 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 @@ -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 %}
- Fügen Sie ein weiteres Paket hinzu für ihr optimales Abnehmprogramm + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - Fügen Sie einen weiteres Paket hinzu für ihr optimales Abnehmprogramm + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig index bc5e051..8dbb10d 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/card/box-standard.html.twig @@ -161,6 +161,131 @@ {% endif %} {% endif %} {% endblock %} + + {% block component_product_filter_icon %} + {% if product.customFields.custom_productteaser_filter_icon is defined %} +
+ {% if product.customFields.custom_productteaser_filter_icon == "fisch" %} + + + + + + + + {% endif %} + {% if product.customFields.custom_productteaser_filter_icon == "gefluegel" %} + + + + + {% endif %} + {% if product.customFields.custom_productteaser_filter_icon == "ohne_schwein" %} + + + + + + {% endif %} + {% if product.customFields.custom_productteaser_filter_icon == "vegetarisch" %} + + + + + {% endif %} +
+ {% endif %} + {% endblock %}
{% endblock %}
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 3a91cee..666bf71 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 %}
- Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% if addCustomizedProducts == 1 %} - Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + {{ "checkout.easyfitItemNotice"|trans|sw_sanitize }} {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig index 0363ab7..f6ae9a8 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/index.html.twig @@ -1,9 +1,50 @@ {% sw_extends '@Storefront/storefront/page/product-detail/index.html.twig' %} -{% block zen_page_product_detail_short_description %} - {% if page.product.customFields.custom_description_small_description and theme_config('zen-product-details-short-description') %} -
- {{ page.product.customFields.custom_description_small_description|trans|sw_sanitize }} -
- {% endif %} +{% block page_product_detail_media %} +
+ {% if page.product.media %} + {% sw_include '@Storefront/storefront/element/cms-element-image-gallery.html.twig' with { + 'mediaItems': mediaItems, + 'zoom': zoomConfig, + 'zoomModal': zoomModalConfig, + 'displayMode': displayModeConfig, + 'verticalAlign': verticalAlignConfig, + 'gutter': gutterConfig, + 'minHeight': minHeightConfig, + 'navigationArrows': navigationArrowsConfig, + 'navigationDots': navigationDotsConfig, + 'galleryPosition': galleryPositionConfig, + 'hideThumbnails': hideThumbnailsConfig, + 'isProduct': true, + 'fallbackImageTitle': page.product.translated.name, + 'startIndexThumbnails': page.product.cover.position + 1, + 'startIndexSlider': page.product.cover.position + 1, + 'keepAspectRatioOnZoom': keepAspectRatioOnZoom + } %} + {% endif %} +
+{% endblock %} + +{% block page_product_detail_buy %} +
+ + {# ... add headline here #} + {% block page_product_detail_headline %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/headline.html.twig' %} +
+ {% endblock %} + + {# ... add short description #} + {% block zen_page_product_detail_short_description %} + {% if page.product.customFields.custom_description_small_description and theme_config('zen-product-details-short-description') %} +
+ {{ page.product.customFields.custom_description_small_description|trans|sw_sanitize }} +
+ {% endif %} + {% endblock %} + + {% sw_include '@Storefront/storefront/page/product-detail/buy-widget.html.twig' %} +
{% endblock %} \ No newline at end of file