Merge branch 'release/2020.02-01'

This commit is contained in:
Björn Fromme
2020-02-04 16:54:20 +01:00
54 changed files with 4519 additions and 2876 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ additional_hostnames:
- ski-wochenenden
- schnee-event
additional_fqdns: []
nfs_mount_enabled: false
nfs_mount_enabled: true
provider: default
omit_containers: [dba]
use_dns_when_possible: true
+1
View File
@@ -25,6 +25,7 @@
"league/period": "^4.9",
"lochmueller/staticfilecache": "^10.2",
"pixelant/pxa-social-feed": "^2.0",
"ssch/typo3-encore": "^2.0",
"symfony/http-client": "^4.3",
"symfony/options-resolver": "^4.2",
"symfony/property-access": "^4.3",
Generated
+302 -54
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "8d24d6aa5cf407f4ae9811bc6a781623",
"content-hash": "9e1be2cab97408fbcbe09fa4a4286a55",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -842,16 +842,16 @@
},
{
"name": "gridelementsteam/gridelements",
"version": "9.4.1",
"version": "9.4.2",
"source": {
"type": "git",
"url": "https://gitlab.com/coderscare/gridelements.git",
"reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f"
"reference": "66f4945ef942944fb33bcc2c777a4f20af07c802"
},
"dist": {
"type": "zip",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f",
"reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f",
"url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=66f4945ef942944fb33bcc2c777a4f20af07c802",
"reference": "66f4945ef942944fb33bcc2c777a4f20af07c802",
"shasum": ""
},
"require": {
@@ -881,7 +881,7 @@
"TYPO3 CMS",
"grids"
],
"time": "2020-01-17T16:30:24+00:00"
"time": "2020-02-02T15:41:04+00:00"
},
{
"name": "guzzlehttp/guzzle",
@@ -1263,16 +1263,16 @@
},
{
"name": "kigkonsult/icalcreator",
"version": "v2.29.18",
"version": "v2.29.21",
"source": {
"type": "git",
"url": "https://github.com/iCalcreator/iCalcreator.git",
"reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0"
"reference": "c9ac2c29b5e2e291f53705f5c9dcec539f48ead4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/3687fe06deab48e889eae8afd1d31d201eb2b8a0",
"reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0",
"url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/c9ac2c29b5e2e291f53705f5c9dcec539f48ead4",
"reference": "c9ac2c29b5e2e291f53705f5c9dcec539f48ead4",
"shasum": ""
},
"require": {
@@ -1299,7 +1299,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"LGPL-3.0-or-later"
"lgpl-3.0"
],
"authors": [
{
@@ -1309,13 +1309,16 @@
],
"description": "iCalcreator is the PHP implementation of rfc2445/rfc5545, management of calendar information",
"keywords": [
"alarm",
"calendar",
"daylight",
"event",
"management",
"rfc2445",
"rfc5545",
"rfc6321",
"standard",
"todo",
"vCalendar",
"valarm",
"vevent",
@@ -1324,7 +1327,7 @@
"vtimezone",
"vtodo"
],
"time": "2019-09-04T00:00:00+00:00"
"time": "2020-01-31T20:03:53+00:00"
},
{
"name": "league/csv",
@@ -1905,6 +1908,55 @@
],
"time": "2018-10-30T17:12:04+00:00"
},
{
"name": "psr/link",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/link.git",
"reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/link/zipball/eea8e8662d5cd3ae4517c9b864493f59fca95562",
"reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Link\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for HTTP links",
"keywords": [
"http",
"http-link",
"link",
"psr",
"psr-13",
"rest"
],
"time": "2016-10-28T16:06:13+00:00"
},
{
"name": "psr/log",
"version": "1.0.2",
@@ -1992,6 +2044,70 @@
"description": "A polyfill for getallheaders.",
"time": "2019-03-08T08:55:37+00:00"
},
{
"name": "ssch/typo3-encore",
"version": "v2.0.1",
"source": {
"type": "git",
"url": "https://github.com/sabbelasichon/typo3_encore.git",
"reference": "b7c734ddbb81295813ecb08627dd57a597067ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sabbelasichon/typo3_encore/zipball/b7c734ddbb81295813ecb08627dd57a597067ae1",
"reference": "b7c734ddbb81295813ecb08627dd57a597067ae1",
"shasum": ""
},
"require": {
"php": ">=7.2.0 <7.4",
"symfony/asset": "^5.0",
"symfony/web-link": "^4.3",
"typo3/cms-core": "^9.5 || ^10.2"
},
"replace": {
"typo3-ter/typo3-encore": "self.version"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.0",
"nimut/testing-framework": "^4.0 || dev-master",
"phpstan/phpstan": "^0.9 || ^0.10"
},
"type": "typo3-cms-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0.0-dev"
},
"typo3/cms": {
"extension-key": "typo3_encore",
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
}
},
"autoload": {
"psr-4": {
"Ssch\\Typo3Encore\\": "Classes"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "Sebastian Schreiber",
"email": "[email protected]",
"homepage": "http://www.schreibersebastian.de",
"role": "Developer"
}
],
"description": "Use Webpack Encore in TYPO3 Context",
"homepage": "http://www.schreibersebastian.de",
"keywords": [
"encore",
"webpack"
],
"time": "2020-01-21T12:51:46+00:00"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v5.4.12",
@@ -2047,17 +2163,73 @@
"time": "2018-07-31T09:26:32+00:00"
},
{
"name": "symfony/cache",
"version": "v5.0.3",
"name": "symfony/asset",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a"
"url": "https://github.com/symfony/asset.git",
"reference": "447190a24309da88f816313824d85c303035f86b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a",
"reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a",
"url": "https://api.github.com/repos/symfony/asset/zipball/447190a24309da88f816313824d85c303035f86b",
"reference": "447190a24309da88f816313824d85c303035f86b",
"shasum": ""
},
"require": {
"php": "^7.2.5"
},
"require-dev": {
"symfony/http-foundation": "^4.4|^5.0",
"symfony/http-kernel": "^4.4|^5.0"
},
"suggest": {
"symfony/http-foundation": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Asset\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "[email protected]"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Asset Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T14:08:26+00:00"
},
{
"name": "symfony/cache",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "4572116c640a6bc9fc0047180fe7f9362e5923fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/4572116c640a6bc9fc0047180fe7f9362e5923fc",
"reference": "4572116c640a6bc9fc0047180fe7f9362e5923fc",
"shasum": ""
},
"require": {
@@ -2123,7 +2295,7 @@
"caching",
"psr6"
],
"time": "2020-01-10T21:57:37+00:00"
"time": "2020-01-31T09:13:47+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -2185,16 +2357,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f"
"reference": "f512001679f37e6a042b51897ed24a2f05eba656"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f",
"reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f",
"url": "https://api.github.com/repos/symfony/console/zipball/f512001679f37e6a042b51897ed24a2f05eba656",
"reference": "f512001679f37e6a042b51897ed24a2f05eba656",
"shasum": ""
},
"require": {
@@ -2257,11 +2429,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2020-01-10T21:54:01+00:00"
"time": "2020-01-25T12:44:29+00:00"
},
{
"name": "symfony/expression-language",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
@@ -2312,7 +2484,7 @@
},
{
"name": "symfony/finder",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -2361,16 +2533,16 @@
},
{
"name": "symfony/http-client",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00"
"reference": "250c5363e4d67f8e3c9cdf3362f134e040e69612"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/a7f82a1590e2f146b9bb44c6323b21f091fb9e00",
"reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00",
"url": "https://api.github.com/repos/symfony/http-client/zipball/250c5363e4d67f8e3c9cdf3362f134e040e69612",
"reference": "250c5363e4d67f8e3c9cdf3362f134e040e69612",
"shasum": ""
},
"require": {
@@ -2425,7 +2597,7 @@
],
"description": "Symfony HttpClient component",
"homepage": "https://symfony.com",
"time": "2020-01-21T07:39:36+00:00"
"time": "2020-01-31T09:11:17+00:00"
},
{
"name": "symfony/http-client-contracts",
@@ -2486,7 +2658,7 @@
},
{
"name": "symfony/inflector",
"version": "v5.0.3",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
@@ -2544,16 +2716,16 @@
},
{
"name": "symfony/intl",
"version": "v5.0.3",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/intl.git",
"reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677"
"reference": "519bcb27ea53835c1e8e7f7c8a799c867d570156"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/intl/zipball/2b3694976f02ed6a7894d8a772c9d55cee5d9677",
"reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677",
"url": "https://api.github.com/repos/symfony/intl/zipball/519bcb27ea53835c1e8e7f7c8a799c867d570156",
"reference": "519bcb27ea53835c1e8e7f7c8a799c867d570156",
"shasum": ""
},
"require": {
@@ -2615,11 +2787,11 @@
"l10n",
"localization"
],
"time": "2020-01-04T14:08:26+00:00"
"time": "2020-01-31T09:13:47+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@@ -3023,7 +3195,7 @@
},
{
"name": "symfony/process",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -3072,7 +3244,7 @@
},
{
"name": "symfony/property-access",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
@@ -3139,7 +3311,7 @@
},
{
"name": "symfony/routing",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
@@ -3215,7 +3387,7 @@
},
{
"name": "symfony/serializer",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
@@ -3354,7 +3526,7 @@
},
{
"name": "symfony/var-exporter",
"version": "v5.0.3",
"version": "v5.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
@@ -3412,9 +3584,85 @@
],
"time": "2020-01-04T14:08:26+00:00"
},
{
"name": "symfony/web-link",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/web-link.git",
"reference": "dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/web-link/zipball/dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386",
"reference": "dad60d94b2e7f16e1a7d0ebd0f1f460f45a51386",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/link": "^1.0",
"symfony/polyfill-php72": "^1.5"
},
"conflict": {
"symfony/http-kernel": "<4.3"
},
"provide": {
"psr/link-implementation": "1.0"
},
"require-dev": {
"symfony/http-foundation": "^4.4|^5.0",
"symfony/http-kernel": "^4.3|^5.0"
},
"suggest": {
"symfony/http-kernel": ""
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.4-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\WebLink\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Kévin Dunglas",
"email": "[email protected]"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony WebLink Component",
"homepage": "https://symfony.com",
"keywords": [
"dns-prefetch",
"http",
"http2",
"link",
"performance",
"prefetch",
"preload",
"prerender",
"psr13",
"push"
],
"time": "2020-01-04T13:00:46+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.4.3",
"version": "v4.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -5221,16 +5469,16 @@
},
{
"name": "typo3/phar-stream-wrapper",
"version": "v3.1.3",
"version": "v3.1.4",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/phar-stream-wrapper.git",
"reference": "586ff60beea128e069a5dc271d3d8133a9bc460a"
"reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/586ff60beea128e069a5dc271d3d8133a9bc460a",
"reference": "586ff60beea128e069a5dc271d3d8133a9bc460a",
"url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
"reference": "e0c1b495cfac064f4f5c4bcb6bf67bb7f345ed04",
"shasum": ""
},
"require": {
@@ -5267,20 +5515,20 @@
"security",
"stream-wrapper"
],
"time": "2019-10-18T11:57:16+00:00"
"time": "2019-12-10T11:53:27+00:00"
},
{
"name": "typo3fluid/fluid",
"version": "2.6.8",
"version": "2.6.9",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/Fluid.git",
"reference": "854c3b682aa4d2899f4246276cc60ad52cd8e34e"
"reference": "ba05e165bb4fd1302edf3f0280a149992e8c79be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/Fluid/zipball/854c3b682aa4d2899f4246276cc60ad52cd8e34e",
"reference": "854c3b682aa4d2899f4246276cc60ad52cd8e34e",
"url": "https://api.github.com/repos/TYPO3/Fluid/zipball/ba05e165bb4fd1302edf3f0280a149992e8c79be",
"reference": "ba05e165bb4fd1302edf3f0280a149992e8c79be",
"shasum": ""
},
"require": {
@@ -5306,7 +5554,7 @@
"LGPL-3.0-or-later"
],
"description": "The TYPO3 Fluid template rendering engine",
"time": "2019-12-02T06:33:10+00:00"
"time": "2020-02-03T10:46:43+00:00"
},
{
"name": "wazum/pagetree-resizable",
+4113 -2757
View File
File diff suppressed because it is too large Load Diff
+6 -7
View File
@@ -6,7 +6,7 @@
"license": "WTFPL",
"repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
"scripts": {
"dev": "./node_modules/.bin/encore dev --watch --watch-poll=500",
"dev": "./node_modules/.bin/encore dev --watch --watch-poll 500",
"build": "./node_modules/.bin/encore production"
},
"dependencies": {
@@ -33,16 +33,15 @@
"vuex": "^3.1.0"
},
"devDependencies": {
"@symfony/webpack-encore": "^0.19.0",
"@symfony/webpack-encore": "^0.28.2",
"autoprefixer": "^8.6.5",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"node-sass": "^4.11.0",
"postcss-loader": "^2.1.6",
"sass-loader": "^6.0.7",
"vue-loader": "^14.2.4",
"vue-template-compiler": "^2.6.10",
"webpack-notifier": "^1.7.0"
"postcss-loader": "^3.0.0",
"sass-loader": "^7.3.1",
"vue-loader": "^15.8.3",
"vue-template-compiler": "^2.6.10"
},
"browserslist": [
"last 2 versions",
@@ -7,7 +7,7 @@ editor:
config:
disableNativeSpellChecker: false
contentsCss:
- "EXT:ep_events/Resources/Public/css/rte.css?v=2019.09-06"
- "EXT:ep_events/Resources/Public/css/rte.css?v=2020.02-01"
stylesSet:
- { name: "Icon", element: "a", attributes: { 'class': 'button button--icon' } }
@@ -0,0 +1,9 @@
@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript'
plugin.tx_typo3encore {
settings {
builds {
EpEventsConfig = EXT:ep_events/Resources/Public
}
}
}
@@ -8,7 +8,7 @@ page {
shortcutIcon = EXT:ep_events/Resources/Public/images/favicon.ico
includeCSS {
main = EXT:ep_events/Resources/Public/css/main.css
main = typo3_encore:EpEventsConfig:main
}
includeJS {
@@ -18,7 +18,7 @@ page {
}
includeJSFooter {
main = EXT:ep_events/Resources/Public/js/main.js
main = typo3_encore:EpEventsConfig:main
}
jsFooterInline {
@@ -2,6 +2,7 @@
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Seo.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript"
@import "EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript"
@@ -7,7 +7,7 @@ editor:
config:
disableNativeSpellChecker: false
contentsCss:
- "EXT:ep_theme/Resources/Public/css/rte.css?v=2019.09-06"
- "EXT:ep_theme/Resources/Public/css/rte.css?v=2020.02-01"
stylesSet:
- { name: "Button", element: "a", attributes: { 'class': 'button' } }
@@ -0,0 +1,9 @@
@import 'EXT:typo3_encore/Configuration/TypoScript/setup.typoscript'
plugin.tx_typo3encore {
settings {
builds {
EpThemeConfig = EXT:ep_theme/Resources/Public
}
}
}
@@ -38,16 +38,11 @@ page {
)
includeCSS {
main = EXT:ep_theme/Resources/Public/css/main.css
}
includeJSFooterlibs {
manifest = EXT:ep_theme/Resources/Public/js/manifest.js
vendor = EXT:ep_theme/Resources/Public/js/vendor.js
main = typo3_encore:EpThemeConfig:main
}
includeJSFooter {
main = EXT:ep_theme/Resources/Public/js/main.js
main = typo3_encore:EpThemeConfig:main
}
jsFooterInline {
@@ -1,6 +1,7 @@
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Form.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/News.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/GridElements.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript"
@import "EXT:ep_theme/Configuration/TypoScript/Extensions/PxaSocialFeed.typoscript"
@@ -1,4 +1,59 @@
@include font-face('Lato', '../fonts/lato-v14-latin-300', 300);
@include font-face('Lato', '../fonts/lato-v14-latin-regular', 400);
@include font-face('Lato', '../fonts/lato-v14-latin-700', 700);
@include font-face('Lato', '../fonts/lato-v14-latin-900', 900);
/* lato-300 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 300;
font-display: swap;
src: url('../fonts/lato-v16-latin-300.eot'); /* IE9 Compat Modes */
src: local('Lato Light'), local('Lato-Light'),
url('../fonts/lato-v16-latin-300.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-300.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-300.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-300.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-regular - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('../fonts/lato-v16-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Lato Regular'), local('Lato-Regular'),
url('../fonts/lato-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-700 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 700;
font-display: swap;
src: url('../fonts/lato-v16-latin-700.eot'); /* IE9 Compat Modes */
src: local('Lato Bold'), local('Lato-Bold'),
url('../fonts/lato-v16-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-700.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-700.svg#Lato') format('svg'); /* Legacy iOS */
}
/* lato-900 - latin */
@font-face {
font-family: 'Lato';
font-style: normal;
font-weight: 900;
font-display: swap;
src: url('../fonts/lato-v16-latin-900.eot'); /* IE9 Compat Modes */
src: local('Lato Black'), local('Lato-Black'),
url('../fonts/lato-v16-latin-900.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/lato-v16-latin-900.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/lato-v16-latin-900.woff') format('woff'), /* Modern Browsers */
url('../fonts/lato-v16-latin-900.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/lato-v16-latin-900.svg#Lato') format('svg'); /* Legacy iOS */
}
@@ -78,34 +78,3 @@
opacity: 1;
}
}
@mixin font-face(
$font-family,
$file-path,
$weight: normal,
$style: normal,
$asset-pipeline: $asset-pipeline,
$file-formats: eot woff2 woff ttf svg) {
$user-deprecation-warnings-setting: $output-bourbon-deprecation-warnings;
$output-bourbon-deprecation-warnings: false !global;
$font-url-prefix: font-url-prefixer($asset-pipeline);
@font-face {
font-family: $font-family;
font-style: $style;
font-weight: $weight;
font-display: swap;
src: font-source-declaration(
$font-family,
$file-path,
$asset-pipeline,
$file-formats,
$font-url-prefix
);
}
$output-bourbon-deprecation-warnings: $user-deprecation-warnings-setting !global;
}
@@ -5,6 +5,7 @@
@import "remix/colors";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_boarderweek";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_snowzone";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -7,6 +7,7 @@
@import "remix/colors_unichamp";
// vendor styles
$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
@import "mixins";
@@ -18,6 +18,7 @@
letter-spacing: normal;
text-transform: none;
font-weight: 400;
min-height: 64px;
}
.product-teaser__subline {
@@ -1,10 +1,7 @@
$output-bourbon-deprecation-warnings: false;
@import "~bourbon/app/assets/stylesheets/bourbon";
@include font-face('Lato', '../fonts/lato-v14-latin-300', 300);
@include font-face('Lato', '../fonts/lato-v14-latin-regular', 400);
@include font-face('Lato', '../fonts/lato-v14-latin-700', 700);
@include font-face('Lato', '../fonts/lato-v14-latin-900', 900);
@import "fonts";
body {
font-family: "Lato", $helvetica;
+5 -7
View File
@@ -9,11 +9,8 @@ Encore
.addEntry('snowzone', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js')
.addEntry('unichamp', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js')
.addStyleEntry('rte', './public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss')
.createSharedEntry('vendor', [
'jquery', 'vue', 'vuex', 'vue-router', 'axios', 'flatpickr', 'lazysizes',
'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
'dayjs', 'cookieconsent', 'picturefill', '@fancyapps/fancybox', 'leaflet'
])
.splitEntryChunks()
.enableSingleRuntimeChunk()
.enableSassLoader()
.enableVueLoader()
.autoProvidejQuery()
@@ -27,8 +24,7 @@ Encore
})
.configureBabel(function (babelConfig) {
babelConfig.plugins = [ 'transform-object-rest-spread', 'syntax-dynamic-import' ]
})
;
});
const EpThemeConfig = Encore.getWebpackConfig();
@@ -43,6 +39,8 @@ Encore
.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/scss/rte.scss')
.enableSingleRuntimeChunk()
.splitEntryChunks()
.enableSassLoader()
.enableVueLoader()
.autoProvidejQuery()