diff --git a/.editorconfig b/.editorconfig index eb2d0f70..378bcee8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,5 +8,5 @@ insert_final_newline = true indent_size = 4 indent_style = space [*.{css,scss}] -indent_size = 2 +indent_size = 4 indent_style = space diff --git a/public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig b/public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig index ff891f00..0766a51b 100644 --- a/public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig +++ b/public/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig @@ -4,10 +4,10 @@ RTE { bodytext { types { text { - preset = dpn + preset = ep-events } textmedia { - preset = dpn + preset = ep-events } } } diff --git a/public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml b/public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml index 4d625865..e853e9e9 100644 --- a/public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml +++ b/public/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml @@ -1,38 +1,39 @@ imports: -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } editor: config: disableNativeSpellChecker: false contentsCss: - - "EXT:ep_events/Resources/Public/css/rte.min.css" + - "EXT:ep_events/Resources/Public/css/rte.css?v=2019.09-06" stylesSet: - - { name: "Button", element: "a", attributes: { 'class': 'button' } } - - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'buttonfull' } } - - { name: "Farbige Bullets", element: "ul", attributes: { 'class': 'coloured-list' } } - - { name: "Fußnote", element: "ul", attributes: { 'class': 'footnote-list' } } + - { name: "Icon", element: "a", attributes: { 'class': 'button button--icon' } } + - { name: "Button", element: "a", attributes: { 'class': 'button' } } + - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'button button--full' } } + - { name: "Farbige Bullets", element: "ul", attributes: { 'class': 'coloured-list' } } + - { name: "Fußnote", element: "ul", attributes: { 'class': 'footnote-list' } } toolbarGroups: - - { name: styles, groups: [ format, styles ] } - - { name: basicstyles, groups: [ basicstyles ] } - - { name: paragraph, groups: [ list] } - - "/" - - { name: links, groups: [ links ] } - - { name: clipboard, groups: [ clipboard, cleanup, undo ] } - - { name: editing, groups: [ spellchecker ] } - - { name: insert, groups: [ insert ] } - - { name: tools, groups: [ table, specialchar ] } - - { name: document, groups: [ mode ] } + - { name: styles, groups: [ format, styles ] } + - { name: basicstyles, groups: [ basicstyles ] } + - { name: paragraph, groups: [ list] } + - "/" + - { name: links, groups: [ links ] } + - { name: clipboard, groups: [ clipboard, cleanup, undo ] } + - { name: editing, groups: [ spellchecker ] } + - { name: insert, groups: [ insert ] } + - { name: tools, groups: [ table, specialchar ] } + - { name: document, groups: [ mode ] } format_tags: "p;h1;h2;h3;h4" removePlugins: - - image + - image removeButtons: - - Anchor - - Underline - - Strike + - Anchor + - Underline + - Strike diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/css/rte.css b/public/typo3conf/ext/ep_events/Resources/Private/Assets/css/rte.css deleted file mode 100644 index 0c869853..00000000 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/css/rte.css +++ /dev/null @@ -1,9 +0,0 @@ -ul.coloured-list { - list-style: circle; -} -ul.footnote-list { - list-style: disc; -} -a.button { - font-weight: 700; -} diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_buttons.scss b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_buttons.scss index 5d36fd2b..3bf7a830 100644 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_buttons.scss +++ b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_buttons.scss @@ -63,4 +63,13 @@ &--full { width: 100%; } + + &--icon { + background-color: $color-brand-primary; + color: white; + @include size(16px); + border-radius: 8px; + line-height: 16px; + font-size: 14px; + } } diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_teasers.scss b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_teasers.scss index 68e78bca..cf3cb4bf 100644 --- a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_teasers.scss +++ b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/_teasers.scss @@ -15,6 +15,10 @@ width: percentage(3/4); padding: 0 16px; + &--clickable { + cursor: pointer; + } + @include mq($until: tablet) { padding-bottom: 16px; } diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss new file mode 100644 index 00000000..9cb44ed2 --- /dev/null +++ b/public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss @@ -0,0 +1,293 @@ +$output-bourbon-deprecation-warnings: false; +@import "~bourbon/app/assets/stylesheets/bourbon"; + +@import "mixins"; +@import "colors"; + +@font-face { + font-family: 'Cairo'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('../fonts/cairo-v2-latin-ext_latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Cairo'), local('Cairo-Regular'), + url('../fonts/cairo-v2-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/cairo-v2-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/cairo-v2-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/cairo-v2-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/cairo-v2-latin-ext_latin-regular.svg#Cairo') format('svg'); /* Legacy iOS */ +} + +@font-face { + font-family: 'Cairo'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('../fonts/cairo-v2-latin-ext_latin-700.eot'); /* IE9 Compat Modes */ + src: local('Cairo Bold'), local('Cairo-Bold'), + url('../fonts/cairo-v2-latin-ext_latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/cairo-v2-latin-ext_latin-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/cairo-v2-latin-ext_latin-700.woff') format('woff'), /* Modern Browsers */ + url('../fonts/cairo-v2-latin-ext_latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/cairo-v2-latin-ext_latin-700.svg#Cairo') format('svg'); /* Legacy iOS */ +} + +$font-main: 'Cairo', $helvetica; + +@font-face { + font-family: 'fontello'; + font-display: swap; + src: url('../fonts/fontello.eot?39986861'); + src: url('../fonts/fontello.eot?39986861#iefix') format('embedded-opentype'), + url('../fonts/fontello.woff2?39986861') format('woff2'), + url('../fonts/fontello.woff?39986861') format('woff'), + url('../fonts/fontello.ttf?39986861') format('truetype'), + url('../fonts/fontello.svg?39986861#fontello') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "fontello"; + font-style: normal; + font-weight: normal; + speak: none; + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .5em; + 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-plus:before { content: '\e800'; } +.icon-minus:before { content: '\e801'; } +.icon-ok:before { content: '\e802'; } +.icon-calendar:before { content: '\e803'; } +.icon_mail_circle:before { content: '\e804'; } +.icon_phone_circle:before { content: '\e805'; } + +body { + font-family: $font-main; + font-weight: 400; + font-size: 16px; +} + +b, strong { + font-weight: 700; +} + +a { + color: inherit; +} + +ul { + margin: 0 0 16px; + padding-left: 24px; + + &.plain-list { + list-style: none; + margin: 0; + padding: 0; + } + + &.inline-list { + & > li { + float: left; + } + } + + &.footnote-list { + list-style: none; + margin: 0; + padding: 0; + font-size: 14px; + padding-left: 16px; + } + + &.coloured-list { + list-style: none; + padding: 0; + line-height: 175%; + + li { + position: relative; + padding-left: 16px; + } + + li::before { + position: absolute; + top: 0; + left: 0; + content: "\25CF"; + font-size: 18px; + @include sectionColoursFromParent(); + } + } +} + +p { + margin: 0 0 24px; + line-height: 175%; + + .lead & { + font-size: 18px; + font-weight: 700; + } +} + +hr { + max-width: 25%; + margin: 32px auto 32px 0; + color: $color-ruler; + background-color: $color-ruler; + height: 1px; + border: none; +} + +h1, +h2, +h3, +.headline--primary, +.headline--secondary { + margin: 0; + padding: 0; + font-weight: 700; +} + +.headline { + @include sectionColoursFromParent(); + + &--icon { + display: flex; + justify-content: flex-start; + align-items: center; + } +} + +.headline--primary, +.headline--secondary { + + .content--sub & { + text-align: center; + } + +} + +h1, +.headline--primary { + font-size: 22px; + line-height: 115%; + text-transform: uppercase; + padding-bottom: 18px; + + span { + font-weight: 400; + } + + .subline, + .topline { + display: block; + font-size: 16px; + line-height: 120%; + color: $color-brand-primary; + text-transform: none; + @include sectionColoursFromParent(); + + &--box { + color: white; + } + } +} + +h2, +.headline--secondary { + font-size: 16px; + line-height: 120%; + padding-bottom: 16px; + font-weight: 400; +} + +h3 { + font-weight: 400; + font-size: 16px; +} + +.headline__icon { + display: block; + width: 80px; + height: auto; + padding-right: 16px; +} + +.button { + display: inline-block; + font-weight: 700; + text-decoration: none; + + &--default { + display: inline-block; + background-color: $color-brand-primary; + color: white; + padding: 4px 16px; + } + + &--page-header { + display: block; + min-width: 186px; + background-color: $color-brand-primary; + color: white; + font-size: 18px; + padding: 0 32px 0 24px; + line-height: 80px; + box-shadow: 8px 8px 8px rgba(black, 0.2); + } + + &--herounit, + &--configurator { + display: block; + min-width: 220px; + text-align: center; + background-color: $color-brand-primary; + @include sectionBackgroundsFromParent(); + color: white; + line-height: 48px; + border: none; + outline: none; + } + + &--configurator { + width: 100%; + display: inline-block; + } + + &--transparent { + padding: 8px 16px; + text-align: center; + border: 1px solid white; + color: white; + + &:hover { + background: white; + color: $color-font-main; + } + } + + &--full { + width: 100%; + } + + &--icon { + background-color: $color-brand-primary; + color: white; + @include size(16px); + border-radius: 8px; + line-height: 16px; + font-size: 14px; + } +} diff --git a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html index 75215c10..1cfed1f4 100644 --- a/public/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html +++ b/public/typo3conf/ext/ep_events/Resources/Private/Templates/Page/OfferEpEvents.html @@ -12,13 +12,13 @@
-
+
-
+
-
+
diff --git a/public/typo3conf/ext/ep_events/ext_localconf.php b/public/typo3conf/ext/ep_events/ext_localconf.php index cec97d1c..c11af6cf 100644 --- a/public/typo3conf/ext/ep_events/ext_localconf.php +++ b/public/typo3conf/ext/ep_events/ext_localconf.php @@ -149,8 +149,7 @@ call_user_func(function() { ] ); - $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_events/Configuration/RTE/Default.yaml'; - $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['dpn'] = 'EXT:ep_events/Configuration/RTE/Default.yaml'; + $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['ep-events'] = 'EXT:ep_events/Configuration/RTE/Default.yaml'; $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['EP.EpEvents'] = \EP\EpEvents\Hooks\Tcemain::class; diff --git a/public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig b/public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig index ff891f00..61737b9f 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig +++ b/public/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig @@ -4,10 +4,10 @@ RTE { bodytext { types { text { - preset = dpn + preset = ep-reisen } textmedia { - preset = dpn + preset = ep-reisen } } } diff --git a/public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml b/public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml index e50e078a..1547585b 100644 --- a/public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml +++ b/public/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml @@ -1,36 +1,36 @@ imports: -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } -- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } + - { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } editor: config: disableNativeSpellChecker: false contentsCss: - - "EXT:ep_theme/Resources/Public/css/rte.css" + - "EXT:ep_theme/Resources/Public/css/rte.css?v=2019.09-06" stylesSet: - - { name: "Button", element: "a", attributes: { 'class': 'button' } } - - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'button button--full' } } + - { name: "Button", element: "a", attributes: { 'class': 'button' } } + - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'button button--full' } } toolbarGroups: - - { name: styles, groups: [ format, styles ] } - - { name: basicstyles, groups: [ basicstyles ] } - - { name: paragraph, groups: [ list] } - - "/" - - { name: links, groups: [ links ] } - - { name: clipboard, groups: [ clipboard, cleanup, undo ] } - - { name: editing, groups: [ spellchecker ] } - - { name: insert, groups: [ insert ] } - - { name: tools, groups: [ table, specialchar ] } - - { name: document, groups: [ mode ] } + - { name: styles, groups: [ format, styles ] } + - { name: basicstyles, groups: [ basicstyles ] } + - { name: paragraph, groups: [ list] } + - "/" + - { name: links, groups: [ links ] } + - { name: clipboard, groups: [ clipboard, cleanup, undo ] } + - { name: editing, groups: [ spellchecker ] } + - { name: insert, groups: [ insert ] } + - { name: tools, groups: [ table, specialchar ] } + - { name: document, groups: [ mode ] } format_tags: "p;h1;h2;h3;h4" removePlugins: - - image + - image removeButtons: - - Anchor - - Underline - - Strike + - Anchor + - Underline + - Strike diff --git a/public/typo3conf/ext/ep_theme/ext_localconf.php b/public/typo3conf/ext/ep_theme/ext_localconf.php index f8344070..695e51af 100644 --- a/public/typo3conf/ext/ep_theme/ext_localconf.php +++ b/public/typo3conf/ext/ep_theme/ext_localconf.php @@ -10,7 +10,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php'][ $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = 'tx_eptheme_slides'; $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; -$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['dpn'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; +$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['ep-reisen'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'EP.EpTheme', diff --git a/webpack.config.js b/webpack.config.js index 4aa6d448..b18a9b52 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -42,7 +42,7 @@ Encore .setOutputPath('./public/typo3conf/ext/ep_events/Resources/Public/') .setPublicPath('/typo3conf/ext/ep_events/Resources/Public/') .addEntry('main', './public/typo3conf/ext/ep_events/Resources/Private/Assets/js/main.js') - .addStyleEntry('rte', './public/typo3conf/ext/ep_events/Resources/Private/Assets/css/rte.css') + .addStyleEntry('rte', './public/typo3conf/ext/ep_events/Resources/Private/Assets/scss/rte.scss') .enableSassLoader() .enableVueLoader() .autoProvidejQuery()