Merge branch 'release/v11.2.0'

Starraider · May 26, 2022 · 676fc62 · 676fc62
2 parents 2de03dc + 8bda2cb
commit 676fc62
Show file tree

Hide file tree

Showing 24 changed files with 1,518 additions and 1,239 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,6 +54,7 @@
 !/public/typo3conf/LocalConfiguration.php
 !/public/typo3conf/AdditionalConfiguration.php
 !/public/typo3conf/PackageStates.php
+!/public/typo3conf/contentBlocks
 !/public/.htaccess
 
 /packages/customer_sitepackage/Resources/Public/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "packages/klaro_video"]
-	path = packages/klaro_video
-	url = https://github.com/Starraider/klaro_video.git
 [submodule "packages/skombase"]
 	path = packages/skombase
 	url = https://github.com/Starraider/skombase.git
+[submodule "public/typo3conf/contentBlocks"]
+	path = public/typo3conf/contentBlocks
+	url = https://github.com/Starraider/contentBlocks.git
diff --git a/Build/images/Logo_machwerk.svg b/Build/images/Logo_machwerk.svg
diff --git a/Build/images/Logo_machwerk_klein.svg b/Build/images/Logo_machwerk_klein.svg
diff --git a/Build/images/SKom_Logo_Top.jpg b/Build/images/SKom_Logo_Top.jpg
diff --git a/Build/images/youtube-placeholder.png b/Build/images/youtube-placeholder.png
diff --git a/Build/styles/_bootstrappackageicon.scss b/Build/styles/_bootstrappackageicon.scss
@@ -1,9 +1,9 @@
 @font-face {
     font-family: "bootstrappackageicon";
-    src: url("../../public/typo3conf/ext/bootstrap_package/Resources/Public/Fonts/bootstrappackageicon.eot?d97e585912a7b078b7fbc39f8bd34e21#iefix") format("embedded-opentype"),
-        url("../../public/typo3conf/ext/bootstrap_package/Resources/Public/Fonts/bootstrappackageicon.woff2?d97e585912a7b078b7fbc39f8bd34e21") format("woff2"),
-        url("../../public/typo3conf/ext/bootstrap_package/Resources/Public/Fonts/bootstrappackageicon.woff?d97e585912a7b078b7fbc39f8bd34e21") format("woff"),
-        url("../../public/typo3conf/ext/bootstrap_package/Resources/Public/Fonts/bootstrappackageicon.ttf?d97e585912a7b078b7fbc39f8bd34e21") format("truetype");
+    src: url("../../vendor/bk2k/bootstrap-package/Resources/Public/Fonts/bootstrappackageicon.eot?d97e585912a7b078b7fbc39f8bd34e21#iefix") format("embedded-opentype"),
+        url("../../vendor/bk2k/bootstrap-package/Resources/Public/Fonts/bootstrappackageicon.woff2?d97e585912a7b078b7fbc39f8bd34e21") format("woff2"),
+        url("../../vendor/bk2k/bootstrap-package/Resources/Public/Fonts/bootstrappackageicon.woff?d97e585912a7b078b7fbc39f8bd34e21") format("woff"),
+        url("../../vendor/bk2k/bootstrap-package/Resources/Public/Fonts/bootstrappackageicon.ttf?d97e585912a7b078b7fbc39f8bd34e21") format("truetype");
 }
 
 .bootstrappackageicon::before {