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

Merge branch 'release/2022.08-02'

Browse Source
This commit is contained in:
Björn Fromme
2022-08-19 16:04:50 +02:00
parent c14efabf54 1a29b34eb5
commit ee196ccb1f
8 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+12 -16
View File
@@ -1779,16 +1779,16 @@
}, },
{ {
"name": "masterminds/html5", "name": "masterminds/html5",
"version": "2.7.5", "version": "2.7.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Masterminds/html5-php.git", "url": "https://github.com/Masterminds/html5-php.git",
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" "reference": "897eb517a343a2281f11bc5556d6548db7d93947"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947",
"reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", "reference": "897eb517a343a2281f11bc5556d6548db7d93947",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1842,9 +1842,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/Masterminds/html5-php/issues", "issues": "https://github.com/Masterminds/html5-php/issues",
"source": "https://github.com/Masterminds/html5-php/tree/2.7.5" "source": "https://github.com/Masterminds/html5-php/tree/2.7.6"
}, },
"time": "2021-07-01T14:25:37+00:00" "time": "2022-08-18T16:18:26+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@@ -8319,21 +8319,21 @@
"packages-dev": [ "packages-dev": [
{ {
"name": "deployer/deployer", "name": "deployer/deployer",
"version": "v6.8.0", "version": "v6.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/deployphp/deployer.git", "url": "https://github.com/deployphp/deployer.git",
"reference": "4e243a64ed61e779fbb31c5a74e258a8e52fdaff" "reference": "c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/deployphp/deployer/zipball/4e243a64ed61e779fbb31c5a74e258a8e52fdaff", "url": "https://api.github.com/repos/deployphp/deployer/zipball/c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2",
"reference": "4e243a64ed61e779fbb31c5a74e258a8e52fdaff", "reference": "c4380effdc9f6d9c6ae549bb76f0a22bcb1d31d2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"deployer/phar-update": "~2.2", "deployer/phar-update": "~2.2",
"php": "^7.2", "php": "^7.2 || ^8.0",
"pimple/pimple": "~3.0", "pimple/pimple": "~3.0",
"symfony/console": "~2.7|~3.0|~4.0|~5.0", "symfony/console": "~2.7|~3.0|~4.0|~5.0",
"symfony/process": "~2.7|~3.0|~4.0|~5.0", "symfony/process": "~2.7|~3.0|~4.0|~5.0",
@@ -8376,13 +8376,9 @@
{ {
"url": "https://github.com/antonmedv", "url": "https://github.com/antonmedv",
"type": "github" "type": "github"
},
{
"url": "https://www.patreon.com/deployer",
"type": "patreon"
} }
], ],
"time": "2020-04-25T16:05:31+00:00" "time": "2022-08-03T18:09:01+00:00"
}, },
{ {
"name": "deployer/phar-update", "name": "deployer/phar-update",
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-1"> <div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-2">
<f:if condition="{settings.themeKey} == 'ep'"> <f:if condition="{settings.themeKey} == 'ep'">
<f:render partial="Disrupter/Outlines" <f:render partial="Disrupter/Outlines"
section="Top1" section="Top1"
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="bg-ep-primary-dark my-1"> <div class="bg-ep-primary-dark my-2">
<f:render partial="Disrupter/Outlines" <f:render partial="Disrupter/Outlines"
section="Top1" section="Top1"
arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/> arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-1"> <div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-2">
<f:render partial="Disrupter/Outlines" <f:render partial="Disrupter/Outlines"
section="Top1" section="Top1"
arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{background} == 1 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/> arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{background} == 1 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-1"> <div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-2">
<f:if condition="{settings.themeKey} == 'ep'"> <f:if condition="{settings.themeKey} == 'ep'">
<f:render partial="Disrupter/Outlines" <f:render partial="Disrupter/Outlines"
section="Top1" section="Top1"
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
+1 -1
View File
@@ -3,7 +3,7 @@
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-1"> <div class="{ep:themeClasses(classes: '{ep: \'bg-ep-primary-dark\', sbw: \'bg-sbw-primary-80\', snz: \'bg-snz-primary-80\', uch: \'bg-uch-primary-80\'}', key: settings.themekey)} my-2">
<f:render partial="Disrupter/Outlines" <f:render partial="Disrupter/Outlines"
section="Top1" section="Top1"
arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/> arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html
+3 -3
View File
@@ -7,12 +7,12 @@
<f:alias map="{image: slide.image.0}"> <f:alias map="{image: slide.image.0}">
<f:if condition="{image}"> <f:if condition="{image}">
<picture> <picture>
<source srcset="{f:uri.image(image: image, width: '1370', cropVariant: 'sliderPageHeader')}" media="(min-width: 768px)"> <source srcset="{f:uri.image(image: image, width: '1370')}" media="(min-width: 768px)">
<source srcset="{f:uri.image(image: image, height: '320', cropVariant: 'sliderPageHeader')}" media="(max-width: 767px)"> <source srcset="{f:uri.image(image: image, height: '320', cropVariant: 'mobile')}" media="(max-width: 767px)">
<f:image class="block w-full h-full object-cover" <f:image class="block w-full h-full object-cover"
image="{image}" image="{image}"
height="320" height="320"
cropVariant="sliderPageHeader" cropVariant="mobile"
alt="{image.alternative}"/> alt="{image.alternative}"/>
</picture> </picture>
</f:if> </f:if>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
+26 -6
View File
@@ -7,12 +7,32 @@
<a href="{f:uri.typolink(parameter: region.detailPage)}" title="{region.name}" class="flex flex-col"> <a href="{f:uri.typolink(parameter: region.detailPage)}" title="{region.name}" class="flex flex-col">
<div class="relative"> <div class="relative">
{ep:icon(icon: 'flag-{region.country.code -> f:format.case(mode: \'lower\')}', class: 'w-8 h-6 absolute top-0 left-0')} {ep:icon(icon: 'flag-{region.country.code -> f:format.case(mode: \'lower\')}', class: 'w-8 h-6 absolute top-0 left-0')}
<ep:lazyLoadImage image="{region.teaserImages.0}" <f:alias map="{teaserImage: region.teaserImage, defaultImage: region.images.0}">
loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png" <f:if condition="{teaserImage}">
class="block w-full h-full object-cover" <f:then>
width="400c" <f:variable name="image" value="{teaserImage}"/>
height="300c" </f:then>
alt="{region.name}" /> <f:else>
<f:variable name="image" value="{defaultImage}"/>
</f:else>
</f:if>
<f:if condition="{image}">
<f:then>
<ep:lazyLoadImage image="{image}"
loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
class="block w-full h-full object-cover"
width="400c"
height="300c"
alt="{region.name}" />
</f:then>
<f:else>
<f:image src="EXT:ep_theme/Resources/Public/images/lazy.png"
width="400c"
height="300c"
alt="{region.name}"/>
</f:else>
</f:if>
</f:alias>
</div> </div>
<div class="flex-1 py-4 px-2 bg-white border-l border-r border-zinc-200" data-rte-content> <div class="flex-1 py-4 px-2 bg-white border-l border-r border-zinc-200" data-rte-content>
<span class="headline--3 mb-4"> <span class="headline--3 mb-4">