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

Merge branch 'hotfix/ul-ol-fix'

Browse Source
This commit is contained in:
Björn Fromme
2020-11-03 14:00:50 +01:00
parent bd1cb97369 ba3fe90cd1
commit 647a566c96
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss
+4
View File
@@ -1,3 +1,7 @@
ul {
@apply list-disc;
}
ol {
@apply list-decimal;
}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss
+4
View File
@@ -98,6 +98,10 @@ ul {
}
}
ol {
padding: 0 0 0 18px;
}
// Images
.scale {
width: 100%;
public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Details.html
+3 -3
View File
@@ -2,7 +2,7 @@
<f:then><div class="ep-headbar">{city.name}</div></f:then>
<f:else><h2>Ort</h2></f:else>
</f:if>
<div class="city-details city-details--description">
<div class="city-details city-details--description" data-rte-content>
{city.description -> f:format.html()}
</div>
<f:if condition="{city.images -> f:count()} > 0">
@@ -13,7 +13,7 @@
<f:then><div class="ep-headbar">Party</div></f:then>
<f:else><h2>Party</h2></f:else>
</f:if>
<div class="city-details city-details--party">
<div class="city-details city-details--party" data-rte-content>
{city.party -> f:format.html()}
</div>
</f:if>
@@ -22,7 +22,7 @@
<f:then><div class="ep-headbar">Freizeitangebot</div></f:then>
<f:else><h2>Freizeitangebot</h2></f:else>
</f:if>
<div class="city-details city-details--leisure">
<div class="city-details city-details--leisure" data-rte-content>
{city.leisure -> f:format.html()}
</div>
</f:if>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Details.html
+4 -4
View File
@@ -4,7 +4,7 @@
<f:then><div class="ep-headbar">{hotelTitle}</div></f:then>
<f:else><h1>{hotelTitle}</h1></f:else>
</f:if>
<div class="hotel-details hotel-details--description">
<div class="hotel-details hotel-details--description" data-rte-content>
{hotel.description -> f:format.html()}
</div>
<f:if condition="{teasers}">
@@ -45,7 +45,7 @@
<f:then><div class="ep-headbar">Ausstattung</div></f:then>
<f:else><h2>Ausstattung</h2></f:else>
</f:if>
<div class="hotel-details hotel-details--features">
<div class="hotel-details hotel-details--features" data-rte-content>
{hotel.features -> f:format.html()}
</div>
<f:if condition="{hotel.isApartment}">
@@ -66,7 +66,7 @@
<f:else><h2>Zimmerarten</h2></f:else>
</f:if>
</f:if>
<div class="hotel-details hotel-details--roomtypes">
<div class="hotel-details hotel-details--roomtypes" data-rte-content>
{hotel.roomTypes -> f:format.html()}
</div>
<f:if condition="{hotel.additionalInformation}">
@@ -74,7 +74,7 @@
<f:then><div class="ep-headbar">Zusatzinformationen</div></f:then>
<f:else><h2>Zusatzinformationen</h2></f:else>
</f:if>
<div class="hotel-details hotel-details--additional">
<div class="hotel-details hotel-details--additional" data-rte-content>
{hotel.additionalInformation -> f:format.html()}
</div>
</f:if>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Journey/Details.html
+12 -10
View File
@@ -1,13 +1,15 @@
<f:if condition="{bars}">
<div class="ep-headbar">Anreise</div>
</f:if>
<h2>Eigenanreise</h2>
{journey.byCar -> f:format.html()}
<f:if condition="{journey.image}">
<img src="{f:uri.image(image: journey.image, width: '770', height: '430c+100')}"
alt="{journey.image.alternative}" title="{journey.image.title}">
</f:if>
<f:if condition="{journey.byBus}">
<h2>Busanreise</h2>
{journey.byBus -> f:format.html()}
</f:if>
<div data-rte-content>
<h2>Eigenanreise</h2>
{journey.byCar -> f:format.html()}
<f:if condition="{journey.image}">
<img src="{f:uri.image(image: journey.image, width: '770', height: '430c+100')}"
alt="{journey.image.alternative}" title="{journey.image.title}">
</f:if>
<f:if condition="{journey.byBus}">
<h2>Busanreise</h2>
{journey.byBus -> f:format.html()}
</f:if>
</div>
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Details.html
+4 -4
View File
@@ -3,7 +3,7 @@
<f:then><div class="ep-headbar">{region.name -> f:format.raw()}</div></f:then>
<f:else><h2 class="headline headline--secondary headline--has-subline"><span class="headline__subline">Skiurlaub im</span><br>Skigebiet {region.name -> f:format.raw()}</h2></f:else>
</f:if>
<div class="region-details region-details--ski-area">
<div class="region-details region-details--ski-area" data-rte-content>
{region.skiArea -> f:format.html()}
<f:if condition="{teasers}">
<a id="teasers" class="anchor"></a>
@@ -37,12 +37,12 @@
<f:else><h2>{f:if(condition: '{region.season} == "w"', then: 'Skipass', else: 'Highlights')}</h2></f:else>
</f:if>
<f:if condition="{region.skiPass}">
<div class="region-details region-details--skipass">
<div class="region-details region-details--skipass" data-rte-content>
{region.skiPass -> f:format.html()}
</div>
</f:if>
<f:if condition="{region.description}">
<div class="region-details region-details--description">
<div class="region-details region-details--description" data-rte-content>
{region.description -> f:format.html()}
</div>
</f:if>
@@ -51,7 +51,7 @@
<f:then><div class="ep-headbar">Aktuell</div></f:then>
<f:else><h2>Aktuell</h2></f:else>
</f:if>
<div class="region-details region-details--news">
<div class="region-details region-details--news" data-rte-content>
{region.news -> f:format.html()}
</div>
</f:if>