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

Merge branch 'feature/updates-2019-11-27' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-11-27 13:06:30 +01:00
parent 04633145c3 748cdc3090
commit e1daa8d8e9
9 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_events/Resources/Private/Assets/js/components/OfferTeasers.vue
-14
View File
@@ -2,13 +2,6 @@
<div class="offerlist"> <div class="offerlist">
<div class="offerlist__filterpanel"> <div class="offerlist__filterpanel">
<form class="form form--horizontal"> <form class="form form--horizontal">
<div class="form__item">
<label>{{ language.type }}</label>
<select v-model="filterSettings.travelType" @change="load" class="form__field">
<option value="0">{{ language.noSelection }}</option>
<option v-for="item in filterOptions.travelTypes" :value="item.type">{{ item.label }}</option>
</select>
</div>
<div class="form__item"> <div class="form__item">
<label>{{ language.destination }}</label> <label>{{ language.destination }}</label>
<select v-model="filterSettings.locationType" @change="load" class="form__field"> <select v-model="filterSettings.locationType" @change="load" class="form__field">
@@ -24,13 +17,6 @@
</option> </option>
</select> </select>
</div> </div>
<div class="form__item">
<label>{{ language.hotel }}</label>
<select v-model="filterSettings.hotelType" @change="load" class="form__field">
<option value="0">{{ language.noSelection }}</option>
<option v-for="item in filterOptions.hotelTypes" :value="item.type">{{ item.label }}</option>
</select>
</div>
<div class="form__item"> <div class="form__item">
<label>{{ language.programme }}</label> <label>{{ language.programme }}</label>
<select v-model="filterSettings.activityType" @change="load" class="form__field"> <select v-model="filterSettings.activityType" @change="load" class="form__field">
public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_base.scss
+12
View File
@@ -71,6 +71,18 @@ b, strong {
a { a {
color: inherit; color: inherit;
&.anchor {
display: block;
height: 0;
padding-top: $header-height-mobile;
margin-top: -$header-height-mobile;
@include mq($from: tablet) {
padding-top: $header-height-desktop;
margin-top: -$header-height-desktop;
}
}
} }
ul { ul {
public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_page-footer.scss
+1 -2
View File
@@ -29,8 +29,7 @@
text-align: center; text-align: center;
padding: 0 8px 32px; padding: 0 8px 32px;
@include mq($from: mobile) { &--align-left {
width: percentage(1/3);
text-align: left; text-align: left;
} }
public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_variables.scss
+4
View File
@@ -15,3 +15,7 @@ $content-width-max: 1280px;
// Default padding // Default padding
$padding-default: 16px; $padding-default: 16px;
// Header height
$header-height-mobile: 100px;
$header-height-desktop: 160px;
public/typo3conf/ext/ep_events/Resources/Private/Language/de.locallang.xlf
+1 -1
View File
@@ -158,7 +158,7 @@
<target>Unterkunft</target> <target>Unterkunft</target>
</trans-unit> </trans-unit>
<trans-unit id="tx_epevents.label.configurator_distance"> <trans-unit id="tx_epevents.label.configurator_distance">
<target>Ziel</target> <target>Reiseziel</target>
</trans-unit> </trans-unit>
<trans-unit id="tx_epevents.label.configurator_pax"> <trans-unit id="tx_epevents.label.configurator_pax">
<target>Teilnehmerzahl</target> <target>Teilnehmerzahl</target>
public/typo3conf/ext/ep_events/Resources/Private/Layouts/FluidStyledContent/Default.html
+1
View File
@@ -1 +1,2 @@
<a class="anchor" id="c{data.uid}"></a>
<f:render section="Main" optional="true"/> <f:render section="Main" optional="true"/>
public/typo3conf/ext/ep_events/Resources/Private/Partials/PageFooter.html
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="page-footer__inner"> <div class="page-footer__inner">
<v:menu pageUid="{settings.footerNavPid}" levels="3" expandAll="1" useShortcutUid="1"> <v:menu pageUid="{settings.footerNavPid}" levels="3" expandAll="1" useShortcutUid="1">
<f:for each="{menu}" as="topItem"> <f:for each="{menu}" as="topItem">
<div class="page-footer__column page-footer__column--hide-mobile"> <div class="page-footer__column page-footer__column--align-left">
<h3 class="page-footer__column__title"><a class="page-footer__link" href="{topItem.link}" <h3 class="page-footer__column__title"><a class="page-footer__link" href="{topItem.link}"
title="{topItem.title}">{topItem.title}</a></h3> title="{topItem.title}">{topItem.title}</a></h3>
<ul class="plain-list"> <ul class="plain-list">
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss
+1
View File
@@ -2,3 +2,4 @@ $color-brand-primary: #9f0d4c;
$color-button-background: #ffe900; $color-button-background: #ffe900;
$color-button-foreground: $color-brand-primary; $color-button-foreground: $color-brand-primary;
$color-button-booking: $color-label-success;
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_unichamp.scss
+1
View File
@@ -2,3 +2,4 @@ $color-brand-primary: #b5e400;
$color-button-background: #19a3dc; $color-button-background: #19a3dc;
$color-button-foreground: white; $color-button-foreground: white;
$color-button-booking: $color-label-success;