EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-10-11 20:53:10 +02:00
parent b886d36385 95d718cab1
commit 11363b85bf
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php
+8
View File
@@ -202,6 +202,14 @@ return [
'title' => 'Slider Produkt Header',
'value' => 1.625,
],
'sliderPageHeader' => [
'title' => 'Slider Seiten Header',
'value' => 3.805,
],
'sliderPageHeaderHome' => [
'title' => 'Slider Seiten Header Startseite',
'value' => 2.342,
],
'free' => [
'title' => 'Frei',
'value' => 'NaN',
public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
+3 -3
View File
@@ -6,9 +6,9 @@
<div class="herounit">
<f:alias map="{image: slide.image.0}">
<f:if condition="{image}">
<div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(image: image, height: '240')})"
data-mobile="{f:uri.image(image: image, height: '240')}"
data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
<div class="herounit__image responsive-bg" style="background-image: url({f:uri.image(image: image, height: '240', cropVariant: 'sliderPageHeaderHome')})"
data-mobile="{f:uri.image(image: image, height: '240', cropVariant: 'sliderPageHeaderHome')}"
data-desktop="{f:uri.image(image: image, width: '1370', cropVariant: 'sliderPageHeaderHome')}"></div>
</f:if>
</f:alias>
<div class="herounit__main">
public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
+3 -3
View File
@@ -4,9 +4,9 @@
<div class="pagehead">
<f:alias map="{image: slide.image.0}">
<div class="pagehead__image responsive-bg"
style="background-image: url({f:uri.image(image: image, height: '240')})"
data-mobile="{f:uri.image(image: image, height: '240')}"
data-desktop="{f:uri.image(image: image, width: '1370')}"></div>
style="background-image: url({f:uri.image(image: image, height: '240', cropVariant: 'sliderPageHeader')})"
data-mobile="{f:uri.image(image: image, height: '240', cropVariant: 'sliderPageHeader')}"
data-desktop="{f:uri.image(image: image, width: '1370', cropVariant: 'sliderPageHeader')}"></div>
</f:alias>
<div class="pagehead__main">
<div class="pagehead__inner">
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
+1 -1
View File
@@ -47,7 +47,7 @@
</div>
</div>
</div>
<facebook-pixel :values="{ content_ids: [ <f:format.raw>{region.uid}</f:format.raw> ], content_name: '<f:format.raw>{region.nameInternal}</f:format.raw>', content_type: 'product_group' }"></facebook-pixel>
<facebook-pixel :values="{ content_ids: [ <f:format.raw>{region.uid}</f:format.raw> ], content_name: '<f:format.raw>{region.nameInternal}</f:format.raw>', content_type: 'product' }"></facebook-pixel>
</f:section>
</html>