From f3512c81ba2b37e2442239e6078e3a7ead4d8d75 Mon Sep 17 00:00:00 2001 From: Julia Gruber Date: Thu, 11 Apr 2024 16:14:42 +0100 Subject: [PATCH 1/3] [BUGFIX] use right image in FE --- .../_LandingPage/Content/SuccessFeatures.html | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html index 74e5780..b214c47 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html @@ -3,23 +3,17 @@ xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" >
- +
- +
-
- -
- -
-
- +
-
+
From 5625ea95a6aa938ce1643dc54dc596047f98d4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20Ott=C3=B3?= Date: Thu, 11 Apr 2024 16:28:42 +0100 Subject: [PATCH 2/3] [FEATURE] Add a layout for all elements --- .../ViewHelpers/RenderBlockViewHelper.php | 1 + .../ProductLaunch/Pages/Default.html | 4 +--- .../Content/FormFormframework.html | 10 ++++++++++ .../_LandingPage/Content/SuccessCards.html | 3 +++ .../_LandingPage/Content/SuccessFaq.html | 3 +++ .../_LandingPage/Content/SuccessFeatures.html | 9 ++++++--- .../_LandingPage/Content/SuccessGallery.html | 3 +++ .../_LandingPage/Content/SuccessHero.html | 4 +++- .../_LandingPage/Content/SuccessNumbers.html | 3 +++ .../_LandingPage/Content/SuccessPartner.html | 3 +++ .../_LandingPage/Content/SuccessReview.html | 5 +++-- .../_LandingPage/Content/Textmedia.html | 3 +++ .../_LandingPage/Layouts/Default.html | 10 ++++++++++ .../Templates/_LandingPage/Pages/Default.html | 20 +++++++------------ 14 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 local_packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html create mode 100644 local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html diff --git a/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php b/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php index b3539e0..fb53aa0 100644 --- a/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php +++ b/local_packages/success/Classes/ViewHelpers/RenderBlockViewHelper.php @@ -75,6 +75,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl } $subView->assign('data', $data->toArray(true)); + $subView->assign('rawData', $data->getRecord()->getRawRecord()->toArray()); $subView->assign('context', $context); try { $content = $subView->render(); diff --git a/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html b/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html index 2e98bf9..55cdba7 100644 --- a/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html +++ b/local_packages/success/Resources/Private/Templates/ProductLaunch/Pages/Default.html @@ -17,9 +17,7 @@
-
- -
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html new file mode 100644 index 0000000..1d21902 --- /dev/null +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/FormFormframework.html @@ -0,0 +1,10 @@ + + + + + + + diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html index 91f0095..75f143f 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessCards.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html index 8e0b233..c0dbb0d 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFaq.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html index 74e5780..d218ad7 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessFeatures.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
@@ -16,14 +18,14 @@
- +
- +
@@ -40,7 +42,7 @@ - +

{feature.header}

{feature.text -> f:format.html()}
@@ -52,4 +54,5 @@

{feature.header}

+ diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html index b142055..712ba35 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessGallery.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html index 60d6cd5..182a624 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
@@ -24,5 +26,5 @@
- +
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html index ee370cf..34ef0fa 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessNumbers.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html index b85c9d1..672149e 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessPartner.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
@@ -15,4 +17,5 @@
+ diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html index 1dab0ac..c481390 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessReview.html @@ -2,7 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > - + +
- +
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html index e9e94a4..79b0d7b 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html @@ -2,6 +2,8 @@ data-namespace-typo3-fluid="true" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" > + +
@@ -18,6 +20,7 @@
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html new file mode 100644 index 0000000..b8ef218 --- /dev/null +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Layouts/Default.html @@ -0,0 +1,10 @@ + +
+ +
+ diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html index e0dd527..4dbd9fa 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Pages/Default.html @@ -11,17 +11,11 @@
- -{_all -> f:debug()} - -

{page.title}

- - - - +
+ + + +
+ + From d23c5ca04c65f7d4c3cb37e91d143d138b09a393 Mon Sep 17 00:00:00 2001 From: Julia Gruber Date: Thu, 11 Apr 2024 16:33:37 +0100 Subject: [PATCH 3/3] [TASK] add fancy heading styles --- assets/scss/base/_global.scss | 17 +++++++++-------- .../Configuration/TCA/Overrides/tt_content.php | 12 ++++++------ .../Resources/Private/Language/locallang_db.xlf | 12 ++++++------ .../_LandingPage/Content/SuccessHero.html | 2 +- .../_LandingPage/Content/Textmedia.html | 6 +++--- .../_LandingPage/Partials/Content/Header.html | 4 ++++ tailwind.config.js | 5 +++++ 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/assets/scss/base/_global.scss b/assets/scss/base/_global.scss index ee1122d..ab7fa0c 100644 --- a/assets/scss/base/_global.scss +++ b/assets/scss/base/_global.scss @@ -34,25 +34,26 @@ html { @apply bg-black text-white hover:bg-gray-900 focus:bg-gray-900; } - .h1 { - @apply text-5xl font-bold font-heading; + .heading-xxl { + @apply text-5xl font-bold font-heading block; } - .h2 { - @apply text-3xl font-bold font-heading; + .heading-xl { + @apply text-3xl font-bold font-heading block; } - .h3 { - @apply text-xl font-bold font-heading; + .heading-lg { + @apply text-xl font-bold font-heading block; } h1, h2, h3, h4, - h5 { + h5, + span { &.default { - @apply text-lg font-bold font-heading; + @apply text-lg font-bold font-heading block; } } diff --git a/local_packages/success/Configuration/TCA/Overrides/tt_content.php b/local_packages/success/Configuration/TCA/Overrides/tt_content.php index e751a75..edc44a0 100644 --- a/local_packages/success/Configuration/TCA/Overrides/tt_content.php +++ b/local_packages/success/Configuration/TCA/Overrides/tt_content.php @@ -107,16 +107,16 @@ 'value' => 'default' ], [ - 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.lovely', - 'value' => 'lovely' + 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-xxl', + 'value' => 'heading-xxl' ], [ - 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.fancy', - 'value' => 'fancy' + 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-xl', + 'value' => 'heading-xl' ], [ - 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.rainbow', - 'value' => 'rainbow' + 'label' => 'LLL:EXT:success/Resources/Private/Language/locallang_db.xlf:header_style.heading-lg', + 'value' => 'heading-lg' ] ] ] diff --git a/local_packages/success/Resources/Private/Language/locallang_db.xlf b/local_packages/success/Resources/Private/Language/locallang_db.xlf index 06ce895..7d73155 100644 --- a/local_packages/success/Resources/Private/Language/locallang_db.xlf +++ b/local_packages/success/Resources/Private/Language/locallang_db.xlf @@ -16,14 +16,14 @@ Default - - Lovely + + Heading XXLarge - - Fancy + + Heading XLarge - - Over the rainbow + + Heading Large diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html index 60d6cd5..901a940 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/SuccessHero.html @@ -13,7 +13,7 @@ arguments="{headerLayout: data.header_layout, headerStyle: data.header_style, header: data.header, overline: data.overline}"/> -
{data.bodytext -> f:format.html()}
+
{data.bodytext -> f:format.html()}
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html index e9e94a4..cb11e91 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Content/Textmedia.html @@ -8,10 +8,10 @@ - + - + @@ -31,7 +31,7 @@
-
+
diff --git a/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html b/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html index 0dbd6b3..895352d 100644 --- a/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html +++ b/local_packages/success/Resources/Private/Templates/_LandingPage/Partials/Content/Header.html @@ -38,6 +38,10 @@
+ + + + {subheader} diff --git a/tailwind.config.js b/tailwind.config.js index a433940..7e9eba1 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -42,5 +42,10 @@ export default { lighttext: 'var(--color-lighttext)', }, extend: {}, + safelist: [ + 'heading-xxl', + 'heading-xl', + 'heading-lg', + ] }, }