EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2023-01-03 17:15:13 +01:00
parent 2a416a8749 84b2bd18b2
commit d2cd65a69b
5 changed files with 540 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+94 -94
View File
@@ -540,30 +540,30 @@
},
{
"name": "doctrine/instantiator",
"version": "1.4.1",
"version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
"reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
"reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^9",
"doctrine/coding-standard": "^9 || ^11",
"ext-pdo": "*",
"ext-phar": "*",
"phpbench/phpbench": "^0.16 || ^1",
"phpstan/phpstan": "^1.4",
"phpstan/phpstan-phpunit": "^1",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"vimeo/psalm": "^4.22"
"vimeo/psalm": "^4.30 || ^5.4"
},
"type": "library",
"autoload": {
@@ -590,7 +590,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
"source": "https://github.com/doctrine/instantiator/tree/1.4.1"
"source": "https://github.com/doctrine/instantiator/tree/1.5.0"
},
"funding": [
{
@@ -606,7 +606,7 @@
"type": "tidelift"
}
],
"time": "2022-03-03T08:28:38+00:00"
"time": "2022-12-30T00:15:36+00:00"
},
{
"name": "doctrine/lexer",
@@ -2788,16 +2788,16 @@
},
{
"name": "symfony/cache",
"version": "v5.4.15",
"version": "v5.4.18",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
"reference": "60e87188abbacd29ccde44d69c5392a33e888e98"
"reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/cache/zipball/60e87188abbacd29ccde44d69c5392a33e888e98",
"reference": "60e87188abbacd29ccde44d69c5392a33e888e98",
"url": "https://api.github.com/repos/symfony/cache/zipball/a33fa08a3f37bb44b90e60b9028796d6b811f9ef",
"reference": "a33fa08a3f37bb44b90e60b9028796d6b811f9ef",
"shasum": ""
},
"require": {
@@ -2865,7 +2865,7 @@
"psr6"
],
"support": {
"source": "https://github.com/symfony/cache/tree/v5.4.15"
"source": "https://github.com/symfony/cache/tree/v5.4.18"
},
"funding": [
{
@@ -2881,7 +2881,7 @@
"type": "tidelift"
}
],
"time": "2022-10-27T07:55:40+00:00"
"time": "2022-12-29T16:06:09+00:00"
},
{
"name": "symfony/cache-contracts",
@@ -3043,16 +3043,16 @@
},
{
"name": "symfony/console",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef"
"reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
"reference": "8e9b9c8dfb33af6057c94e1b44846bee700dc5ef",
"url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f",
"reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f",
"shasum": ""
},
"require": {
@@ -3122,7 +3122,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.4.16"
"source": "https://github.com/symfony/console/tree/v5.4.17"
},
"funding": [
{
@@ -3138,20 +3138,20 @@
"type": "tidelift"
}
],
"time": "2022-11-25T14:09:27+00:00"
"time": "2022-12-28T14:15:31+00:00"
},
{
"name": "symfony/dependency-injection",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "a93e1863500940780fc1235f52d54397be2d14b3"
"reference": "58f2988128d2d278280781db037677a32cf720db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a93e1863500940780fc1235f52d54397be2d14b3",
"reference": "a93e1863500940780fc1235f52d54397be2d14b3",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/58f2988128d2d278280781db037677a32cf720db",
"reference": "58f2988128d2d278280781db037677a32cf720db",
"shasum": ""
},
"require": {
@@ -3211,7 +3211,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.16"
"source": "https://github.com/symfony/dependency-injection/tree/v5.4.17"
},
"funding": [
{
@@ -3227,7 +3227,7 @@
"type": "tidelift"
}
],
"time": "2022-11-25T07:33:13+00:00"
"time": "2022-12-28T13:55:51+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3298,16 +3298,16 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v5.4.9",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
"reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
"reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9",
"reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9",
"shasum": ""
},
"require": {
@@ -3363,7 +3363,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17"
},
"funding": [
{
@@ -3379,7 +3379,7 @@
"type": "tidelift"
}
],
"time": "2022-05-05T16:45:39+00:00"
"time": "2022-12-12T15:54:21+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -3589,16 +3589,16 @@
},
{
"name": "symfony/finder",
"version": "v5.4.11",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
"reference": "40c08632019838dfb3350f18cf5563b8080055fc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
"reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
"url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc",
"reference": "40c08632019838dfb3350f18cf5563b8080055fc",
"shasum": ""
},
"require": {
@@ -3632,7 +3632,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v5.4.11"
"source": "https://github.com/symfony/finder/tree/v5.4.17"
},
"funding": [
{
@@ -3648,7 +3648,7 @@
"type": "tidelift"
}
],
"time": "2022-07-29T07:37:50+00:00"
"time": "2022-12-22T10:31:03+00:00"
},
{
"name": "symfony/http-client",
@@ -3811,16 +3811,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "5032c5849aef24741e1970cb03511b0dd131d838"
"reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/5032c5849aef24741e1970cb03511b0dd131d838",
"reference": "5032c5849aef24741e1970cb03511b0dd131d838",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a",
"reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a",
"shasum": ""
},
"require": {
@@ -3867,7 +3867,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.4.16"
"source": "https://github.com/symfony/http-foundation/tree/v5.4.17"
},
"funding": [
{
@@ -3883,7 +3883,7 @@
"type": "tidelift"
}
],
"time": "2022-11-07T08:06:40+00:00"
"time": "2022-12-14T08:23:03+00:00"
},
{
"name": "symfony/inflector",
@@ -3960,16 +3960,16 @@
},
{
"name": "symfony/mailer",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/mailer.git",
"reference": "501ac1c388b18390547aa138253de2c5e44e931e"
"reference": "fd816412b76447890efedaf9ddfe8632589ce10c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mailer/zipball/501ac1c388b18390547aa138253de2c5e44e931e",
"reference": "501ac1c388b18390547aa138253de2c5e44e931e",
"url": "https://api.github.com/repos/symfony/mailer/zipball/fd816412b76447890efedaf9ddfe8632589ce10c",
"reference": "fd816412b76447890efedaf9ddfe8632589ce10c",
"shasum": ""
},
"require": {
@@ -4016,7 +4016,7 @@
"description": "Helps sending emails",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/mailer/tree/v5.4.16"
"source": "https://github.com/symfony/mailer/tree/v5.4.17"
},
"funding": [
{
@@ -4032,7 +4032,7 @@
"type": "tidelift"
}
],
"time": "2022-11-04T07:37:26+00:00"
"time": "2022-12-14T15:45:23+00:00"
},
{
"name": "symfony/mime",
@@ -5149,16 +5149,16 @@
},
{
"name": "symfony/property-info",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-info.git",
"reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944"
"reference": "12e1f7b3d73b1f3690aa524b92b5de9937507361"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/property-info/zipball/9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
"reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
"url": "https://api.github.com/repos/symfony/property-info/zipball/12e1f7b3d73b1f3690aa524b92b5de9937507361",
"reference": "12e1f7b3d73b1f3690aa524b92b5de9937507361",
"shasum": ""
},
"require": {
@@ -5173,7 +5173,7 @@
"symfony/dependency-injection": "<4.4"
},
"require-dev": {
"doctrine/annotations": "^1.10.4",
"doctrine/annotations": "^1.10.4|^2",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"phpstan/phpdoc-parser": "^1.0",
"symfony/cache": "^4.4|^5.0|^6.0",
@@ -5220,7 +5220,7 @@
"validator"
],
"support": {
"source": "https://github.com/symfony/property-info/tree/v5.4.16"
"source": "https://github.com/symfony/property-info/tree/v5.4.17"
},
"funding": [
{
@@ -5236,20 +5236,20 @@
"type": "tidelift"
}
],
"time": "2022-11-19T17:41:50+00:00"
"time": "2022-12-20T11:10:57+00:00"
},
{
"name": "symfony/routing",
"version": "v5.4.15",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69"
"reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/5c9b129efe9abce9470e384bf65d8a7e262eee69",
"reference": "5c9b129efe9abce9470e384bf65d8a7e262eee69",
"url": "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791",
"reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791",
"shasum": ""
},
"require": {
@@ -5264,7 +5264,7 @@
"symfony/yaml": "<4.4"
},
"require-dev": {
"doctrine/annotations": "^1.12",
"doctrine/annotations": "^1.12|^2",
"psr/log": "^1|^2|^3",
"symfony/config": "^5.3|^6.0",
"symfony/dependency-injection": "^4.4|^5.0|^6.0",
@@ -5310,7 +5310,7 @@
"url"
],
"support": {
"source": "https://github.com/symfony/routing/tree/v5.4.15"
"source": "https://github.com/symfony/routing/tree/v5.4.17"
},
"funding": [
{
@@ -5326,7 +5326,7 @@
"type": "tidelift"
}
],
"time": "2022-10-13T14:10:41+00:00"
"time": "2022-12-20T11:10:57+00:00"
},
{
"name": "symfony/serializer",
@@ -5507,16 +5507,16 @@
},
{
"name": "symfony/string",
"version": "v5.4.15",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"
"reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
"reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
"url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b",
"reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b",
"shasum": ""
},
"require": {
@@ -5573,7 +5573,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.4.15"
"source": "https://github.com/symfony/string/tree/v5.4.17"
},
"funding": [
{
@@ -5589,20 +5589,20 @@
"type": "tidelift"
}
],
"time": "2022-10-05T15:16:54+00:00"
"time": "2022-12-12T15:54:21+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v5.4.14",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "6894d06145fefebd9a4c7272baa026a1c394a430"
"reference": "ad74890513d07060255df2575703daf971de92c7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/6894d06145fefebd9a4c7272baa026a1c394a430",
"reference": "6894d06145fefebd9a4c7272baa026a1c394a430",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7",
"reference": "ad74890513d07060255df2575703daf971de92c7",
"shasum": ""
},
"require": {
@@ -5662,7 +5662,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.4.14"
"source": "https://github.com/symfony/var-dumper/tree/v5.4.17"
},
"funding": [
{
@@ -5678,20 +5678,20 @@
"type": "tidelift"
}
],
"time": "2022-10-07T08:01:20+00:00"
"time": "2022-12-22T10:31:03+00:00"
},
{
"name": "symfony/var-exporter",
"version": "v5.4.10",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
"reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340"
"reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/8fc03ee75eeece3d9be1ef47d26d79bea1afb340",
"reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340",
"url": "https://api.github.com/repos/symfony/var-exporter/zipball/2adac0a9b55f9fb40b983b790509581dc3db0fff",
"reference": "2adac0a9b55f9fb40b983b790509581dc3db0fff",
"shasum": ""
},
"require": {
@@ -5735,7 +5735,7 @@
"serialize"
],
"support": {
"source": "https://github.com/symfony/var-exporter/tree/v5.4.10"
"source": "https://github.com/symfony/var-exporter/tree/v5.4.17"
},
"funding": [
{
@@ -5751,7 +5751,7 @@
"type": "tidelift"
}
],
"time": "2022-05-27T12:56:18+00:00"
"time": "2022-12-22T10:10:04+00:00"
},
{
"name": "symfony/web-link",
@@ -5844,16 +5844,16 @@
},
{
"name": "symfony/yaml",
"version": "v5.4.16",
"version": "v5.4.17",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "ebd37c71f62d5ec5f6e27de3e06fee492d4c6298"
"reference": "edcdc11498108f8967fe95118a7ec8624b94760e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/ebd37c71f62d5ec5f6e27de3e06fee492d4c6298",
"reference": "ebd37c71f62d5ec5f6e27de3e06fee492d4c6298",
"url": "https://api.github.com/repos/symfony/yaml/zipball/edcdc11498108f8967fe95118a7ec8624b94760e",
"reference": "edcdc11498108f8967fe95118a7ec8624b94760e",
"shasum": ""
},
"require": {
@@ -5899,7 +5899,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v5.4.16"
"source": "https://github.com/symfony/yaml/tree/v5.4.17"
},
"funding": [
{
@@ -5915,7 +5915,7 @@
"type": "tidelift"
}
],
"time": "2022-11-25T16:04:03+00:00"
"time": "2022-12-13T09:57:04+00:00"
},
{
"name": "tritum/form-element-linked-checkbox",
@@ -8664,16 +8664,16 @@
},
{
"name": "phpunit/php-code-coverage",
"version": "9.2.22",
"version": "9.2.23",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "e4bf60d2220b4baaa0572986b5d69870226b06df"
"reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e4bf60d2220b4baaa0572986b5d69870226b06df",
"reference": "e4bf60d2220b4baaa0572986b5d69870226b06df",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
"reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c",
"shasum": ""
},
"require": {
@@ -8729,7 +8729,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.22"
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
},
"funding": [
{
@@ -8737,7 +8737,7 @@
"type": "github"
}
],
"time": "2022-12-18T16:40:55+00:00"
"time": "2022-12-28T12:41:10+00:00"
},
{
"name": "phpunit/php-file-iterator",
package-lock.json
Generated
+442 -406
View File
File diff suppressed because it is too large Load Diff
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/base/_typography.scss
+2 -2
View File
@@ -20,7 +20,7 @@ h4,
.headline--underlined:after {
@apply block border-b-4 border-ep-primary-light pb-4 mb-4 -mt-2 w-20;
@apply sbw:border-sbw-primary ser:border-ser-secondary;
@apply sbw:border-sbw-primary snz:border-snz-primary uch:border-uch-primary ser:border-ser-secondary;
content: '';
}
@@ -36,7 +36,7 @@ h4,
@apply relative pl-8;
&:before {
@apply absolute left-0 top-0 w-6 h-6 text-ep-primary-dark text-lg;
font-family: 'fontello';
font-family: 'fontello', sans-serif;
content: '\e800';
}
}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_contact-bar.scss
+1 -1
View File
@@ -9,7 +9,7 @@
.contact-bar__item {
@apply flex-1 text-white py-2 bg-ep-primary-dark border-r border-white last:border-0;
@apply ser:bg-ser-primary;
@apply ser:bg-ser-primary sbw:bg-sbw-primary snz:bg-snz-primary uch:bg-uch-primary;
@screen md {
@apply flex flex-none items-start transition-transform duration-300 ease-in-out p-1 shadow-md focus:text-white border-0;
tailwind.config.js
+1 -5
View File
@@ -49,10 +49,6 @@ module.exports = {
fontSize: {
'xs': '.8rem',
},
opacity: {
'55': '.55',
'85': '.85',
},
colors: {
concept: {
DEFAULT: '#0173A5',
@@ -102,7 +98,7 @@ module.exports = {
},
},
opacity: {
'55': 0.5,
'55': 0.55,
'85': 0.85,
},
backgroundImage: {