diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_rte-content.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_rte-content.scss index e3e87526..0ff04697 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_rte-content.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_rte-content.scss @@ -11,5 +11,5 @@ p { } a:not(.button) { - @apply text-ep-primary sbw:text-sbw-primary-dark; + @apply text-ep-primary-light sbw:text-sbw-primary-dark; } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss index 753df416..d37d5519 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss @@ -1,6 +1,6 @@ h1, .headline--primary { - @apply block text-3xl md:text-4xl text-gray-800 font-normal; + @apply block text-3xl md:text-4xl text-gray-800 font-bold; } h2, @@ -19,12 +19,12 @@ h4, } .headline--underlined:after { - @apply block border-b-4 border-ep-primary sbw:border-sbw-primary pb-4 mb-4 -mt-2 w-20; + @apply block border-b-4 border-ep-primary-light sbw:border-sbw-primary pb-4 mb-4 -mt-2 w-20; content: ''; } .subline { - @apply block text-sm md:text-base uppercase font-light tracking-widest leading-6 md:leading-10 pb-2 md:pb-0; + @apply block text-sm md:text-base font-normal leading-6 md:leading-10 pb-2 md:pb-0; } // Lists @@ -34,7 +34,7 @@ h4, li { @apply relative pl-8; &:before { - @apply absolute left-0 top-0 w-6 h-6 text-ep-primary text-lg; + @apply absolute left-0 top-0 w-6 h-6 text-ep-primary-dark text-lg; font-family: 'fontello'; content: '\e800'; } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss index 7755f384..f05be3f1 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss @@ -2,7 +2,7 @@ @apply inline-flex items-center justify-center space-x-2 px-4 py-2 md:px-8 cursor-pointer; @apply uppercase leading-none text-center; @apply transition-colors outline-none focus:outline-none; - @apply bg-ep-secondary text-white; + @apply bg-ep-primary-light text-white; @apply sbw:bg-sbw-secondary; @apply snz:bg-snz-secondary; @apply uch:bg-uch-secondary; @@ -26,7 +26,7 @@ &--light { @apply bg-white border-2; @apply font-bold; - @apply border-ep-primary text-ep-primary; + @apply border-ep-primary-light text-ep-primary; @apply sbw:bg-white sbw:border-sbw-primary sbw:text-sbw-primary; @apply snz:bg-white snz:border-snz-primary snz:text-snz-primary; @apply uch:bg-white uch:border-uch-primary uch:text-uch-primary; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_contact-bar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_contact-bar.scss index f2f7824a..c390f1ac 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_contact-bar.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_contact-bar.scss @@ -8,7 +8,7 @@ } .contact-bar__item { - @apply flex-1 text-white py-2 bg-ep-primary border-r border-white last:border-0; + @apply flex-1 text-white py-2 bg-ep-primary-light border-r border-white last:border-0; @screen md { @apply flex flex-none items-start transition-transform duration-300 ease-in-out p-1 shadow-md focus:text-white border-0; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_herounit.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_herounit.scss index 8398e429..f8d69be8 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_herounit.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_herounit.scss @@ -21,18 +21,12 @@ } .herounit__badge { - @apply absolute; + @apply absolute bg-badge-gradient text-white py-8 px-2; &--skipass { top: 0; right: 16px; - width: 60px; - height: auto; - @screen md { - width: 100px; - } @screen lg { - width: auto; right: 90px; } } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_misc.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_misc.scss index 6b65a0c9..b408f97f 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_misc.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_misc.scss @@ -1,3 +1,3 @@ .headerbar { - @apply bg-ep-primary sbw:bg-sbw-primary text-white uppercase font-semibold py-2 px-4 mb-4; + @apply bg-ep-primary-light sbw:bg-sbw-primary text-white uppercase font-semibold py-2 px-4 mb-4; } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html index 9bf5d8a9..c182f287 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html @@ -4,7 +4,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"> -
+
-
+
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Outlines.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Outlines.html index 038144cc..d9d3bfd0 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Outlines.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Outlines.html @@ -5,42 +5,42 @@ - + - + - + - + - + - + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html index 91939007..b25ec760 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html @@ -3,7 +3,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"> -
+
-
+
-
+
-
+
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html index a09e0f86..c245353f 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html @@ -45,9 +45,9 @@
- - + +

Ski-
Pass

+

inklusive

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html index 4cf06886..fd5cc68d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html @@ -3,7 +3,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
+
@@ -59,18 +59,14 @@
  • - - - + {f:if(condition: '{season} == "s"', then: 'Bergbahnticket', else: 'Skipass')}
  • - - - + {product.feature} @@ -78,9 +74,7 @@
  • - - - + {board} @@ -88,7 +82,7 @@
-
+
ab {minPrice} €
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html index aa7b9260..30a36c7d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/FilterPanel.html @@ -3,7 +3,7 @@ xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
-
-
+
Inklusivleistungen {hotel.name} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html index 0dee6890..a312c283 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/DaytripRooms.html @@ -61,7 +61,7 @@
-
+
Inklusivleistungen diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html index 78a0a70c..8d2e0249 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html @@ -17,7 +17,7 @@
-
+
Optionale Zusatzleistungen diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html index 76cabdb7..14e398f1 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Searchbar/Index.html @@ -40,7 +40,7 @@ data-datepicker-min-date-value="{f:format.date(date: 'now', format: 'Y-m-d')}" data-action="collapse:click:outside->collapse#close searchbar:input@window->collapse#close" data-collapse-collapsed-value="true"> -
+
-
+
-
+
-
+
-
+
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html index d55f9062..6d3d6885 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html @@ -12,7 +12,7 @@
diff --git a/tailwind.config.js b/tailwind.config.js index 3dc5a766..8cbf6a18 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -50,6 +50,7 @@ module.exports = { overlay: { black: tinycolor('#000000').setAlpha(0.85).toRgbString(), white: tinycolor('#ffffff').setAlpha(0.85).toRgbString(), + 'white-50': tinycolor('#ffffff').setAlpha(0.5).toRgbString(), }, concept: { default: '#3d8ccb', @@ -111,6 +112,9 @@ module.exports = { 'overlay-secondary': tinycolor('#a6c62c').setAlpha(0.55).toRgbString(), }, }, + backgroundImage: { + 'badge-gradient': 'linear-gradient(120deg, rgba(150,1,103,1) 0%, rgba(158,3,106,1) 40%, rgba(250,26,140,1) 100%)', + }, height: { '128': '32rem', },