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

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2022-06-07 12:06:51 +02:00
parent e8f2bf3a96 a421cb2b5e
commit b7f0b6b714
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_herounit.scss
+1 -1
View File
@@ -11,7 +11,7 @@
@apply text-white; @apply text-white;
&--skipass { &--skipass {
@apply bg-badge-gradient py-8 px-2; @apply bg-badge-gradient ser:bg-ser-secondary py-8 px-2;
} }
&--custom { &--custom {
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html
+12 -12
View File
@@ -1,8 +1,8 @@
<div class="space-y-2"> <div class="space-y-2">
<div class="odd:bg-gray-50 p-4" data-rte-content> <div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined"> <h2 class="headline--underlined">
Konzept Konzept
</div> </h2>
{product.conceptDescription -> f:format.html()} {product.conceptDescription -> f:format.html()}
</div> </div>
<f:if condition="{product.calendarHotel} && {hotel.groupsPriceConfigs}"> <f:if condition="{product.calendarHotel} && {hotel.groupsPriceConfigs}">
@@ -16,16 +16,16 @@
</button> </button>
</f:if> </f:if>
<div class="odd:bg-gray-50 p-4" data-rte-content> <div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined" data-rte-content> <h2 class="headline--underlined" data-rte-content>
Verpflegung Verpflegung
</div> </h2>
{product.boardDescription -> f:format.html()} {product.boardDescription -> f:format.html()}
</div> </div>
<f:if condition="{product.includedServices}"> <f:if condition="{product.includedServices}">
<div class="relative odd:bg-gray-50 p-4" data-rte-content> <div class="relative odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined"> <h2 class="headline--underlined">
Inklusivleistungen Inklusivleistungen
</div> </h2>
{product.includedServices -> f:format.html()} {product.includedServices -> f:format.html()}
<f:if condition="{product.minPrice}"> <f:if condition="{product.minPrice}">
<div class="absolute top-0 right-0 mt-4 mr-4 w-32 transform rotate-6"> <div class="absolute top-0 right-0 mt-4 mr-4 w-32 transform rotate-6">
@@ -47,25 +47,25 @@
</f:if> </f:if>
<f:if condition="{product.additionalServices}"> <f:if condition="{product.additionalServices}">
<div class="odd:bg-gray-50 p-4" data-rte-content> <div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined"> <h2 class="headline--underlined">
Zusatzleistungen Zusatzleistungen
</div> </h2>
{product.additionalServices -> f:format.html()} {product.additionalServices -> f:format.html()}
</div> </div>
</f:if> </f:if>
<f:if condition="{product.programmeDescription}"> <f:if condition="{product.programmeDescription}">
<div class="odd:bg-gray-50 p-4" data-rte-content> <div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined"> <h2 class="headline--underlined">
Programm Programm
</div> </h2>
{product.programmeDescription -> f:format.html()} {product.programmeDescription -> f:format.html()}
</div> </div>
</f:if> </f:if>
<f:if condition="{product.skiPassDescription}"> <f:if condition="{product.skiPassDescription}">
<div class="odd:bg-gray-50 p-4" data-rte-content> <div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined"> <h2 class="headline--underlined">
Skipass, Kurse, Leihmaterial Skipass, Kurse, Leihmaterial
</div> </h2>
{product.skiPassDescription -> f:format.html()} {product.skiPassDescription -> f:format.html()}
</div> </div>
</f:if> </f:if>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
+1 -1
View File
@@ -93,7 +93,7 @@
</f:if> </f:if>
</ul> </ul>
<div class="pt-8"> <div class="pt-8">
<div class="bg-ep-primary-light text-white font-bold px-4 py-1 group-hover:bg-ep-secondary transition-colors"> <div class="bg-ep-primary-light ser:bg-ser-secondary text-white font-bold px-4 py-1 group-hover:bg-ep-secondary ser:group-hover:bg-ser-primary transition-colors">
<div class="lg:inline-block"> <div class="lg:inline-block">
ab <span class="product-teaser__price mx-1">{minPrice} €</span> ab <span class="product-teaser__price mx-1">{minPrice} €</span>
</div> </div>