diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript index 7ee93804..145490e2 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Breadcrumb.typoscript @@ -3,12 +3,11 @@ lib.breadcrumb { special = rootline special.range = 0|-1 1 = TMENU - 1.wrap = + 1.wrap = 1.NO { stdWrap.htmlSpecialChars = 1 - ATagParams = class="text-zinc-400" ATagTitle.field = nav_title // title - linkWrap = |/|*||*| | + linkWrap = |/|*||*| | doNotLinkIt = |*| 0 |*| 1 } } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_components.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_components.scss index df105d6e..8f95ef24 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_components.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_components.scss @@ -10,5 +10,4 @@ @import "components/misc"; @import "components/searchbar"; @import "components/teaser"; - @import "components/tiles"; } 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 ca624e8d..35521ede 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 @@ -22,7 +22,7 @@ p { } a:not(.button):not(.rte-button):not(.rte-button--full) { - @apply text-ep-primary-dark sbw:text-sbw-primary-dark; + @apply underline text-ep-primary-dark sbw:text-sbw-primary-dark; .bg-brand-gradient & { @apply text-white underline; 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 36452c87..e7e20744 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 @@ -1,7 +1,7 @@ .button { @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 transition-colors outline-none; &--small { @apply px-2 py-1 md:px-4 text-xs sm:text-sm; @@ -20,6 +20,7 @@ @apply uch:bg-uch-secondary; @apply ser:bg-ser-secondary; @apply hover:bg-ep-secondary; + @apply hover:text-gray-900; @apply sbw:hover:bg-sbw-primary-dark; @apply snz:hover:bg-snz-primary-dark; @apply suz:hover:bg-suz-primary-dark; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tiles.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tiles.scss deleted file mode 100644 index 6424e150..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_tiles.scss +++ /dev/null @@ -1,47 +0,0 @@ -.tiles { - @apply container lg:max-w-screen-2xl; -} - -.tiles__grid { - @apply grid grid-cols-1 lg:grid-cols-12 lg:grid-rows-3 lg:grid-flow-col gap-4 lg:gap-1; - @apply lg:h-128; - @apply bg-white; -} - -.tiles__tile { - @apply bg-cover bg-center h-32 lg:h-auto; -} - -.tiles__link { - @apply relative w-full h-full flex items-center justify-center; - @apply leading-none text-white hover:text-white text-2xl font-bold uppercase text-shadow break-normal; - - &:before { - @apply block absolute top-0 left-0 inset-0 w-full h-full z-20; - @apply border-0 border-white; - @apply transition-all; - content: ""; - } - - &:hover:before { - @apply mt-4 ml-4; - @apply border-2; - width: calc(100% - theme('spacing.8')); - height: calc(100% - theme('spacing.8')); - } - - &:after { - @apply block absolute top-0 left-0 inset-0 w-full h-full z-10; - @apply transition-all; - content:""; - } - - &:hover:after { - @apply sbw:bg-sbw-overlay/55 uch:bg-uch-overlay/55; - } -} - -.tiles__label { - @apply block relative z-20; - @apply text-center; -} 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 98eabcf1..aed2eb21 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 @@ -9,7 +9,7 @@ section="Top1" arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/> -
+
@@ -36,12 +36,8 @@
- - {data.subheadline} - - - {data.headline} - + {data.subheadline} + {data.headline}
{data.bodytext -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html index 769f4193..a76eb08a 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/LastChance.html @@ -8,8 +8,12 @@ section="Top1" arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{data.tx_eptheme_background} == 1 || {data.tx_eptheme_background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/>
-
{data.headline}
-
{data.text -> f:format.html()}
+
+ {data.headline} +
+
+ {data.text -> f:format.html()} +
{data.flexForm.buttons -> v:iterator.first() -> v:variable.set(name: 'button')} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html index cb391533..20f8a8a4 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Reminder.html @@ -4,8 +4,10 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
-
{data.headline}
+
+
+ {data.headline} +
@@ -17,8 +19,8 @@
-
-
{data.text -> f:format.html()}
+
+ {data.text -> f:format.html()}
{button.container.label -> f:format.raw()} 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 5e7d5371..f6302e07 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 @@ -7,7 +7,7 @@ -
+
@@ -20,9 +20,7 @@
- - {data.headline} - + {data.headline} {data.text -> f:format.html()}
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 012e8a02..f2ce4681 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 @@ -10,7 +10,7 @@ section="Top1" arguments="{classes: 'hidden md:block -translate-y-2 {f:if(condition: \'{background} == 1 || {background} == 3\', then: \'text-ep-primary-bg\', else: \'text-white\')}'}"/> -
+
@@ -36,13 +36,9 @@
-
- - {data.subheader} - - - {data.header} - +
+ {data.subheader} + {data.header}
{data.bodytext -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html index d3b4cb3c..4cce0653 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html @@ -3,12 +3,18 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
-
{data.header}
-
{data.bodytext -> f:format.html()}
+
+
+ {data.header} +
+
+ {data.bodytext -> f:format.html()} +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html index 7cad0d86..9bdc5b85 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Reminder.html @@ -4,8 +4,10 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
-
{data.header}
+
+
+ {data.header} +
@@ -17,8 +19,10 @@
-
-
{data.bodytext -> f:format.html()}
+
+
+ {data.bodytext -> f:format.html()} +
{button.container.label -> f:format.raw()} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html index 6c95c9bf..51ec58e6 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html @@ -7,7 +7,7 @@ -
+
@@ -20,9 +20,7 @@
- - {data.header} - + {data.header} {data.bodytext -> f:format.html()}
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 203f4402..a1b96f33 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSliderSmall.html @@ -20,12 +20,12 @@
- +
{slide.headline} - - +
+
{slide.subline} - +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html index dd21aba5..bbf3d855 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Textmedia/LinkPanel.html @@ -5,61 +5,56 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers"> -
-
+
+
-
- - +
+ +
{images.0.title -> f:format.raw()} - +
+
-
- - +
+ +
{images.1.title -> f:format.raw()} - +
+
-
- - +
+ +
{images.4.title -> f:format.raw()} - +
+
-
- - +
+ +
{images.2.title -> f:format.raw()} - +
+
-
- - +
+ +
{images.3.title -> f:format.raw()} - +
+
diff --git a/tailwind.config.js b/tailwind.config.js index 91c01d77..21bbb812 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -71,15 +71,15 @@ module.exports = { primary: '#3d8ccb', secondary: '#f9c700', 'primary-bg': '#ebf3fa', - 'primary-light': '#0080ff', + 'primary-light': '#0070E0', 'primary-medium': '#165883', 'primary-dark': '#18527b', pink: '#fa1a8c', }, sbw: { - primary: '#f0bc44', - secondary: '#ee525a', - 'primary-dark': '#c7a20c', + primary: '#B3820F', + secondary: '#E91C26', + 'primary-dark': '#8D7207', overlay: '#c20000', }, snz: { @@ -88,14 +88,14 @@ module.exports = { 'primary-dark': '#82c3c6', }, uch: { - primary: '#a6c62c', + primary: '#677A1A', secondary: '#19a3dc', - 'primary-dark': '#a6c62c', - overlay: '#a6c62c', + 'primary-dark': '#677A1A', + overlay: '#677A1A', }, ser: { primary: '#006fb6', - secondary: '#e85243', + secondary: '#DE2C1B', 'primary-light': '#04A4CC', }, suz: {