diff --git a/public/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php b/public/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php index 40e6ce57..466ce5a8 100644 --- a/public/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php +++ b/public/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php @@ -79,8 +79,7 @@ class SliderProcessor implements DataProcessorInterface if ($slides) { $fileRepository = GeneralUtility::makeInstance(FileRepository::class); - foreach ($slides as $slide) - { + foreach ($slides as $slide) { $processedData['slides'][$slide['uid']] = $slide; $processedData['slides'][$slide['uid']]['image'] = $fileRepository->findByRelation( 'tx_eptheme_domain_model_slide', @@ -90,6 +89,10 @@ class SliderProcessor implements DataProcessorInterface } } + if (1 === count($slides)) { + $processedData['slide'] = reset($processedData['slides']); + } + return $processedData; } @@ -101,8 +104,7 @@ class SliderProcessor implements DataProcessorInterface $rootlineUtility = new RootlineUtility($GLOBALS['TSFE']->id); $rootline = $rootlineUtility->get(); - foreach ($rootline as $parentPage) - { + foreach ($rootline as $parentPage) { if ((int) $parentPage['tx_eptheme_slides'] > 0) { return (int) $parentPage['uid']; } diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig index e225cce7..19530704 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig +++ b/public/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig @@ -123,6 +123,7 @@ TCEFORM { fe_group.disabled = 1 editlock.disabled = 1 sys_language_uid.disabled = 1 + tx_yoastseo_linking_suggestions.disabled = 1 } pages { diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript index b9645d88..a678cfe6 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript +++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript @@ -2,6 +2,7 @@ plugin.tx_news { view { + layoutRootPaths.100 = EXT:ep_theme/Resources/Private/Layouts/News/ templateRootPaths.100 = EXT:ep_theme/Resources/Private/Templates/News/ partialRootPaths.100 = EXT:ep_theme/Resources/Private/Partials/News/ widget.GeorgRinger\News\ViewHelpers\Widget\PaginateViewHelper.templateRootPath = EXT:ep_theme/Resources/Private/Templates/News/ diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/config.json b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/config.json new file mode 100755 index 00000000..d919c921 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/config.json @@ -0,0 +1,34 @@ +{ + "name": "", + "css_prefix_text": "icon-", + "css_use_suffix": false, + "hinting": true, + "units_per_em": 1000, + "ascent": 850, + "glyphs": [ + { + "uid": "12f4ece88e46abd864e40b35e05b11cd", + "css": "ok", + "code": 59392, + "src": "fontawesome" + }, + { + "uid": "9f7e588c66cfd6891f6f507cf6f6596b", + "css": "phone", + "code": 59393, + "src": "fontawesome" + }, + { + "uid": "ccc2329632396dc096bb638d4b46fb98", + "css": "mail-alt", + "code": 61664, + "src": "fontawesome" + }, + { + "uid": "43ab845088317bd348dee1d975700c48", + "css": "ok-circled", + "code": 59394, + "src": "fontawesome" + } + ] +} \ No newline at end of file diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff new file mode 100755 index 00000000..b7992628 Binary files /dev/null and b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff differ diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff2 b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff2 new file mode 100755 index 00000000..d6e0fd40 Binary files /dev/null and b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/fonts/fontello.woff2 differ diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js index c0b4846d..139597f9 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_styles.js @@ -1,4 +1,2 @@ -require('font-awesome/css/font-awesome.min.css') -require('cookieconsent/build/cookieconsent.min.css') diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js deleted file mode 100644 index 5bea8243..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -// Main app -require('./_app'); - -// Main and vendor styles -require('./_styles'); - -// Brand specific styles -require('../scss/main_boarderweek.scss'); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/search-bar.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/search-bar.js index 38ca84d7..219ecfee 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/search-bar.js +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/search-bar.js @@ -6,6 +6,7 @@ export default props => ({ loading: false, picker: null, uri: props.uri, + sticky: props.sticky || false, searchParams: props.initialSearchParams, filterOptions: props.initialFilterOptions, datePresets: props.datePresets, diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js index 4d64984d..7982173d 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js @@ -1,8 +1,5 @@ // Main app require('./_app'); -// Main and vendor styles -require('./_styles'); - // Main styles require('../scss/main.scss'); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js deleted file mode 100644 index 1f72ae8e..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -// Main app -require('./_app'); - -// Main and vendor styles -require('./_styles'); - -// Brand specific styles -require('../scss/main_snowzone.scss'); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js deleted file mode 100644 index fc45ff8c..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -// Main app -require('./_app'); - -// Main and vendor styles -require('./_styles'); - -// Brand specific styles -require('../scss/main_unichamp.scss'); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss deleted file mode 100644 index 01313ed0..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_rte-content.scss +++ /dev/null @@ -1,7 +0,0 @@ -ul { - @apply list-disc; -} - -ol { - @apply list-decimal; -} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_fonts.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_fonts.scss index b055ca2a..1495f919 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_fonts.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_fonts.scss @@ -41,3 +41,42 @@ url('../../fonts/lato-v17-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ url('../../fonts/lato-v17-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } + +/* Fontello icons */ +@font-face { + font-family: 'fontello'; + font-weight: normal; + font-style: normal; + font-display: swap; + src: local(''), + url('../../fonts/fontello.woff2') format('woff2'), + url('../../fonts/fontello.woff') format('woff'); +} + +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: never; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + + font-variant: normal; + text-transform: none; + + line-height: 1em; + + margin-left: .2em; + + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-check:before { content: '\e800'; } +.icon-phone:before { content: '\e801'; } +.icon-check-circle:before { content: '\e802'; } +.icon-mail:before { content: '\f0e0'; } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_images.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_images.scss new file mode 100644 index 00000000..07abad95 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_images.scss @@ -0,0 +1,9 @@ +.scale, +.img-responsive { + @apply block w-full h-auto; +} + +img.lazyloading { + background: url(../../images/lazy.png) no-repeat top center; +} + 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 new file mode 100644 index 00000000..bca2b860 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_rte-content.scss @@ -0,0 +1,11 @@ +ul { + @apply list-disc pl-4 mb-8; +} + +ol { + @apply list-decimal pl-4 mb-8; +} + +p { + @apply mb-8; +} 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 new file mode 100644 index 00000000..dc41e50d --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss @@ -0,0 +1,48 @@ +h1, +.headline--primary { + @apply block text-3xl md:text-4xl text-gray-800 font-normal; +} + +h2, +.headline--secondary { + @apply block text-2xl md:text-3xl text-gray-800 font-normal; +} + +h3, +.headline--3 { + @apply block text-xl md:text-2xl text-gray-800 font-normal; +} + +h4, +.headline--4 { + @apply block md:text-lg text-gray-800 font-normal uppercase; +} + +.headline--underlined:after { + @apply block border-b-4 border-ep-primary sbw:border-sbw-primary pb-4 mb-4 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; +} + +// Lists +.check-list { + @apply list-none p-0; + + li { + @apply relative pl-8; + &:before { + @apply absolute left-0 top-0 w-6 h-6 text-ep-primary text-lg; + font-family: 'fontello'; + content: '\e800'; + } + } + + &--inverted { + li:before { + content: '\e802'; + } + } +} 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 new file mode 100644 index 00000000..c444a620 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss @@ -0,0 +1,25 @@ +.button { + @apply inline-block p-4 md:px-8; + @apply uppercase leading-none text-center outline-none focus:outline-none; + @apply transition-colors; + @apply bg-ep-secondary text-white; + + &--active, + &--secondary { + @apply bg-ep-primary; + } + + &:hover { + @apply bg-ep-primary-dark; + } + + &--light { + @apply bg-white text-ep-primary border-2 border-ep-primary rounded; + @apply font-bold; + + &:hover, + &.active { + @apply bg-white border-ep-secondary text-ep-secondary; + } + } +} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss new file mode 100644 index 00000000..4d8c8925 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_cookie-consent.scss @@ -0,0 +1,18 @@ +@import "~cookieconsent/build/cookieconsent.min.css"; + +.cc-window.cc-floating { + @apply p-8; +} + +.cc-message, +.cc-btn { + font-size: 75% !important; + + @screen sm { + font-size: 100% !important; + } +} + +.cc-link { + font-size: 100% !important; +} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss index 761dd5a3..abeb8de4 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_searchbar.scss @@ -1,8 +1,12 @@ .searchbar { @apply hidden relative lg:block lg:container lg:px-0 -mt-20 mb-8; @apply bg-gradient-to-tr from-ep-primary-light via-ep-primary-medium to-ep-primary-dark; -} -.searchbar--fixed { - @apply fixed z-40 top-0 left-0 mt-8 mb-0 inset-x-0 max-w-full; + &--fixed { + @apply m-0 max-w-full; + } + + &--sticky { + @apply fixed z-50 top-0 left-0 mt-8 mb-0 inset-x-0 max-w-full shadow-lg; + } } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss index 969fa393..3dfcc6e2 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/main.scss @@ -4,13 +4,15 @@ @layer base { @import "base/fonts"; + @import "base/typography"; + @import "base/images"; [x-cloak] { @apply hidden; } [data-rte-content] { - @import "rte-content"; + @import "base/rte-content"; } // LEGACY FROM HERE @@ -28,51 +30,51 @@ @import "~bourbon/app/assets/stylesheets/bourbon"; @import "remix/breakpoints"; @import "remix/mixins"; - @import "remix/base"; + //@import "remix/base"; @import "remix/badges"; - @import "remix/buttons"; + //@import "remix/buttons"; //@import "remix/area-nav"; - @import "remix/pagehead"; + //@import "remix/pagehead"; @import "remix/slider"; @import "remix/header"; //@import "remix/herounit"; //@import "remix/calendar"; - @import "remix/partnerlogos"; + //@import "remix/partnerlogos"; //@import "remix/osm-map"; //@import "remix/video"; //@import "remix/newsletterform"; - @import "remix/layout"; + //@import "remix/layout"; @import "remix/teaserbox"; @import "remix/searchresult"; //@import "remix/tables"; @import "remix/product"; //@import "remix/socialmedia"; //@import "remix/datepicker"; - @import "remix/sidebar"; - @import "remix/blog"; + //@import "remix/sidebar"; + //@import "remix/blog"; //@import "remix/forms"; //@import "remix/contactnav"; - @import "remix/faq"; - @import "remix/destination-pulldown"; - @import "remix/watchlist"; - @import "remix/calculator"; + //@import "remix/faq"; + //@import "remix/destination-pulldown"; + //@import "remix/watchlist"; + //@import "remix/calculator"; // core config //@import "fonts"; - @import "base"; - @import "btn"; - @import "input"; + //@import "base"; + //@import "btn"; + //@import "input"; //@import "breadcrumb"; - @import "modal"; + //@import "modal"; //components //@import "mainnavi"; //@import "footer"; //@import "searchbar"; @import "searchbox"; - @import "newsletter"; - @import "disturber"; - @import "product"; + //@import "newsletter"; + //@import "disturber"; + //@import "product"; @import "sidebar"; @import "subpage"; @import "searchpage"; @@ -81,6 +83,7 @@ @layer components { @import "~microtip/microtip"; + @import "components/cookie-consent"; @import "components/background"; @import "components/calendar"; @import "components/searchbar"; @@ -92,6 +95,7 @@ @import "components/contact-bar"; @import "components/misc"; @import "components/tiles"; + @import "components/buttons" } @layer utilities { @@ -99,6 +103,9 @@ .max-w-screen-2xl { max-width: 1440px; } + .max-w-1\/2 { + max-width: 50%; + } } .has-validation-error input { @apply text-red-500 border-red-500; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss index 4e58fcad..0efe21b3 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss @@ -26,220 +26,220 @@ // } //} -a { - color: $color-brand-primary; +//a { +// color: $color-brand-primary; +// +// &:active, +// &:hover { +// color: $color-brand-primary; +// text-decoration:none; +// outline: none; +// } +// +// &:focus { +// color: $color-font-base; +// text-decoration:none; +// outline: none; +// } +// +// &:visited { +// outline: none; +// } +// +// .alert & { +// color: inherit; +// font-weight: $font-weight-bold; +// text-decoration: underline; +// } +//} - &:active, - &:hover { - color: $color-brand-primary; - text-decoration:none; - outline: none; - } - - &:focus { - color: $color-font-base; - text-decoration:none; - outline: none; - } - - &:visited { - outline: none; - } - - .alert & { - color: inherit; - font-weight: $font-weight-bold; - text-decoration: underline; - } -} - -s { - opacity: 0.75; -} +//s { +// opacity: 0.75; +//} // Block elements -ul { - padding: 0 0 0 18px; +//ul { +// padding: 0 0 0 18px; - &.plain-list { - list-style: none; - padding: 0; - } - &.check-list { - list-style: none; - padding: 0; + //&.plain-list { + // list-style: none; + // padding: 0; + //} + //&.check-list { + // list-style: none; + // padding: 0; + // + // li { + // position: relative; + // padding-left: 24px; + // } + // + // li::before { + // position: absolute; + // top: 0; + // left: 0; + // font-family: 'FontAwesome'; + // content: "\f00c"; + // font-size: 18px; + // color: $color-brand-primary; + // } + // + // &--inverted { + // li::before { + // content: "\f058"; + // } + // } + //} + //&.inline-list { + // display: flex; + // > li { + // flex: 1; + // } + //} +//} - li { - position: relative; - padding-left: 24px; - } - - li::before { - position: absolute; - top: 0; - left: 0; - font-family: 'FontAwesome'; - content: "\f00c"; - font-size: 18px; - color: $color-brand-primary; - } - - &--inverted { - li::before { - content: "\f058"; - } - } - } - &.inline-list { - display: flex; - > li { - flex: 1; - } - } -} - -ol { - padding: 0 0 0 18px; -} +//ol { +// padding: 0 0 0 18px; +//} // Images -.scale { - width: 100%; - height: auto; - display: block; -} +//.scale { +// width: 100%; +// height: auto; +// display: block; +//} -// Headlines -h1 { - font-size: 28px; - font-weight: 400; - color: black; +//// Headlines +//h1 { +// font-size: 28px; +// font-weight: 400; +// color: black; +// +// @include mq($from: tablet) { +// font-size: 36px; +// } +//} +// +//h2 { +// font-size: 24px; +// font-weight: 400; +// color: black; +// +// @include mq($from: tablet) { +// font-size: 32px; +// } +//} +// +//h3 { +// font-size: 20px; +// font-weight: 400; +// color: black; +// +// @include mq($from: tablet) { +// font-size: 26px; +// } +//} +// +//h4 { +// font-size: 16px; +// font-weight: 400; +// color: black; +// text-transform: uppercase; +// margin-bottom: 10px; +// +// @include mq($from: tablet) { +// font-size: 18px; +// } +//} +// +//.headline { +// display: block; +// +// &--primary { +// @extend h1; +// } +// +// &--secondary { +// @extend h2; +// } +// +// &--3 { +// @extend h3; +// } +// +// &--4 { +// @extend h4; +// } +// +// &--disturber { +// color: white; +// text-align: center; +// text-transform: none; +// margin-bottom: 20px; +// font-weight: 700; +// +// @include mq($from: tablet) { +// text-transform: uppercase; +// text-align: left; +// } +// +// &-large { +// @include mq($from: desktop) { +// text-align: right; +// } +// } +// } +// +// &--underlined:after{ +// content:''; +// display:block; +// border-bottom:4px solid $color-brand-primary; +// padding-bottom: 30px; +// margin-bottom: 35px; +// width: 80px; +// } +// +// &--teaser { +// min-height: 54px; +// } +// +// &--light { +// font-weight: 300; +// } +// +// &--footer { +// color: white; +// font-weight: 700; +// } +// +// &--nav { +// display: inline-block; +// color: white; +// +// @include mq($from: tablet) { +// color: black; +// } +// } +//} +// +//.headline__subline { +// display: block; +// font-size: 14px; +// text-transform: uppercase; +// font-weight: 300; +// letter-spacing: 2px; +// line-height: 24px; +// padding-bottom: 8px; +// +// @include mq($from: tablet) { +// line-height: 40px; +// padding-bottom: 0; +// font-size: 16px; +// } +//} - @include mq($from: tablet) { - font-size: 36px; - } -} - -h2 { - font-size: 24px; - font-weight: 400; - color: black; - - @include mq($from: tablet) { - font-size: 32px; - } -} - -h3 { - font-size: 20px; - font-weight: 400; - color: black; - - @include mq($from: tablet) { - font-size: 26px; - } -} - -h4 { - font-size: 16px; - font-weight: 400; - color: black; - text-transform: uppercase; - margin-bottom: 10px; - - @include mq($from: tablet) { - font-size: 18px; - } -} - -.headline { - display: block; - - &--primary { - @extend h1; - } - - &--secondary { - @extend h2; - } - - &--3 { - @extend h3; - } - - &--4 { - @extend h4; - } - - &--disturber { - color: white; - text-align: center; - text-transform: none; - margin-bottom: 20px; - font-weight: 700; - - @include mq($from: tablet) { - text-transform: uppercase; - text-align: left; - } - - &-large { - @include mq($from: desktop) { - text-align: right; - } - } - } - - &--underlined:after{ - content:''; - display:block; - border-bottom:4px solid $color-brand-primary; - padding-bottom: 30px; - margin-bottom: 35px; - width: 80px; - } - - &--teaser { - min-height: 54px; - } - - &--light { - font-weight: 300; - } - - &--footer { - color: white; - font-weight: 700; - } - - &--nav { - display: inline-block; - color: white; - - @include mq($from: tablet) { - color: black; - } - } -} - -.headline__subline { - display: block; - font-size: 14px; - text-transform: uppercase; - font-weight: 300; - letter-spacing: 2px; - line-height: 24px; - padding-bottom: 8px; - - @include mq($from: tablet) { - line-height: 40px; - padding-bottom: 0; - font-size: 16px; - } -} - -strong { - &.uppercase { - text-transform: uppercase; - } -} +//strong { +// &.uppercase { +// text-transform: uppercase; +// } +//} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_blog.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_blog.scss index 72e77ca9..ca3af233 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_blog.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_blog.scss @@ -1,60 +1,60 @@ -.blog-entry { - width: 100%; - &:not(:last-child) { - margin-bottom: 20px; - } -} +//.blog-entry { +// width: 100%; +// &:not(:last-child) { +// margin-bottom: 20px; +// } +//} -.blog-entry__info { - margin: 0 0 20px; -} +//.blog-entry__info { +// margin: 0 0 20px; +//} -.blog-entry__inner { - display: flex; - flex-direction: column; +//.blog-entry__inner { +// display: flex; +// flex-direction: column; +// +// @include mq($from: tablet) { +// flex-direction: row; +// } +//} - @include mq($from: tablet) { - flex-direction: row; - } -} +//.blog-entry__image { +// width: 100%; +// margin-bottom: 8px; +// +// @include mq($from: tablet) { +// width: percentage(1/2); +// } +//} -.blog-entry__image { - width: 100%; - margin-bottom: 8px; +//.blog-entry__info { +// font-style: italic; +// font-size: 90%; +//} - @include mq($from: tablet) { - width: percentage(1/2); - } -} +//.blog-entry__headline { +// margin-top: 0; +//} -.blog-entry__info { - font-style: italic; - font-size: 90%; -} - -.blog-entry__headline { - margin-top: 0; -} - -.blog-entry__teaser { - width: 100%; - - @include mq($from: tablet) { - padding-left: 16px; - width: percentage(1/2); - } - - p { - margin-bottom: 16px; - - &:last-child { - margin-bottom: 8px; - } - - } -} - -.blog-tags { - list-style: none; - padding: 0; -} +//.blog-entry__teaser { +// width: 100%; +// +// @include mq($from: tablet) { +// padding-left: 16px; +// width: percentage(1/2); +// } +// +// p { +// margin-bottom: 16px; +// +// &:last-child { +// margin-bottom: 8px; +// } +// +// } +//} +// +//.blog-tags { +// list-style: none; +// padding: 0; +//} diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss index 0c978a59..b4c9eae5 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_pagehead.scss @@ -1,94 +1,94 @@ -.pagehead { - position: relative; - @include container($header-width-max); - margin-bottom: 20px; - height: 320px; +//.pagehead { +// position: relative; +// @include container($header-width-max); +// margin-bottom: 20px; +// height: 320px; +// +// @include mq($from: tablet) { +// height: 360px; +// } +// +// @include mq($from: desktop) { +// margin-top: 80px; +// +// .ep-core-events & { +// margin-top: 160px; +// } +// } +// +// .frontpage & { +// height: 380px; +// +// @include mq($from: tablet) { +// height: 410px; +// } +// +// @include mq($from: desktop) { +// height: 580px; +// margin-bottom: 0; +// margin-top: 120px; +// } +// } +// +// +// .subpage & { +// @include mq($from: desktop) { +// margin-top: 185px; +// } +// } +// +// &--searchresult { +// height: 10px; +// +// @include mq($from: tablet) { +// height: 160px; +// } +// } +// +//} - @include mq($from: tablet) { - height: 360px; - } +//.pagehead__image { +// position: relative; +// background-size: cover; +// background-position: center center; +// background-repeat: no-repeat; +// height: 240px; +// +// @include mq($from: tablet) { +// height: 100%; +// } +// +// .pagehead--searchresult & { +// display: none; +// height: 100%; +// +// @include mq($from: tablet) { +// display: block; +// } +// } +// +//} - @include mq($from: desktop) { - margin-top: 80px; +//.pagehead__main { +// position: absolute; +// left: 0; +// bottom: 0; +// padding: 0 16px; +// width: 100%; +// @include mq($from: tablet) { +// bottom: 50%; +// transform: translateY(50%); +// } +//} - .ep-core-events & { - margin-top: 160px; - } - } - - .frontpage & { - height: 380px; - - @include mq($from: tablet) { - height: 410px; - } - - @include mq($from: desktop) { - height: 580px; - margin-bottom: 0; - margin-top: 120px; - } - } - - - .subpage & { - @include mq($from: desktop) { - margin-top: 185px; - } - } - - &--searchresult { - height: 10px; - - @include mq($from: tablet) { - height: 160px; - } - } - -} - -.pagehead__image { - position: relative; - background-size: cover; - background-position: center center; - background-repeat: no-repeat; - height: 240px; - - @include mq($from: tablet) { - height: 100%; - } - - .pagehead--searchresult & { - display: none; - height: 100%; - - @include mq($from: tablet) { - display: block; - } - } - -} - -.pagehead__main { - position: absolute; - left: 0; - bottom: 0; - padding: 0 16px; - width: 100%; - @include mq($from: tablet) { - bottom: 50%; - transform: translateY(50%); - } -} - -.pagehead__inner { - @include mq($from: desktop) { - @include container(960px); - } - @include mq($from: wide) { - @include container(); - } -} +//.pagehead__inner { +// @include mq($from: desktop) { +// @include container(960px); +// } +// @include mq($from: wide) { +// @include container(); +// } +//} .pagehead__badge { position: absolute; diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/News/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/News/Detail.html new file mode 100644 index 00000000..6a3dab78 --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/News/Detail.html @@ -0,0 +1,9 @@ + + +
+ +
+ + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html index 5b7cfa07..443b86d6 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/Subpage.html @@ -4,14 +4,14 @@ -
- - +
+ + diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html index de9d464c..815c3cf7 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarLeft.html @@ -4,14 +4,14 @@ -
- - +
+ +
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html index 17547346..e3015395 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Layouts/Page/SubpageSidebarRight.html @@ -4,14 +4,14 @@ -
- - +
+ +
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 58a87ee7..d5d0a3ab 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,13 +4,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
- +
@@ -24,13 +18,13 @@
Ihr habt Fragen?
Wir helfen euch gerne!
- {settings.phoneNumber} + {settings.phoneNumber}
- {data.subheadline} -
{data.headline}
+ {data.subheadline} +
{data.headline}
{data.text -> f:format.html()}
@@ -49,6 +43,7 @@
+
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 3b68183b..5615bd3a 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 @@ -3,7 +3,9 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> -
+
+ +
{data.headline}
{data.text -> f:format.html()}
+ +
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 new file mode 100644 index 00000000..038144cc --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Outlines.html @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 bb1329c3..4113eaa1 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,12 +3,7 @@ xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
- +
@@ -24,14 +19,14 @@
- + {data.headline} {data.text -> f:format.html()}
- + {button.container.label} @@ -40,12 +35,7 @@
- +
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 810569e6..3b47693c 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Footer.html @@ -3,26 +3,22 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - - - - - -
-
+
+ +
-