spawntree
/
Diaeko
2
0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Toiminta
Selaa lähdekoodia

fixes

master
Florian Eisenmenger 4 vuotta sitten
vanhempi
55fe6ab127
commit
9eb187f807
8 muutettua tiedostoa jossa 299 lisäystä ja 12 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -7
      zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js
  2. +1
    -0
      zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss
  3. +11
    -0
      zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_search-suggest.scss
  4. +127
    -0
      zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/search-suggest.html.twig
  5. +7
    -5
      zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js
  6. +1
    -0
      zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss
  7. +11
    -0
      zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_search-suggest.scss
  8. +132
    -0
      zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/search-suggest.html.twig

+ 9
- 7
zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js Näytä tiedosto

@@ -128,13 +128,15 @@ function setIncludedDays(delivery, fp, addDays) {
}

$.fn.isInViewport = function() {
var elementTop = $(this).offset().top + 50;
var elementBottom = elementTop + $(this).outerHeight();

var viewportTop = $(window).scrollTop();
var viewportBottom = viewportTop + $(window).height();

return elementBottom > viewportTop && elementTop < viewportBottom;
if ($(this).length) {
var elementTop = $(this).offset().top + 50;
var elementBottom = elementTop + $(this).outerHeight();
var viewportTop = $(window).scrollTop();
var viewportBottom = viewportTop + $(window).height();
return elementBottom > viewportTop && elementTop < viewportBottom;
}
};

function tagBar(sticky, parentContainer, stickyTop) {


+ 1
- 0
zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss Näytä tiedosto

@@ -1,5 +1,6 @@
@import 'layout/header';
@import 'layout/header-minimal';
@import 'layout/search-suggest';
@import 'layout/container';
@import 'layout/footer';
@import 'component/card';


+ 11
- 0
zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_search-suggest.scss Näytä tiedosto

@@ -0,0 +1,11 @@
.search-suggest-list .search-suggest-product-name {
position: relative;
padding-right: 34px;
.filterIcon {
position: absolute;
right: 8px;
top: 50%;
transform: translate(0,-50%);
width: 22px;
}
}

+ 127
- 0
zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/search-suggest.html.twig Näytä tiedosto

@@ -0,0 +1,127 @@
{% sw_extends '@Storefront/storefront/layout/header/search-suggest.html.twig' %}
{% block layout_search_suggest_result_name %}
<div class="col search-suggest-product-name">
{{ product.translated.name }}
{% if product.customFields.custom_productteaser_filter_icon is defined %}
<div class="filterIcon">
{% if product.customFields.custom_productteaser_filter_icon == "fisch" %}
<svg version="1.1" id="Fisch" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#A3D9EA" cx="70.72" cy="71.04" r="69.69"/>
<g>
<path class="st1" fill="#FFFFFF" d="M120.53,41.7c0.89-2.26,0.77-4.8-0.35-6.96c-1.12-2.16-3.12-3.73-5.49-4.3l-5.26-1.28l-3.43-8.2
c-0.86-2.05-2.55-3.66-4.64-4.4c-2.1-0.75-4.42-0.58-6.39,0.47l-14.63,7.8C43.4,14.87,20.86,50.6,20.62,51
c-0.52,0.84-0.34,1.92,0.42,2.55c13.9,11.63,28.12,11.03,37.52,10.63c3.21-0.14,5.98-0.25,7.94,0.13c6.11,1.19,9.6,3.35,10.36,6.43
c1.68,6.81-9.05,17.66-14.65,22.44c-9.4-7.56-21.97-8.28-31.05-7.49c-2.63,0.23-4.78,2.02-5.47,4.57c-0.69,2.55,0.26,5.18,2.42,6.7
l17.32,12.22l1.38,16.69c0.18,2.24,1.69,4.11,3.84,4.76c0.53,0.16,1.07,0.24,1.61,0.24c1.62,0,3.18-0.73,4.24-2.04l15.46-19.27
c7.35-2.75,15.1-8.18,21.72-15.14c1.44,4.85,0.18,9.58,0.09,9.9c-0.24,0.87,0.13,1.79,0.9,2.24c0.31,0.18,0.66,0.27,1,0.27
c0.51,0,1.02-0.2,1.4-0.58c9.16-9.16,9.81-19.29,7.89-27.5c1.41-2.72,2.6-5.52,3.51-8.37l5.47-2.97c5.17-2.81,7.85-8.57,6.67-14.33
l-1.55-7.61L120.53,41.7z M87.65,31.62c12.87,5.79,19.42,15.26,18.93,27.37c-0.19,4.79-1.43,9.61-3.38,14.25
c-2.51-6.37-5.93-10.66-6.02-10.76c-0.69-0.84-1.94-0.97-2.78-0.28c-0.85,0.69-0.97,1.94-0.28,2.78
c0.64,0.78,14.09,17.66,4.18,33.45c-0.26-5.61-2.61-12.22-9.98-15.91c-0.98-0.49-2.17-0.09-2.66,0.88
c-0.49,0.98-0.09,2.17,0.89,2.66c2.45,1.23,4.14,2.83,5.33,4.57c-6.54,7.16-14.41,12.75-21.8,15.38c-0.34,0.12-0.65,0.34-0.88,0.63
l-15.81,19.7c-0.59,0.73-1.37,0.56-1.6,0.49c-0.23-0.07-0.97-0.37-1.05-1.3l-1.46-17.61c-0.05-0.58-0.35-1.12-0.83-1.45
L30.38,93.72c-1.2-0.85-0.98-2.08-0.88-2.43c0.1-0.36,0.52-1.53,1.99-1.66c8.72-0.75,20.91-0.05,29.36,7.6
c0.72,0.65,1.8,0.68,2.56,0.08c2.06-1.65,20.02-16.4,17.28-27.52c-1.16-4.71-5.68-7.86-13.44-9.37c-0.35-0.07-0.73-0.1-1.1-0.14
c3.97-3.02,6.43-6.5,7.28-10.41c1.61-7.43-3.19-13.42-3.4-13.67c-0.69-0.85-1.94-0.97-2.78-0.28c-0.84,0.69-0.97,1.93-0.29,2.78
c0.04,0.05,3.82,4.83,2.59,10.37c-0.94,4.26-4.57,8.01-10.77,11.15c-0.14,0.01-0.26,0.01-0.4,0.02c-8.99,0.39-21.18,0.9-33.44-8.6
c3.86-5.56,18.81-24.68,42.24-24.68C73.43,26.94,80.26,28.3,87.65,31.62z M116.85,40.25l-1.71,4.32c-0.14,0.36-0.17,0.75-0.1,1.12
l1.67,8.19c0.83,4.04-1.06,8.09-4.68,10.06l-2.21,1.2c0.39-1.99,0.63-3.99,0.71-5.99c0.39-9.67-2.99-22.92-21.26-31.14
c-1.24-0.56-2.46-1.05-3.67-1.51l11.23-5.99c0.59-0.31,1.22-0.47,1.86-0.47c0.45,0,0.9,0.08,1.34,0.23
c1.06,0.38,1.89,1.16,2.32,2.2l3.81,9.13c0.24,0.58,0.75,1.01,1.36,1.16l6.23,1.51c1.25,0.3,2.31,1.14,2.9,2.28
C117.25,37.71,117.32,39.05,116.85,40.25z"/>
<path class="st1" fill="#FFFFFF" d="M59.55,45.3c0-3.73-3.04-6.77-6.77-6.77s-6.77,3.04-6.77,6.77c0,3.73,3.04,6.77,6.77,6.77
S59.55,49.03,59.55,45.3z M55.59,45.3c0,1.55-1.26,2.81-2.81,2.81c-1.55,0-2.81-1.26-2.81-2.81c0-1.55,1.26-2.81,2.81-2.81
C54.33,42.49,55.59,43.75,55.59,45.3z"/>
</g>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "gefluegel" %}
<svg version="1.1" id="Gefluegel" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#F3987F" cx="70.62" cy="70.87" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M20.98,48.04c0,0.97,0.42,2.75,3.22,3.8c0.91,0.34,3.87,1.13,6.04,1.7c-0.34,2.5-1.02,5.84-3.56,14.17
c-0.34,1.11-0.17,2.19,0.47,3.06c0.49,0.66,1.46,1.45,3.29,1.45l0,0c0.55,0,1.17-0.07,1.81-0.21c0.61,24.37,10.49,40.23,28.03,44.84
c1.11,0.29,2.21,0.53,3.31,0.77l-1.18,3.78c-0.43,1.38,0.34,2.85,1.72,3.28c0.26,0.08,0.52,0.12,0.78,0.12
c1.12,0,2.15-0.72,2.5-1.84l1.37-4.4c1.57,0.21,3.11,0.35,4.64,0.45l-2.32,7.58c-0.42,1.38,0.36,2.85,1.74,3.27
c0.26,0.08,0.51,0.12,0.77,0.12c1.12,0,2.16-0.73,2.51-1.86l2.76-9.03c13.19-0.47,24.51-5.87,29.48-14.11
c0.85-0.37,1.84-0.85,3.05-1.47c9.92-5.1,9.81-10.14,9.69-11.09c-0.12-0.89-0.67-1.64-1.45-2.02c6.82-4.97,5.84-12.35,5.83-12.45
c-0.11-0.76-0.55-1.43-1.2-1.84c-0.47-0.3-1.02-0.43-1.56-0.4c2.53-2.57,3.96-5.22,4.29-7.93c0.54-4.42-2.07-7.14-2.37-7.44
c-0.95-0.94-2.46-1.01-3.5-0.17c-8.88,7.23-18.55,10.89-28.74,10.89c-9.73,0-16.81-3.44-18.11-4.12
c-7.97-7.11-14.97-17.67-18.22-22.97c1.73-0.71,3.38-1.98,4.84-3.82c2.12-2.67,1.9-4.8,1.34-6.1c-0.95-2.22-3.41-3.53-7.32-3.89
c-0.46-0.04-0.62-0.13-0.62-0.13c-0.02-0.09-0.11-0.71-0.18-1.13c-0.24-1.58-0.64-4.22-3.49-5.75c-4.01-2.15-6.72,0.82-8.02,2.25
c-0.34,0.38-0.94,1.03-1.29,1.26c-0.23-0.18-0.56-0.53-0.81-0.79c-1.22-1.27-3.28-3.4-6.81-2.98c-1.83,0.22-3.27,1.18-4.08,2.72
c-1.99,3.8,0.71,10.55,2.41,14.07c-0.55,0.74-1.03,1.53-1.36,2.39c-2,0.64-5.59,1.8-6.67,2.2C22.11,45,20.98,46.4,20.98,48.04z
M53.24,39.34c-1.67-1.99-3.89-3.46-6.47-4.21c-1.26-0.37-2.59-0.55-3.95-0.55c-2.41,0-4.67,0.6-6.61,1.61
c-1.55-3.56-2.44-7.04-1.97-8.07c0.02-0.01,0.05-0.01,0.09-0.01c0.82-0.1,1.26,0.21,2.41,1.41c1.06,1.1,2.84,2.94,5.58,2.34
c1.91-0.43,3.16-1.8,4.17-2.91c0.41-0.45,1.09-1.19,1.38-1.29c0,0.01,0.1,0.03,0.28,0.13c0.47,0.25,0.58,0.52,0.79,1.92
c0.26,1.71,0.8,5.26,5.49,5.69c1.76,0.16,2.56,0.52,2.88,0.71c-0.07,0.16-0.22,0.43-0.52,0.81C55.91,38.01,54.67,39.13,53.24,39.34z
M29.56,47.94c1.54-0.5,3.15-1.01,4.02-1.29c0.91-0.29,1.59-1.04,1.78-1.98c0.65-3.19,4.24-4.86,7.46-4.86
c0.86,0,1.7,0.12,2.49,0.35c2.45,0.71,4.39,2.5,5.32,4.9c0.05,0.14,0.12,0.27,0.2,0.4c2.98,4.97,10.93,17.42,20.21,25.61
c0.09,0.08,0.18,0.15,0.28,0.21c0.08,0.05,8.53,5.01,21.08,5.01c10.42,0,20.31-3.38,29.43-10.04c0.03,0.3,0.02,0.63-0.03,0.98
c-0.41,2.88-3.6,6.23-9,9.45c-0.99,0.59-1.48,1.77-1.2,2.89c0.28,1.12,1.27,1.93,2.42,1.98c0,0,0.9,0.04,2.18,0.04
c1.42,0,2.69-0.05,3.81-0.14c-0.74,2.53-3.12,6.04-10.51,7.48c-1.12,0.22-1.97,1.13-2.1,2.26c-0.17,1.43,0.83,2.87,2.25,3.05
l4.98,0.64c-0.96,1.05-2.65,2.42-5.62,3.95c-1,0.52-1.82,0.91-2.52,1.22c-1.47,0.55-28.6,10.28-46.14-7.58
c-7.65-7.78-8.7-13.6-8.71-13.65c-0.22-1.43-1.55-2.42-2.98-2.2c-1.43,0.22-2.42,1.55-2.2,2.98c0.05,0.3,1.21,7.44,10.16,16.55
c7.95,8.09,18.72,12.33,31.28,12.33c0.83,0,1.67-0.02,2.51-0.06c3.17-0.14,6.1-0.52,8.63-0.99c-4.69,3.57-11.99,6.44-22.03,6.44
c-4.9,0-10.08-0.71-15.39-2.1c-20.34-5.35-24.36-26.57-24.14-43.44c0.01-0.93-0.47-1.81-1.26-2.3c-0.79-0.48-1.78-0.53-2.6-0.1
c-0.38,0.2-0.74,0.37-1.08,0.5c2.48-8.45,2.79-11.12,3.12-13.93l0.07-0.62c0.16-1.31-0.68-2.53-1.96-2.85
C32.51,48.72,30.96,48.31,29.56,47.94z"/>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "ohne_schwein" %}
<svg version="1.1" id="Schwein" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#F0A3B7" cx="70.87" cy="70.87" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M12.23,69.12l1.08,5.22c0.57,2.76,3.12,5.03,5.94,5.28l0,0c-0.02,0,2.45,0.37,5.85,3.6
c2.02,1.91,5.15,4.3,7.94,6.31l-5.25,14.53c-0.46,1.27,0.2,2.68,1.47,3.14c0.28,0.1,0.56,0.15,0.83,0.15c1,0,1.95-0.62,2.31-1.62
l4.8-13.28c0.99,0.68,1.65,1.11,1.75,1.18c0.61,0.4,1.1,1.58,0.97,2.3l-1.04,5.44c-0.32,1.67-0.79,3.96-1.05,5.1
c-0.17,0.73,0.01,1.49,0.47,2.08c0.47,0.58,1.17,0.92,1.92,0.92h7.42c0.99,0,3.32,0,7.84-9.07c0.28-0.57,1.25-1.07,1.88-0.96
c0.33,0.06,8.16,1.35,15.67,1.35c5.63,0,11.06-0.76,15.38-1.62c0.92,3.66,1.71,6.81,1.83,7.26c0.28,1.11,1.28,1.86,2.38,1.86
c0.2,0,0.4-0.02,0.6-0.07c1.31-0.33,2.11-1.66,1.78-2.97c-0.11-0.45-0.89-3.54-1.8-7.15c2.55-0.64,4.17-1.17,4.34-1.22
c0.14-0.05,0.27-0.04,0.37,0.02c0.11,0.06,0.18,0.16,0.22,0.3c0,0,1.91,7.57,2.03,8.06c0.69,2.78,2.95,4.19,6.72,4.19h3.58
c1.27,0,2.33-0.97,2.44-2.24c0.12-1.36,0.27-3.9,0.34-5.65L113.73,88c0.05-1.37,0.62-3.07,0.98-3.54l0.44-0.6
c2.08-2.84,4.11-6.99,4.55-12.58c2.63,1.53,5.5,1.8,7.22,1.8c0.9,0,1.49-0.08,1.56-0.08c1.34-0.18,2.28-1.42,2.1-2.76
c-0.18-1.34-1.41-2.27-2.75-2.1c-6.16,0.77-8.11-3.41-8.69-5.52c-0.25-1.27-0.56-2.58-0.97-3.95c-3.64-12.13-17.22-25.1-44.42-25.1
c-9.44,0-20.54,2.91-27.95,7.29c-7.44-4.85-14.92-5.74-15.42-5.8c-1.74-0.19-3.22,0.4-4.06,1.63c-0.84,1.22-0.86,2.82-0.06,4.37
l3.58,6.96c0.28,0.54,0.1,1.55-0.35,1.96c-0.12,0.11-0.24,0.24-0.33,0.37l-4.68,6.47c-0.05,0.07-0.1,0.14-0.14,0.22
c-0.49,0.86-1.93,1.85-2.9,2.01L19,59.44c-0.06,0.01-6.18,1.03-6.98,4.01C11.65,64.85,11.86,67.37,12.23,69.12z M16.73,65.28
c0.73-0.36,2.07-0.84,3.05-1l2.42-0.39c2.37-0.38,5.05-2.22,6.3-4.29L33,53.4c1.9-1.93,2.44-5.21,1.2-7.62l-2.87-5.59
c4.19,0.87,16.2,4.31,21.68,16.05c0.57,1.23,2.03,1.76,3.26,1.19c1.23-0.57,1.76-2.03,1.19-3.26c-1.96-4.2-4.57-7.48-7.41-10.05
c6.6-3.39,15.92-5.65,23.71-5.65c24.51,0,36.6,11.16,39.73,21.6c0.24,0.81,0.45,1.61,0.63,2.41c0.08,0.54,0.19,1.06,0.32,1.57
c1.17,6.6,0.09,12.39-3.22,16.91l-0.43,0.58c-1.17,1.56-1.87,4.35-1.94,6.28l-0.52,13.58c-0.04,0.94-0.1,2.1-0.16,3.17h-1.3
c-1.42,0-1.85-0.26-1.9-0.29c0-0.01-0.02-0.06-0.05-0.18c-0.12-0.5-2.03-8.08-2.03-8.08c-0.37-1.45-1.32-2.69-2.61-3.4
c-1.29-0.71-2.85-0.85-4.27-0.38c-0.11,0.04-11.29,3.67-22.97,3.67c-7.11,0-14.78-1.27-14.86-1.29c-2.78-0.46-5.82,1.08-7.08,3.61
c-1.36,2.72-3.12,5.52-3.97,6.35h-3.87c0.16-0.79,0.32-1.59,0.45-2.28l1.04-5.44c0.51-2.66-0.81-5.8-3.07-7.3
c-0.09-0.06-9.25-6.15-13.18-9.87c-4.69-4.46-8.39-4.89-8.8-4.93c-0.63-0.05-1.43-0.77-1.56-1.39l-1.08-5.22
C16.81,67.05,16.73,65.96,16.73,65.28z"/>
<rect fill="#FFFFFF" x="5.86" y="64.09" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -29.4871 70.6272)" class="st1" width="129.3" height="13.63"/>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "vegetarisch" %}
<svg version="1.1" id="Vegetarisch" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#A1CC84" cx="70.74" cy="71.11" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M126.16,50.48c-0.7-0.67-1.74-0.87-2.64-0.51c-0.01,0-1.26,0.49-2.76,0.49c-1.14,0-2.09-0.28-2.85-0.83
c-3.52-2.58-8.32-3.12-11.72-3.12c-2.88,0-5.9,0.39-8.71,1.13c-14.61,3.82-22.65,13.61-22.87,27.64c-0.72,1.29-1.39,2.67-2,4.12
c-0.49-2.91-1.12-5.81-1.94-8.55c4.54-18.32-7.97-29.37-20.37-33.31c-3.69-1.17-7.77-1.82-11.5-1.82c-4.67,0-8.64,0.98-11.47,2.84
c-0.85,0.55-1.88,0.84-3.06,0.84c-1.95,0-3.61-0.75-3.61-0.75c-0.88-0.41-1.93-0.27-2.67,0.36c-0.74,0.63-1.05,1.64-0.78,2.58
c8.51,29.83,32.38,32.44,35.1,32.64c2.42,0.47,5.02,0.71,7.75,0.71c2.69,0,4.97-0.23,6.46-0.44c1.53,6.08,2.21,12.91,2.48,18.59
c-0.03,0.23-0.07,0.45-0.1,0.68c-0.05,0.44,0.02,0.87,0.18,1.25c0.11,3.29,0.1,6.05,0.07,7.88H36.47c-1.38,0-2.49,1.12-2.49,2.49
c0,1.38,1.12,2.49,2.49,2.49h70.39c1.38,0,2.49-1.12,2.49-2.49c0-1.38-1.12-2.49-2.49-2.49H74.13c0.05-2.21,0.06-5.63-0.12-9.66
c0.74-5.24,2.07-9.65,3.79-13.35c2.03,0.3,6.5,0.88,11.04,0.88c0,0,0,0,0,0c1.96,0,3.74-0.11,5.28-0.33
c1.32-0.01,6.96-0.27,13.53-3.65c6.11-3.14,14.4-9.8,19.15-23.72C127.12,52.17,126.87,51.15,126.16,50.48z M60.05,69.96
c-2.46,0-4.79-0.22-6.93-0.65c-0.14-0.03-0.28-0.04-0.42-0.05c-0.21-0.01-20.45-0.91-29.36-24.91c0.3,0.02,0.61,0.03,0.93,0.03
c2.17,0,4.12-0.56,5.79-1.65c1.99-1.3,5.09-2.02,8.74-2.02c3.23,0,6.78,0.56,9.99,1.58c13.15,4.17,16.98,12.2,17.65,18.93
c-10.18-16.61-28.18-17.6-28.99-17.64c-1.38-0.07-2.54,1.01-2.6,2.38c-0.06,1.37,1,2.54,2.38,2.6c0.18,0.01,18.22,0.99,26.59,18.25
c0.44,0.9,0.84,1.86,1.21,2.85C63.76,69.82,62.03,69.96,60.05,69.96z M105.38,72.37c-5.86,3.01-10.81,3.1-11.38,3.1
c-0.14,0-0.28,0.01-0.42,0.03c-1.35,0.2-2.94,0.3-4.74,0.3c0,0,0,0,0,0c-3.11,0-6.26-0.3-8.44-0.57
c10.05-15.2,27.36-14.85,28.31-14.82c1.38,0.07,2.53-1.02,2.59-2.39c0.05-1.37-1.02-2.53-2.39-2.59c-7.28-0.29-18.8,2.25-27.7,11.08
c3.25-8.41,10.82-12.29,17.53-14.05c2.41-0.63,4.99-0.96,7.45-0.96c3.76,0,6.88,0.77,8.78,2.16c1.57,1.15,3.45,1.75,5.58,1.79
C117.1,63.28,112.01,68.97,105.38,72.37z"/>
</svg>
{% endif %}
</div>
{% endif %}
</div>
{% endblock %}

+ 7
- 5
zenitPlatformAtmosSet2/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set2.js Näytä tiedosto

@@ -126,13 +126,15 @@ function setIncludedDays(delivery, fp, addDays) {
}

$.fn.isInViewport = function() {
var elementTop = $(this).offset().top + 50;
var elementBottom = elementTop + $(this).outerHeight();
if ($(this).length) {
var elementTop = $(this).offset().top + 50;
var elementBottom = elementTop + $(this).outerHeight();

var viewportTop = $(window).scrollTop();
var viewportBottom = viewportTop + $(window).height();
var viewportTop = $(window).scrollTop();
var viewportBottom = viewportTop + $(window).height();

return elementBottom > viewportTop && elementTop < viewportBottom;
return elementBottom > viewportTop && elementTop < viewportBottom;
}
};

function tagBar(sticky, parentContainer, stickyTop) {


+ 1
- 0
zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/base.scss Näytä tiedosto

@@ -1,5 +1,6 @@
@import 'layout/header';
@import 'layout/header-minimal';
@import 'layout/search-suggest';
@import 'layout/container';
@import 'layout/footer';
@import 'component/card';


+ 11
- 0
zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_search-suggest.scss Näytä tiedosto

@@ -0,0 +1,11 @@
.search-suggest-list .search-suggest-product-name {
position: relative;
padding-right: 34px;
.filterIcon {
position: absolute;
right: 8px;
top: 50%;
transform: translate(0,-50%);
width: 22px;
}
}

+ 132
- 0
zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/header/search-suggest.html.twig Näytä tiedosto

@@ -0,0 +1,132 @@
{% sw_extends '@Storefront/storefront/layout/header/search-suggest.html.twig' %}
{% block layout_search_suggest_result_name %}
<div class="col search-suggest-product-name">
{{ product.translated.name }}
{% if product.customFields.custom_productteaser_filter_icon is defined %}
<div class="filterIcon">
{% if product.customFields.custom_productteaser_filter_icon is defined %}
<div class="filterIcon">
{% if product.customFields.custom_productteaser_filter_icon == "fisch" %}
<svg version="1.1" id="Fisch" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#36A9E1" cx="70.72" cy="71.04" r="69.69"/>
<g>
<path class="st1" fill="#FFFFFF" d="M120.68,41.7c0.89-2.26,0.77-4.8-0.35-6.96c-1.12-2.16-3.12-3.73-5.49-4.3l-5.26-1.28l-3.43-8.2
c-0.86-2.05-2.55-3.66-4.64-4.4c-2.1-0.75-4.42-0.58-6.39,0.47l-14.63,7.8C43.55,14.87,21,50.6,20.76,51
c-0.52,0.84-0.34,1.92,0.42,2.55c13.9,11.63,28.12,11.03,37.52,10.63c3.21-0.14,5.98-0.25,7.94,0.13c6.11,1.19,9.6,3.35,10.36,6.43
c1.68,6.81-9.05,17.66-14.65,22.44c-9.4-7.56-21.97-8.28-31.05-7.49c-2.63,0.23-4.78,2.02-5.47,4.57c-0.69,2.55,0.26,5.18,2.42,6.7
l17.32,12.22l1.38,16.69c0.18,2.24,1.69,4.11,3.84,4.76c0.53,0.16,1.07,0.24,1.61,0.24c1.62,0,3.18-0.73,4.24-2.04l15.46-19.27
c7.35-2.75,15.1-8.18,21.72-15.14c1.44,4.85,0.18,9.58,0.09,9.9c-0.24,0.87,0.13,1.79,0.9,2.24c0.31,0.18,0.66,0.27,1,0.27
c0.51,0,1.02-0.2,1.4-0.58c9.16-9.16,9.81-19.29,7.89-27.5c1.41-2.72,2.6-5.52,3.51-8.37l5.47-2.97c5.17-2.81,7.85-8.57,6.67-14.33
l-1.55-7.61L120.68,41.7z M87.8,31.62c12.87,5.79,19.42,15.26,18.93,27.37c-0.19,4.79-1.43,9.61-3.38,14.25
c-2.51-6.37-5.93-10.66-6.02-10.76c-0.69-0.84-1.94-0.97-2.78-0.28c-0.85,0.69-0.97,1.94-0.28,2.78
c0.64,0.78,14.09,17.66,4.18,33.45c-0.26-5.61-2.61-12.22-9.98-15.91c-0.98-0.49-2.17-0.09-2.66,0.88
c-0.49,0.98-0.09,2.17,0.89,2.66c2.45,1.23,4.14,2.83,5.33,4.57c-6.54,7.16-14.41,12.75-21.8,15.38c-0.34,0.12-0.65,0.34-0.88,0.63
l-15.81,19.7c-0.59,0.73-1.37,0.56-1.6,0.49c-0.23-0.07-0.97-0.37-1.05-1.3l-1.46-17.61c-0.05-0.58-0.35-1.12-0.83-1.45
L30.53,93.72c-1.2-0.85-0.98-2.08-0.88-2.43c0.1-0.36,0.52-1.53,1.99-1.66c8.72-0.75,20.91-0.05,29.36,7.6
c0.72,0.65,1.8,0.68,2.56,0.08c2.06-1.65,20.02-16.4,17.28-27.52c-1.16-4.71-5.68-7.86-13.44-9.37c-0.35-0.07-0.73-0.1-1.1-0.14
c3.97-3.02,6.43-6.5,7.28-10.41c1.61-7.43-3.19-13.42-3.4-13.67c-0.69-0.85-1.94-0.97-2.78-0.28c-0.84,0.69-0.97,1.93-0.29,2.78
c0.04,0.05,3.82,4.83,2.59,10.37c-0.94,4.26-4.57,8.01-10.77,11.15c-0.14,0.01-0.26,0.01-0.4,0.02c-8.99,0.39-21.18,0.9-33.44-8.6
c3.86-5.56,18.81-24.68,42.24-24.68C73.57,26.94,80.41,28.3,87.8,31.62z M117,40.25l-1.71,4.32c-0.14,0.36-0.17,0.75-0.1,1.12
l1.67,8.19c0.83,4.04-1.06,8.09-4.68,10.06l-2.21,1.2c0.39-1.99,0.63-3.99,0.71-5.99c0.39-9.67-2.99-22.92-21.26-31.14
c-1.24-0.56-2.46-1.05-3.67-1.51l11.23-5.99c0.59-0.31,1.22-0.47,1.86-0.47c0.45,0,0.9,0.08,1.34,0.23
c1.06,0.38,1.89,1.16,2.32,2.2l3.81,9.13c0.24,0.58,0.75,1.01,1.36,1.16l6.23,1.51c1.25,0.3,2.31,1.14,2.9,2.28
C117.4,37.71,117.47,39.05,117,40.25z"/>
<path class="st1" fill="#FFFFFF" d="M59.7,45.3c0-3.73-3.04-6.77-6.77-6.77s-6.77,3.04-6.77,6.77c0,3.73,3.04,6.77,6.77,6.77S59.7,49.03,59.7,45.3
z M55.74,45.3c0,1.55-1.26,2.81-2.81,2.81c-1.55,0-2.81-1.26-2.81-2.81c0-1.55,1.26-2.81,2.81-2.81
C54.48,42.49,55.74,43.75,55.74,45.3z"/>
</g>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "gefluegel" %}
<svg version="1.1" id="Gefluegel" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#F39200" cx="70.62" cy="70.87" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M20.73,48.04c0,0.97,0.42,2.75,3.22,3.8c0.91,0.34,3.87,1.13,6.04,1.7c-0.34,2.5-1.02,5.84-3.56,14.17
c-0.34,1.11-0.17,2.19,0.47,3.06c0.49,0.66,1.46,1.45,3.29,1.45l0,0c0.55,0,1.17-0.07,1.81-0.21c0.61,24.37,10.49,40.23,28.03,44.84
c1.11,0.29,2.21,0.53,3.31,0.77l-1.18,3.78c-0.43,1.38,0.34,2.85,1.72,3.28c0.26,0.08,0.52,0.12,0.78,0.12
c1.12,0,2.15-0.72,2.5-1.84l1.37-4.4c1.57,0.21,3.11,0.35,4.64,0.45l-2.32,7.58c-0.42,1.38,0.36,2.85,1.74,3.27
c0.26,0.08,0.51,0.12,0.77,0.12c1.12,0,2.16-0.73,2.51-1.86l2.76-9.03c13.19-0.47,24.51-5.87,29.48-14.11
c0.85-0.37,1.84-0.85,3.05-1.47c9.92-5.1,9.81-10.14,9.69-11.09c-0.12-0.89-0.67-1.64-1.45-2.02c6.82-4.97,5.84-12.35,5.83-12.45
c-0.11-0.76-0.55-1.43-1.2-1.84c-0.47-0.3-1.02-0.43-1.56-0.4c2.53-2.57,3.96-5.22,4.29-7.93c0.54-4.42-2.07-7.14-2.37-7.44
c-0.95-0.94-2.46-1.01-3.5-0.17c-8.88,7.23-18.55,10.89-28.74,10.89c-9.73,0-16.81-3.44-18.11-4.12
c-7.97-7.11-14.97-17.67-18.22-22.97c1.73-0.71,3.38-1.98,4.84-3.82c2.12-2.67,1.9-4.8,1.34-6.1c-0.95-2.22-3.41-3.53-7.32-3.89
c-0.46-0.04-0.62-0.13-0.62-0.13c-0.02-0.09-0.11-0.71-0.18-1.13c-0.24-1.58-0.64-4.22-3.49-5.75c-4.01-2.15-6.72,0.82-8.02,2.25
c-0.34,0.38-0.94,1.03-1.29,1.26c-0.23-0.18-0.56-0.53-0.81-0.79c-1.22-1.27-3.28-3.4-6.81-2.98c-1.83,0.22-3.27,1.18-4.08,2.72
c-1.99,3.8,0.71,10.55,2.41,14.07c-0.55,0.74-1.03,1.53-1.36,2.39c-2,0.64-5.59,1.8-6.67,2.2C21.86,45,20.73,46.4,20.73,48.04z
M53,39.34c-1.67-1.99-3.89-3.46-6.47-4.21c-1.26-0.37-2.59-0.55-3.95-0.55c-2.41,0-4.67,0.6-6.61,1.61
c-1.55-3.56-2.44-7.04-1.97-8.07c0.02-0.01,0.05-0.01,0.09-0.01c0.82-0.1,1.26,0.21,2.41,1.41c1.06,1.1,2.84,2.94,5.58,2.34
c1.91-0.43,3.16-1.8,4.17-2.91c0.41-0.45,1.09-1.19,1.38-1.29c0,0.01,0.1,0.03,0.28,0.13c0.47,0.25,0.58,0.52,0.79,1.92
c0.26,1.71,0.8,5.26,5.49,5.69c1.76,0.16,2.56,0.52,2.88,0.71c-0.07,0.16-0.22,0.43-0.52,0.81C55.66,38.01,54.43,39.13,53,39.34z
M29.32,47.94c1.54-0.5,3.15-1.01,4.02-1.29c0.91-0.29,1.59-1.04,1.78-1.98c0.65-3.19,4.24-4.86,7.46-4.86
c0.86,0,1.7,0.12,2.49,0.35c2.45,0.71,4.39,2.5,5.32,4.9c0.05,0.14,0.12,0.27,0.2,0.4c2.98,4.97,10.93,17.42,20.21,25.61
c0.09,0.08,0.18,0.15,0.28,0.21c0.08,0.05,8.53,5.01,21.08,5.01c10.42,0,20.31-3.38,29.43-10.04c0.03,0.3,0.02,0.63-0.03,0.98
c-0.41,2.88-3.6,6.23-9,9.45c-0.99,0.59-1.48,1.77-1.2,2.89c0.28,1.12,1.27,1.93,2.42,1.98c0,0,0.9,0.04,2.18,0.04
c1.42,0,2.69-0.05,3.81-0.14c-0.74,2.53-3.12,6.04-10.51,7.48c-1.12,0.22-1.97,1.13-2.1,2.26c-0.17,1.43,0.83,2.87,2.25,3.05
l4.98,0.64c-0.96,1.05-2.65,2.42-5.62,3.95c-1,0.52-1.82,0.91-2.52,1.22c-1.47,0.55-28.6,10.28-46.14-7.58
c-7.65-7.78-8.7-13.6-8.71-13.65c-0.22-1.43-1.55-2.42-2.98-2.2c-1.43,0.22-2.42,1.55-2.2,2.98c0.05,0.3,1.21,7.44,10.16,16.55
c7.95,8.09,18.72,12.33,31.28,12.33c0.83,0,1.67-0.02,2.51-0.06c3.17-0.14,6.1-0.52,8.63-0.99c-4.69,3.57-11.99,6.44-22.03,6.44
c-4.9,0-10.08-0.71-15.39-2.1C41.02,106.42,37,85.2,37.22,68.33c0.01-0.93-0.47-1.81-1.26-2.3c-0.79-0.48-1.78-0.53-2.6-0.1
c-0.38,0.2-0.74,0.37-1.08,0.5c2.48-8.45,2.79-11.12,3.12-13.93l0.07-0.62c0.16-1.31-0.68-2.53-1.96-2.85
C32.27,48.72,30.71,48.31,29.32,47.94z"/>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "ohne_schwein" %}
<svg version="1.1" id="Schwein" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#EC64A1" cx="70.87" cy="70.87" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M12.23,68.98l1.08,5.24c0.57,2.77,3.13,5.05,5.96,5.3l0,0c-0.02,0,2.46,0.38,5.87,3.61
c2.02,1.92,5.17,4.31,7.97,6.33l-5.27,14.58c-0.46,1.28,0.2,2.69,1.48,3.15c0.28,0.1,0.56,0.15,0.84,0.15
c1.01,0,1.95-0.62,2.31-1.62l4.82-13.33c1,0.68,1.66,1.12,1.75,1.18c0.61,0.4,1.11,1.59,0.97,2.3l-1.04,5.46
c-0.32,1.68-0.79,3.97-1.06,5.12c-0.17,0.73,0.01,1.5,0.47,2.08c0.47,0.59,1.18,0.93,1.92,0.93h7.45c1,0,3.33,0,7.86-9.1
c0.29-0.57,1.26-1.08,1.89-0.96c0.33,0.06,8.19,1.36,15.73,1.36c5.65,0,11.1-0.77,15.43-1.62c0.92,3.67,1.72,6.83,1.83,7.29
c0.28,1.12,1.28,1.86,2.39,1.86c0.2,0,0.4-0.02,0.6-0.07c1.32-0.33,2.12-1.67,1.79-2.98c-0.11-0.45-0.89-3.55-1.81-7.17
c2.56-0.65,4.18-1.17,4.35-1.23c0.14-0.05,0.27-0.04,0.37,0.02c0.11,0.06,0.18,0.16,0.22,0.31c0,0,1.91,7.6,2.04,8.09
c0.7,2.79,2.96,4.21,6.74,4.21h3.59c1.27,0,2.34-0.97,2.45-2.24c0.12-1.37,0.27-3.91,0.34-5.67l0.52-13.63
c0.05-1.37,0.62-3.08,0.98-3.56l0.45-0.61c2.09-2.85,4.13-7.02,4.57-12.63c2.64,1.53,5.51,1.81,7.24,1.81
c0.91,0,1.49-0.08,1.57-0.09c1.35-0.18,2.29-1.42,2.11-2.77c-0.18-1.34-1.42-2.28-2.76-2.11c-6.19,0.78-8.14-3.42-8.72-5.54
c-0.25-1.27-0.56-2.59-0.97-3.96c-3.65-12.17-17.28-25.18-44.58-25.18c-9.47,0-20.61,2.92-28.05,7.31
c-7.46-4.87-14.98-5.76-15.47-5.82c-1.75-0.19-3.23,0.4-4.08,1.63c-0.84,1.23-0.87,2.83-0.06,4.39l3.59,6.99
c0.28,0.54,0.1,1.55-0.35,1.96c-0.12,0.11-0.24,0.24-0.33,0.37l-4.7,6.5c-0.05,0.07-0.1,0.15-0.14,0.22
c-0.49,0.86-1.93,1.86-2.91,2.02l-2.43,0.39c-0.06,0.01-6.2,1.04-7,4.02C11.65,64.7,11.86,67.23,12.23,68.98z M16.75,65.13
c0.73-0.36,2.08-0.84,3.06-1l2.43-0.39c2.38-0.38,5.07-2.22,6.32-4.31l4.51-6.23c1.91-1.93,2.45-5.23,1.2-7.65l-2.88-5.61
c4.2,0.87,16.26,4.33,21.75,16.11c0.57,1.23,2.04,1.76,3.27,1.19c1.23-0.57,1.76-2.04,1.19-3.27c-1.96-4.21-4.59-7.51-7.43-10.09
c6.62-3.4,15.98-5.67,23.79-5.67c24.6,0,36.72,11.2,39.87,21.68c0.24,0.82,0.45,1.62,0.63,2.42c0.08,0.54,0.19,1.07,0.32,1.57
c1.18,6.62,0.09,12.43-3.24,16.97l-0.43,0.58c-1.17,1.57-1.87,4.36-1.95,6.3l-0.52,13.63c-0.04,0.94-0.1,2.11-0.16,3.18h-1.3
c-1.43,0-1.86-0.26-1.91-0.3c0-0.01-0.02-0.06-0.05-0.18c-0.12-0.5-2.04-8.1-2.04-8.1c-0.37-1.46-1.32-2.7-2.62-3.41
c-1.3-0.71-2.86-0.85-4.29-0.38c-0.11,0.04-11.33,3.68-23.05,3.68c-7.13,0-14.84-1.28-14.91-1.29c-2.79-0.46-5.84,1.09-7.1,3.62
c-1.36,2.73-3.13,5.53-3.99,6.37h-3.88c0.16-0.79,0.32-1.59,0.45-2.29l1.04-5.46c0.51-2.67-0.82-5.82-3.09-7.33
c-0.09-0.06-9.29-6.17-13.22-9.91c-4.71-4.47-8.42-4.91-8.83-4.95c-0.63-0.05-1.44-0.77-1.57-1.39l-1.08-5.24
C16.82,66.9,16.75,65.81,16.75,65.13z"/>
<rect fill="#FFFFFF" x="5.86" y="64.09" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -29.4871 70.6272)" class="st1" width="129.3" height="13.63"/>
</svg>
{% endif %}
{% if product.customFields.custom_productteaser_filter_icon == "vegetarisch" %}
<svg version="1.1" id="Vegetarisch" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.73 141.73" style="enable-background:new 0 0 141.73 141.73;" xml:space="preserve">
<circle class="st0" fill="#87B14C" cx="70.74" cy="71.11" r="69.69"/>
<path class="st1" fill="#FFFFFF" d="M126.16,50.48c-0.7-0.67-1.74-0.87-2.64-0.51c-0.01,0-1.26,0.49-2.76,0.49c-1.14,0-2.09-0.28-2.85-0.83
c-3.52-2.58-8.32-3.12-11.72-3.12c-2.88,0-5.9,0.39-8.71,1.13c-14.61,3.82-22.65,13.61-22.87,27.64c-0.72,1.29-1.39,2.67-2,4.12
c-0.49-2.91-1.12-5.81-1.94-8.55c4.54-18.32-7.97-29.37-20.37-33.31c-3.69-1.17-7.77-1.82-11.5-1.82c-4.67,0-8.64,0.98-11.47,2.84
c-0.85,0.55-1.88,0.84-3.06,0.84c-1.95,0-3.61-0.75-3.61-0.75c-0.88-0.41-1.93-0.27-2.67,0.36c-0.74,0.63-1.05,1.64-0.78,2.58
c8.51,29.83,32.38,32.44,35.1,32.64c2.42,0.47,5.02,0.71,7.75,0.71c2.69,0,4.97-0.23,6.46-0.44c1.53,6.08,2.21,12.91,2.48,18.59
c-0.03,0.23-0.07,0.45-0.1,0.68c-0.05,0.44,0.02,0.87,0.18,1.25c0.11,3.29,0.1,6.05,0.07,7.88H36.47c-1.38,0-2.49,1.12-2.49,2.49
c0,1.38,1.12,2.49,2.49,2.49h70.39c1.38,0,2.49-1.12,2.49-2.49c0-1.38-1.12-2.49-2.49-2.49H74.13c0.05-2.21,0.06-5.63-0.12-9.66
c0.74-5.24,2.07-9.65,3.79-13.35c2.03,0.3,6.5,0.88,11.04,0.88c0,0,0,0,0,0c1.96,0,3.74-0.11,5.28-0.33
c1.32-0.01,6.96-0.27,13.53-3.65c6.11-3.14,14.4-9.8,19.15-23.72C127.12,52.17,126.87,51.15,126.16,50.48z M60.05,69.96
c-2.46,0-4.79-0.22-6.93-0.65c-0.14-0.03-0.28-0.04-0.42-0.05c-0.21-0.01-20.45-0.91-29.36-24.91c0.3,0.02,0.61,0.03,0.93,0.03
c2.17,0,4.12-0.56,5.79-1.65c1.99-1.3,5.09-2.02,8.74-2.02c3.23,0,6.78,0.56,9.99,1.58c13.15,4.17,16.98,12.2,17.65,18.93
c-10.18-16.61-28.18-17.6-28.99-17.64c-1.38-0.07-2.54,1.01-2.6,2.38c-0.06,1.37,1,2.54,2.38,2.6c0.18,0.01,18.22,0.99,26.59,18.25
c0.44,0.9,0.84,1.86,1.21,2.85C63.76,69.82,62.03,69.96,60.05,69.96z M105.38,72.37c-5.86,3.01-10.81,3.1-11.38,3.1
c-0.14,0-0.28,0.01-0.42,0.03c-1.35,0.2-2.94,0.3-4.74,0.3c0,0,0,0,0,0c-3.11,0-6.26-0.3-8.44-0.57
c10.05-15.2,27.36-14.85,28.31-14.82c1.38,0.07,2.53-1.02,2.59-2.39c0.05-1.37-1.02-2.53-2.39-2.59c-7.28-0.29-18.8,2.25-27.7,11.08
c3.25-8.41,10.82-12.29,17.53-14.05c2.41-0.63,4.99-0.96,7.45-0.96c3.76,0,6.88,0.77,8.78,2.16c1.57,1.15,3.45,1.75,5.58,1.79
C117.1,63.28,112.01,68.97,105.38,72.37z"/>
</svg>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endblock %}

Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna