Merge branch 'develop'

This commit is contained in:
Björn Fromme
2022-06-07 12:06:51 +02:00
3 changed files with 14 additions and 14 deletions
@@ -11,7 +11,7 @@
@apply text-white;
&--skipass {
@apply bg-badge-gradient py-8 px-2;
@apply bg-badge-gradient ser:bg-ser-secondary py-8 px-2;
}
&--custom {
@@ -1,8 +1,8 @@
<div class="space-y-2">
<div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined">
<h2 class="headline--underlined">
Konzept
</div>
</h2>
{product.conceptDescription -> f:format.html()}
</div>
<f:if condition="{product.calendarHotel} && {hotel.groupsPriceConfigs}">
@@ -16,16 +16,16 @@
</button>
</f:if>
<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
</div>
</h2>
{product.boardDescription -> f:format.html()}
</div>
<f:if condition="{product.includedServices}">
<div class="relative odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined">
<h2 class="headline--underlined">
Inklusivleistungen
</div>
</h2>
{product.includedServices -> f:format.html()}
<f:if condition="{product.minPrice}">
<div class="absolute top-0 right-0 mt-4 mr-4 w-32 transform rotate-6">
@@ -47,25 +47,25 @@
</f:if>
<f:if condition="{product.additionalServices}">
<div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined">
<h2 class="headline--underlined">
Zusatzleistungen
</div>
</h2>
{product.additionalServices -> f:format.html()}
</div>
</f:if>
<f:if condition="{product.programmeDescription}">
<div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined">
<h2 class="headline--underlined">
Programm
</div>
</h2>
{product.programmeDescription -> f:format.html()}
</div>
</f:if>
<f:if condition="{product.skiPassDescription}">
<div class="odd:bg-gray-50 p-4" data-rte-content>
<div class="headline--3 headline--underlined">
<h2 class="headline--underlined">
Skipass, Kurse, Leihmaterial
</div>
</h2>
{product.skiPassDescription -> f:format.html()}
</div>
</f:if>
@@ -93,7 +93,7 @@
</f:if>
</ul>
<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">
ab <span class="product-teaser__price mx-1">{minPrice} €</span>
</div>