diff --git a/Build/Sources/Sass/typo3/_main_form.scss b/Build/Sources/Sass/typo3/_main_form.scss
index 13f4453acdfed0609329d43bbef95b79f988e00e..eb5216ea05480753afbb1030e8c2224c0b5b0f09 100644
--- a/Build/Sources/Sass/typo3/_main_form.scss
+++ b/Build/Sources/Sass/typo3/_main_form.scss
@@ -85,27 +85,28 @@ label {
}
}
-.form-group {
- .t3js-formengine-field-item {
- position: relative;
-
- > .t3js-charcounter-wrapper {
- left: 0;
- position: absolute;
- top: 100%;
- display: flex;
- margin: 0 -2px;
-
- .t3js-charcounter {
- margin: 0 2px;
- }
+.formengine-field-item {
+ display: block;
+ position: relative;
- .t3js-charcounter-min {
- margin: 0 2px;
- }
+ > .t3js-charcounter-wrapper {
+ left: 0;
+ position: absolute;
+ top: 100%;
+ display: flex;
+ margin: 0 -2px;
+
+ .t3js-charcounter {
+ margin: 0 2px;
+ }
+
+ .t3js-charcounter-min {
+ margin: 0 2px;
}
}
+}
+.form-group {
> label,
> .form-label {
font-weight: 600;
diff --git a/typo3/sysext/backend/Classes/Form/Element/CategoryElement.php b/typo3/sysext/backend/Classes/Form/Element/CategoryElement.php
index f5fbbe6fa3678cf58c9f139a6d0f5e578aed99b7..7ce91e2f4fec6025d9dbb63f247d646b5d8f15c6 100644
--- a/typo3/sysext/backend/Classes/Form/Element/CategoryElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/CategoryElement.php
@@ -143,19 +143,17 @@ class CategoryElement extends AbstractFormElement
];
$resultArray['html'] =
- '<typo3-formengine-element-category ' . GeneralUtility::implodeAttributes(['recordFieldId' => $fieldId, 'treeWrapperId' => $treeWrapperId], true) . '>
- <div class="formengine-field-item t3js-formengine-field-item">
- ' . $fieldInformationHtml . '
- <div class="form-control-wrap">
- <div class="form-wizards-wrap">
- <div class="form-wizards-element">
- <div class="typo3-tceforms-tree">
- <input ' . GeneralUtility::implodeAttributes(array_map('strval', $recordElementAttributes), true, true) . '/>
- </div>
- <div id="' . htmlspecialchars($treeWrapperId) . '" class="svg-tree-element" style="height: ' . $heightInPx . 'px;"></div>
+ '<typo3-formengine-element-category ' . GeneralUtility::implodeAttributes(['class' => 'formengine-field-item t3js-formengine-field-item', 'recordFieldId' => $fieldId, 'treeWrapperId' => $treeWrapperId], true) . '>
+ ' . $fieldInformationHtml . '
+ <div class="form-control-wrap">
+ <div class="form-wizards-wrap">
+ <div class="form-wizards-element">
+ <div class="typo3-tceforms-tree">
+ <input ' . GeneralUtility::implodeAttributes(array_map('strval', $recordElementAttributes), true, true) . '/>
</div>
- ' . $fieldWizardHtml . '
+ <div id="' . htmlspecialchars($treeWrapperId) . '" class="svg-tree-element" style="height: ' . $heightInPx . 'px;"></div>
</div>
+ ' . $fieldWizardHtml . '
</div>
</div>
</typo3-formengine-element-category>';
diff --git a/typo3/sysext/backend/Classes/Form/Element/DatetimeElement.php b/typo3/sysext/backend/Classes/Form/Element/DatetimeElement.php
index c2577e67de2375e784f3ac3175e353196c2385ae..df58837a3c0453db11228bcc3707813f44cffff9 100644
--- a/typo3/sysext/backend/Classes/Form/Element/DatetimeElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/DatetimeElement.php
@@ -274,10 +274,9 @@ class DatetimeElement extends AbstractFormElement
}
$resultArray['html'] = '
- <typo3-formengine-element-datetime recordFieldId="' . htmlspecialchars($fieldId) . '">
- <div class="formengine-field-item t3js-formengine-field-item">
- ' . $fieldInformationHtml . $fullElement . '
- </div>
+ <typo3-formengine-element-datetime class="formengine-field-item t3js-formengine-field-item" recordFieldId="' . htmlspecialchars($fieldId) . '">
+ ' . $fieldInformationHtml . '
+ ' . $fullElement . '
</typo3-formengine-element-datetime>';
$resultArray['javaScriptModules'][] = JavaScriptModuleInstruction::create('@typo3/backend/form-engine/element/datetime-element.js');
diff --git a/typo3/sysext/backend/Classes/Form/Element/LinkElement.php b/typo3/sysext/backend/Classes/Form/Element/LinkElement.php
index 2110721b1572eba89e1e867140e6a9d76257254b..9d7aa0b03c70e862cc5bc19c59ee4a3118285d1a 100644
--- a/typo3/sysext/backend/Classes/Form/Element/LinkElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/LinkElement.php
@@ -283,10 +283,9 @@ class LinkElement extends AbstractFormElement
}
$resultArray['html'] = '
- <typo3-formengine-element-link recordFieldId="' . htmlspecialchars($fieldId) . '">
- <div class="formengine-field-item t3js-formengine-field-item">
- ' . $fieldInformationHtml . $fullElement . '
- </div>
+ <typo3-formengine-element-link class="formengine-field-item t3js-formengine-field-item" recordFieldId="' . htmlspecialchars($fieldId) . '">
+ ' . $fieldInformationHtml . '
+ ' . $fullElement . '
</typo3-formengine-element-link>';
$resultArray['javaScriptModules'][] = JavaScriptModuleInstruction::create('@typo3/backend/form-engine/element/link-element.js');
diff --git a/typo3/sysext/backend/Classes/Form/Element/PasswordElement.php b/typo3/sysext/backend/Classes/Form/Element/PasswordElement.php
index 1cb86e3adc4fd75d67fc42e38ae196741b3ad179..360e7e850c47f668196eee13048cdd29003af73d 100644
--- a/typo3/sysext/backend/Classes/Form/Element/PasswordElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/PasswordElement.php
@@ -215,14 +215,15 @@ class PasswordElement extends AbstractFormElement
$passwordPolicyInfo = $this->renderPasswordPolicyRequirements($passwordPolicyValidator, $fieldId);
}
+ $passwordElementAttributes['class'] = 'formengine-field-item t3js-formengine-field-item';
$passwordElementAttributes['recordFieldId'] = $fieldId;
$passwordElementAttributes['passwordPolicy'] = $passwordPolicy;
$resultArray['html'] = '
<typo3-formengine-element-password ' . GeneralUtility::implodeAttributes($passwordElementAttributes, true) . '>
- <div class="formengine-field-item t3js-formengine-field-item">
- ' . $fieldInformationHtml . $fullElement . $passwordPolicyInfo . '
- </div>
+ ' . $fieldInformationHtml . '
+ ' . $fullElement . '
+ ' . $passwordPolicyInfo . '
</typo3-formengine-element-password>';
$resultArray['javaScriptModules'][] = JavaScriptModuleInstruction::create(
diff --git a/typo3/sysext/backend/Classes/Form/Element/TextElement.php b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
index 3fee4ecc674b7c06036087de7e8305e6ff5292d4..69e7d9d7633cea2bbf3b265305afaa475089a4b7 100644
--- a/typo3/sysext/backend/Classes/Form/Element/TextElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
@@ -311,10 +311,9 @@ class TextElement extends AbstractFormElement
}
$resultArray['html'] = '
- <typo3-formengine-element-text recordFieldId="' . htmlspecialchars($fieldId) . '">
- <div class="formengine-field-item t3js-formengine-field-item">
- ' . $fieldInformationHtml . $fullElement . '
- </div>
+ <typo3-formengine-element-text class="formengine-field-item t3js-formengine-field-item" recordFieldId="' . htmlspecialchars($fieldId) . '">
+ ' . $fieldInformationHtml . '
+ ' . $fullElement . '
</typo3-formengine-element-text>';
$resultArray['javaScriptModules'][] = JavaScriptModuleInstruction::create('@typo3/backend/form-engine/element/text-element.js');
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Form/ImageManipulationElement.html b/typo3/sysext/backend/Resources/Private/Templates/Form/ImageManipulationElement.html
index bae5e3755bdd8c35d9af1224f76aae67aeba1c35..e660ac7f8c66d9e53e24ad34dd450d3c5b439af6 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Form/ImageManipulationElement.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Form/ImageManipulationElement.html
@@ -4,7 +4,7 @@
data-namespace-typo3-fluid="true"
>
-<div class="t3js-formengine-field-item">
+<div class="formengine-field-item t3js-formengine-field-item">
{fieldInformation -> f:format.raw()}
diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css
index d0a3bf8d3c82c7b42ee49f4cca6025a468ba05c4..57e7b2c1d2b59e6ab8b961d58995ff631c726689 100644
--- a/typo3/sysext/backend/Resources/Public/Css/backend.css
+++ b/typo3/sysext/backend/Resources/Public/Css/backend.css
@@ -3933,10 +3933,10 @@ label .icon img{pointer-events:none}
.form-control-holder{position:relative}
::-ms-reveal{display:none}
.row>.form-group>.form-control-wrap{margin-bottom:0}
-.form-group .t3js-formengine-field-item{position:relative}
-.form-group .t3js-formengine-field-item>.t3js-charcounter-wrapper{left:0;position:absolute;top:100%;display:flex;margin:0 -2px}
-.form-group .t3js-formengine-field-item>.t3js-charcounter-wrapper .t3js-charcounter{margin:0 2px}
-.form-group .t3js-formengine-field-item>.t3js-charcounter-wrapper .t3js-charcounter-min{margin:0 2px}
+.formengine-field-item{display:block;position:relative}
+.formengine-field-item>.t3js-charcounter-wrapper{left:0;position:absolute;top:100%;display:flex;margin:0 -2px}
+.formengine-field-item>.t3js-charcounter-wrapper .t3js-charcounter{margin:0 2px}
+.formengine-field-item>.t3js-charcounter-wrapper .t3js-charcounter-min{margin:0 2px}
.form-group>.form-label,.form-group>label{font-weight:600;margin:0 0 .25rem;word-break:break-all}
.form-group .panel,.form-group .panel-group{overflow:visible}
.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{color:#737373}