From 6214e262ccb871ce8475f74d095d4fe968e2758c Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Tue, 22 Apr 2025 12:29:34 +0200 Subject: [PATCH] feat: many changes --- .../BackendLayouts/default.tsconfig | 21 +----- .../Sets/SitePackage/page.tsconfig | 2 +- .../hero/templates/frontend.html | 4 +- .../text/templates/frontend.html | 4 +- .../textimage/templates/frontend.html | 9 +-- .../PageView/Partials/Navigation/Main.html | 12 +-- .../Resources/Public/Fonts/Barlow-Bold.woff2 | Bin 0 -> 38268 bytes .../Public/Fonts/Barlow-Medium.woff2 | Bin 0 -> 37184 bytes .../Resources/Public/Fonts/Hajime-Sans.otf | Bin 21228 -> 0 bytes .../Resources/Public/Fonts/Hajime-Sans.ttf | Bin 42924 -> 0 bytes .../Resources/Public/Fonts/Hajime-Sans.woff2 | Bin 13716 -> 0 bytes .../Inter-Italic-VariableFont_opsz,wght.ttf | Bin 904532 -> 0 bytes .../Fonts/Inter-VariableFont_opsz,wght.ttf | Bin 874708 -> 0 bytes .../base/Resources/Public/Fonts/Inter.woff2 | Bin 117004 -> 0 bytes .../Public/Scss/abstracts/_fonts.scss | 70 ++++++++++-------- .../Public/Scss/base/_container.scss | 2 +- packages/base/Resources/Public/Scss/main.scss | 10 +-- 17 files changed, 64 insertions(+), 70 deletions(-) create mode 100644 packages/base/Resources/Public/Fonts/Barlow-Bold.woff2 create mode 100644 packages/base/Resources/Public/Fonts/Barlow-Medium.woff2 delete mode 100644 packages/base/Resources/Public/Fonts/Hajime-Sans.otf delete mode 100644 packages/base/Resources/Public/Fonts/Hajime-Sans.ttf delete mode 100644 packages/base/Resources/Public/Fonts/Hajime-Sans.woff2 delete mode 100644 packages/base/Resources/Public/Fonts/Inter-Italic-VariableFont_opsz,wght.ttf delete mode 100644 packages/base/Resources/Public/Fonts/Inter-VariableFont_opsz,wght.ttf delete mode 100644 packages/base/Resources/Public/Fonts/Inter.woff2 diff --git a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig b/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig index 0f83a90..0a8c9f9 100644 --- a/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig +++ b/packages/base/Configuration/Sets/SitePackage/PageTsConfig/BackendLayouts/default.tsconfig @@ -8,35 +8,18 @@ mod { title = Default config { backend_layout { - colCount = 12 - rowCount = 2 + colCount = 1 + rowCount = 1 rows { 1 { columns { 1 { name = LLL:EXT:base/Resources/Private/Language/locallang_be.xlf:backend_layout.column.normal colPos = 0 - colspan = 12 identifier = main } } } - 2 { - columns { - 1 { - name = Footer Left - colPos = 90 - colspan = 6 - identifier = footer-left - } - 2 { - name = Footer Right - colPos = 91 - colspan = 6 - identifier = footer-right - } - } - } } } } diff --git a/packages/base/Configuration/Sets/SitePackage/page.tsconfig b/packages/base/Configuration/Sets/SitePackage/page.tsconfig index 18b8be6..b727dba 100644 --- a/packages/base/Configuration/Sets/SitePackage/page.tsconfig +++ b/packages/base/Configuration/Sets/SitePackage/page.tsconfig @@ -9,7 +9,7 @@ RTE { TCEFORM { tt_content { CType { - keepItems = cloonar_header,cloonar_text,cloonar_textimage,news_newsliststicky,news_pi1,cloonar_hero,cloonar_stats + keepItems = cloonar_text,cloonar_textimage,cloonar_hero,form_formframework } } } diff --git a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html index 6033b6a..8262b9d 100644 --- a/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/hero/templates/frontend.html @@ -3,7 +3,7 @@ -
+
@@ -69,7 +69,7 @@
-

+

{data.header}

diff --git a/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html index a923288..7f400dd 100644 --- a/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/text/templates/frontend.html @@ -1,8 +1,8 @@ -
+
-

{data.header}

 +

{data.header}

 diff --git a/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html index 4550bfb..d7e1238 100644 --- a/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/textimage/templates/frontend.html @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ -
+
@@ -39,7 +39,7 @@ cropVariant="default" width="538c" alt="{data.image.0.alternative}" - class="max-w-full h-auto rounded-lg block" + class="max-w-full h-auto block" /> @@ -50,8 +50,7 @@
-

{data.header}

-

{data.subheader}

+

{data.header}
diff --git a/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html b/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html index ac7875c..ba92c76 100644 --- a/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html +++ b/packages/base/Resources/Private/PageView/Partials/Navigation/Main.html @@ -1,18 +1,18 @@ -