diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/background/winter.jpg b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/background/winter.jpg index 8b52996d..1a96b542 100644 Binary files a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/background/winter.jpg and b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/background/winter.jpg differ 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 c0d3b3aa..e3e87526 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 @@ -9,3 +9,7 @@ ol { p { @apply mb-4; } + +a:not(.button) { + @apply text-ep-primary sbw:text-sbw-primary-dark; +} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_background.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_background.scss index 71673e9b..a379bb41 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_background.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_background.scss @@ -1,6 +1,27 @@ .bg-winter { - @apply bg-cover bg-no-repeat bg-center bg-ep-primary; + @apply relative bg-cover bg-no-repeat bg-center; background-image: url(../../images/background/winter.jpg); + z-index: -5; + + &:before { + @apply block absolute top-0 left-0 inset-0 opacity-80; + @apply bg-ep-primary sbw:bg-sbw-primary; + z-index: -10; + content: ''; + } +} + +.bg-pattern { + @apply relative bg-cover bg-no-repeat bg-center; + background-image: url(../../images/background/pattern.jpg); + z-index: -5; + + &:before { + @apply block absolute top-0 left-0 inset-0 opacity-80; + @apply bg-ep-primary sbw:bg-sbw-primary; + z-index: -10; + content: ''; + } } .bg-header-season-w { 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 8c0fa64c..084f373e 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 @@ -3,14 +3,17 @@ @apply uppercase leading-none; @apply transition-colors outline-none focus:outline-none; @apply bg-ep-secondary border-2 border-ep-secondary text-white; + @apply sbw:bg-sbw-secondary sbw:border-sbw-secondary; &--active, &--secondary { @apply bg-ep-primary border-ep-primary; + @apply sbw:bg-sbw-primary sbw:border-sbw-primary; } &:hover { @apply bg-ep-primary-dark border-ep-primary-dark; + @apply sbw:bg-sbw-primary-dark sbw:border-sbw-primary-dark; } &--light { 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 5b06d0e5..0dd03b08 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,46 +4,64 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
- -
+ + + +
- - - {image.alternative} - - - - - -
-
Ihr habt Fragen?
Wir helfen euch gerne!
- {settings.phoneNumber} + -
- {data.subheadline} -
{data.headline}
- {data.text -> f:format.html()} -
- -
- - -
- - {button.container.label} - -
-
+ + {data.subheadline} + + + {data.headline} + +
+ {data.bodytext -> f:format.html()} +
+ +
+ + + {button.container.label} +
-
+
- + + +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html index 01d40586..3ba8b0dd 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html @@ -5,13 +5,16 @@
- - diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html index ebcdaf86..2ac58540 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/EventDisturber.html @@ -1,16 +1,34 @@ -{namespace v=FluidTYPO3\Vhs\ViewHelpers} -
-
-
{headline -> f:format.raw()}
-
-
    - -
  • {listItem -> f:format.raw()}
  • -
    -
-
-
-
+ + +
+
+
+
+ {headline -> f:format.raw()} +
+
+
    + +
  • + + + + {listItem -> f:format.raw()} +
  • +
    +
+
+ +
+
+
+ + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html index 756913a0..ccf18a89 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html @@ -4,8 +4,10 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
- -
+ + + +
@@ -95,7 +97,7 @@
-
+
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 03c4e1e2..3f964a94 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html @@ -22,7 +22,7 @@
-
+
{slide.headline} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html index e80efd41..737e4940 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html @@ -17,7 +17,7 @@
-
+
{slide.headline} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html index 967f07b5..da68ca36 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html @@ -13,13 +13,13 @@ - - - @@ -34,7 +34,9 @@
- Jetzt buchen + + Jetzt buchen + ausgebucht diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html index 20a506a0..1c0e463a 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/SubpageHeader.html @@ -16,7 +16,7 @@
-
+
{topline} diff --git a/tailwind.config.js b/tailwind.config.js index 56201723..dc2c16a1 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -67,7 +67,7 @@ module.exports = { 'sbw': { 'primary': '#f0bc44', 'secondary': '#ee525a', - 'primary-dark': '#f0bc44', + 'primary-dark': '#c7a20c', 'primary-10': tinycolor('#f0bc44').setAlpha(0.1).toRgbString(), 'primary-80': tinycolor('#f0bc44').setAlpha(0.8).toRgbString(), 'overlay-secondary': tinycolor('#c20000').setAlpha(0.55).toRgbString(),
+ Zimmertyp + Preis/Pers. + inkl.