diff --git a/.editorconfig b/.editorconfig index 14b9126..1abcd4f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -44,6 +44,7 @@ indent_size = 4 [*.md] indent_style = space indent_size = 4 +trim_trailing_whitespace = false # ReST-Files [*.rst] diff --git a/Build/StyleSheets/Theme/_variables.scss b/Build/StyleSheets/Theme/_variables.scss index 4a4e02e..86ff151 100644 --- a/Build/StyleSheets/Theme/_variables.scss +++ b/Build/StyleSheets/Theme/_variables.scss @@ -1,3 +1,5 @@ // // Variables // +$body-bg : gray; +$body-color: green; diff --git a/Build/StyleSheets/Theme/theme.scss b/Build/StyleSheets/Theme/theme.scss deleted file mode 100644 index 5c34ad1..0000000 --- a/Build/StyleSheets/Theme/theme.scss +++ /dev/null @@ -1,9 +0,0 @@ -// -// Variables -// -@import "variables"; - -// -// Import needed Bootstrap Package Files -// -@import "../../../../../bootstrap_package/Resources/Public/Scss/Theme/theme"; diff --git a/Build/StyleSheets/rte.scss b/Build/StyleSheets/rte.scss new file mode 100644 index 0000000..d5d4e81 --- /dev/null +++ b/Build/StyleSheets/rte.scss @@ -0,0 +1,37 @@ +@charset "utf-8"; + +@import "Bootstrap/functions"; + +@import "Theme/variables"; + +@import "Bootstrap/variables"; +@import "Bootstrap/mixins"; +@import "Bootstrap/reboot"; +@import "Bootstrap/type"; + +// *************************************** +// rte styles +// *************************************** + +body.cke_editable.cke_contents_ltr { + margin : auto; + padding : rem-calc(10 20); + color : $body-color; + font-family : $font-family-base; +} + +p { + color : $body-color; +} + +h1, +h2, +h3, +h4, +h5 { + color : $headings-color; +} + +.text-highlight { + color : $primary; +} diff --git a/Build/StyleSheets/styles.scss b/Build/StyleSheets/styles.scss index 3283df9..64f0546 100644 --- a/Build/StyleSheets/styles.scss +++ b/Build/StyleSheets/styles.scss @@ -1,2 +1,15 @@ +@import "Bootstrap/functions"; + +@import "Theme/variables"; + +@import "Bootstrap/variables"; +@import "Bootstrap/mixins"; @import "Bootstrap/reboot"; -@import "Bootstrap/bootstrap-grid.scss"; + +@import "Bootstrap/grid"; +@import "Bootstrap/utilities/display"; +@import "Bootstrap/utilities/flex"; +@import "Bootstrap/utilities/spacing"; + +// Bootstrap Optional +@import "Bootstrap/type"; diff --git a/Build/tsconfig.json b/Build/tsconfig.json index cc63766..aa6def9 100644 --- a/Build/tsconfig.json +++ b/Build/tsconfig.json @@ -5,11 +5,11 @@ "sourceMap": true, "outDir": "./compiled/js/", "allowSyntheticDefaultImports": true, - "rootDir": "./Build/TypeScript", + "rootDir": "./TypeScript", }, "include": [ - "./Build/TypeScript/*" + "./TypeScript/*" ], "exclude": [ diff --git a/Build/webpack.config.js b/Build/webpack.config.js index 48d9eca..dfbd600 100644 --- a/Build/webpack.config.js +++ b/Build/webpack.config.js @@ -8,7 +8,8 @@ module.exports = ( env, argv ) => { let config = { entry: { default: './TypeScript/app.ts', - styles: './StyleSheets/styles.scss' + styles: './StyleSheets/styles.scss', + rte: './StyleSheets/rte.scss' }, resolve: { extensions: [ '.ts', '.js' ] @@ -19,7 +20,13 @@ module.exports = ( env, argv ) => { }, plugins: [ new MiniCssExtractPlugin({ - filename: '../StyleSheets/[name].css' + filename: ({chunk}) => { + console.log(chunk.runtime); + if (chunk.runtime == "rte") { + return '../StyleSheets/Backend/[name].css'; + } + return '../StyleSheets/[name].css'; + } }) ], cache: { @@ -52,6 +59,7 @@ module.exports = ( env, argv ) => { use: [{ loader: MiniCssExtractPlugin.loader, options: { + } }, { loader: 'css-loader' diff --git a/Configuration/Yaml/Form/DefaultSetup.yaml b/Configuration/Yaml/Form/DefaultSetup.yaml new file mode 100644 index 0000000..358d04f --- /dev/null +++ b/Configuration/Yaml/Form/DefaultSetup.yaml @@ -0,0 +1,17 @@ +TYPO3: + CMS: + Form: + persistenceManager: + allowSaveToExtensionPaths: true + allowedExtensionPaths: + 10: EXT:sitepackage/Resources/Private/Forms/ + + prototypes: + standard: + formElementsDefinition: + Form: + renderingOptions: + translation: + translationFile: + - 'EXT:form/Resources/Private/Language/locallang.xlf' + - 'EXT:sitepackage/Resources/Private/Language/locallang.xlf' diff --git a/Configuration/Yaml/RTE/DefaultSetup.yaml b/Configuration/Yaml/RTE/DefaultSetup.yaml new file mode 100644 index 0000000..2af2065 --- /dev/null +++ b/Configuration/Yaml/RTE/DefaultSetup.yaml @@ -0,0 +1,26 @@ +# Load default processing options +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" } + +# For complete documentation see http://docs.ckeditor.com/#!/api/CKEDITOR.config +editor: + config: + height: 400 + contentsCss: ["EXT:rte_ckeditor/Resources/Public/Css/contents.css", "EXT:sitepackage/Resources/Public/StyleSheets/Build/rte.css"] + format_tags: "p;h2;h3;h4;h5" + + toolbar: + - [ 'Undo', 'Redo' ] + - [ 'Format', 'Styles' ] + - [ 'RemoveFormat' ] + - [ 'Link', 'Unlink' ] + - [ 'Cut', 'Copy', 'PasteText', ] + - [ 'NumberedList', 'BulletedList', 'Table', 'SpecialChar'] + - [ 'Bold', 'Italic' ] + - [ 'Subscript', 'Superscript' ] + - [ 'Source', 'Maximize' ] + + removePlugins: + - image diff --git a/README.md b/README.md index af900a8..7608ddc 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,12 @@ Sitepackage for the project "Sitepackage" ============================================================== Add some explanation here. + + +# Build Assets +to build Assets +```sh +cd Build +npm install +npm run watch +``` diff --git a/Resources/Private/Forms/contact.form.yaml b/Resources/Private/Forms/contact.form.yaml new file mode 100644 index 0000000..c2696b5 --- /dev/null +++ b/Resources/Private/Forms/contact.form.yaml @@ -0,0 +1,54 @@ +renderingOptions: + submitButtonLabel: Senden +type: Form +identifier: Kontakt +label: Kontakt +prototypeName: standard +finishers: + - + options: + subject: '[Website] - Kontaktformular' + recipientAddress: info@chrosey.de + recipientName: 'Christian Seyfferth' + senderAddress: info@chrosey.de + senderName: 'Webmailer' + replyToAddress: '' + carbonCopyAddress: '' + blindCarbonCopyAddress: '' + format: html + attachUploads: 'true' + translation: + language: '' + identifier: EmailToReceiver +renderables: + - + renderingOptions: + previousButtonLabel: 'vorheriger Schritt' + nextButtonLabel: 'nächster Schritt' + type: Page + identifier: page-1 + label: + renderables: + - + defaultValue: '' + type: Text + identifier: Name + label: Name + - + defaultValue: '' + type: Text + identifier: Email + label: E-Mail + properties: + fluidAdditionalAttributes: + required: required + validators: + - + identifier: NotEmpty + - + identifier: EmailAddress + - + defaultValue: '' + type: Textarea + identifier: Message + label: Nachricht