From 3092bcb3d35ec8f033b0c26d22991305278e2647 Mon Sep 17 00:00:00 2001 From: Andreas Fernandez <a.fernandez@scripting-base.de> Date: Fri, 10 Feb 2017 18:37:30 +0100 Subject: [PATCH] [BUGFIX] Remove styling from .t3js-* classes Resolves: #79729 Releases: master Change-Id: I689e8ecd0ffa2d005931e6162fb8df5d9694da3d Reviewed-on: https://review.typo3.org/51629 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Michael Oehlhof <typo3@oehlhof.de> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Markus Klein <markus.klein@typo3.org> Tested-by: Markus Klein <markus.klein@typo3.org> --- .../Public/Less/TYPO3/_element_cropper.less | 24 +++++++++---------- .../Public/Less/TYPO3/_element_tceforms.less | 2 +- .../Container/FlexFormElementContainer.php | 2 +- .../Classes/Form/Element/CheckboxElement.php | 2 +- .../Classes/Form/Element/GroupElement.php | 4 ++-- .../Form/Element/InputColorPickerElement.php | 4 ++-- .../Form/Element/InputDateTimeElement.php | 4 ++-- .../Classes/Form/Element/InputLinkElement.php | 4 ++-- .../Classes/Form/Element/InputTextElement.php | 4 ++-- .../Classes/Form/Element/NoneElement.php | 2 +- .../Classes/Form/Element/RadioElement.php | 2 +- .../Form/Element/SelectCheckBoxElement.php | 2 +- .../SelectMultipleSideBySideElement.php | 4 ++-- .../Form/Element/SelectSingleBoxElement.php | 2 +- .../Form/Element/SelectSingleElement.php | 2 +- .../Form/Element/SelectTreeElement.php | 2 +- .../Classes/Form/Element/TextElement.php | 4 ++-- .../Classes/Form/Element/TextTableElement.php | 4 ++-- .../Classes/Form/Element/UserElement.php | 2 +- .../Element/BackendLayoutWizardElement.php | 2 +- .../Private/TypeScript/ImageManipulation.ts | 2 +- .../backend/Resources/Public/Css/backend.css | 20 ++++++++-------- .../Public/JavaScript/ImageManipulation.js | 2 +- .../Classes/Form/Element/RsaInputElement.php | 4 ++-- .../Classes/Form/Element/RichTextElement.php | 2 +- .../Classes/Form/Element/RichTextElement.php | 2 +- .../Classes/Form/Element/T3editorElement.php | 2 +- 27 files changed, 55 insertions(+), 57 deletions(-) diff --git a/Build/Resources/Public/Less/TYPO3/_element_cropper.less b/Build/Resources/Public/Less/TYPO3/_element_cropper.less index e63faaa6038a..0404c0148477 100644 --- a/Build/Resources/Public/Less/TYPO3/_element_cropper.less +++ b/Build/Resources/Public/Less/TYPO3/_element_cropper.less @@ -65,9 +65,17 @@ max-width: 1000px !important; } + // Custom styles for cropper radio buttons .ratio-buttons { - .btn.btn-default { - margin-bottom: 5px; + margin-bottom: 10px; + + .btn { + &.btn-default { + margin-bottom: 5px; + } + &:not(.active) .fa { + display: none; + } } } @@ -281,16 +289,6 @@ } } - // Custom styles for cropper radio buttons - .t3js-ratio-buttons { - margin-bottom: 10px; - - .btn:not(.active) .fa { - display: none; - } - } - - // Cropper UI-specific styles .cropper-focus-area { cursor: move; @@ -333,7 +331,7 @@ } } - .t3js-cropper-cover-area { + .cropper-cover-area { background: url("../Images/cropper-background-cover-area.svg"); pointer-events: none; cursor: not-allowed; diff --git a/Build/Resources/Public/Less/TYPO3/_element_tceforms.less b/Build/Resources/Public/Less/TYPO3/_element_tceforms.less index 1729cfd1dba4..e9ffce7aab0a 100644 --- a/Build/Resources/Public/Less/TYPO3/_element_tceforms.less +++ b/Build/Resources/Public/Less/TYPO3/_element_tceforms.less @@ -231,7 +231,7 @@ div.t3-form-field-container:first-child .t3-form-field-label-flex { .t3-form-field-disable { display: none; } -.t3js-formengine-field-item.disabled { +.formengine-field-item.disabled { position: relative; .t3-form-field-disable { z-index: 8000; diff --git a/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php b/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php index 69ddac5fbc0a..b98697822d20 100644 --- a/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php +++ b/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php @@ -144,7 +144,7 @@ class FlexFormElementContainer extends AbstractContainer $html[] = '<label class="t3js-formengine-label">'; $html[] = BackendUtility::wrapInHelp($parameterArray['_cshKey'], $flexFormFieldName, $processedTitle); $html[] = '</label>'; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $childResult['html']; $html[] = '</div>'; $html[] = '</div>'; diff --git a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php index b697f1598451..e0662211784a 100644 --- a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php @@ -136,7 +136,7 @@ class CheckboxElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$disabled) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php index 846396ecfb42..6d8ac29a6a32 100644 --- a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php @@ -178,7 +178,7 @@ class GroupElement extends AbstractFormElement if (isset($config['readOnly']) && $config['readOnly']) { // Return early if element is read only $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<select'; @@ -304,7 +304,7 @@ class GroupElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-wizards-wrap">'; if ($internalType === 'db' && (!isset($config['hideSuggest']) || (bool)$config['hideSuggest'] !== true)) { diff --git a/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php b/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php index eb7c8b69ff71..18c23ba597c4 100644 --- a/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php @@ -71,7 +71,7 @@ class InputColorPickerElement extends AbstractFormElement if ($config['readOnly']) { $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -233,7 +233,7 @@ class InputColorPickerElement extends AbstractFormElement $fullElement = implode(LF, $fullElement); } - $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; + $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; return $resultArray; } diff --git a/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php b/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php index 6b291bd76aa5..3d85bda714d3 100644 --- a/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php @@ -95,7 +95,7 @@ class InputDateTimeElement extends AbstractFormElement // Early return for read only fields $itemValue = $this->formatValue($format, $itemValue); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -253,7 +253,7 @@ class InputDateTimeElement extends AbstractFormElement $fullElement = implode(LF, $fullElement); } - $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; + $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; return $resultArray; } diff --git a/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php b/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php index 754d77177764..343dadaaee3b 100644 --- a/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php @@ -94,7 +94,7 @@ class InputLinkElement extends AbstractFormElement if ($config['readOnly']) { // Early return for read only fields $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -292,7 +292,7 @@ class InputLinkElement extends AbstractFormElement $fullElement = implode(LF, $fullElement); } - $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; + $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; return $resultArray; } diff --git a/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php b/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php index 08badc343301..79196ef44cc6 100644 --- a/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php @@ -78,7 +78,7 @@ class InputTextElement extends AbstractFormElement $itemValue = $itemValue ? '*********' : ''; } $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -295,7 +295,7 @@ class InputTextElement extends AbstractFormElement $fullElement = implode(LF, $fullElement); } - $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; + $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; return $resultArray; } diff --git a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php index 21d0fcbc0f8a..e7fb8a6382fa 100644 --- a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php @@ -68,7 +68,7 @@ class NoneElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldInformationResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; diff --git a/typo3/sysext/backend/Classes/Form/Element/RadioElement.php b/typo3/sysext/backend/Classes/Form/Element/RadioElement.php index 2eb27c858b8c..1a722d2c5bb5 100644 --- a/typo3/sysext/backend/Classes/Form/Element/RadioElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/RadioElement.php @@ -71,7 +71,7 @@ class RadioElement extends AbstractFormElement $fieldWizardHtml = $fieldWizardResult['html']; $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$disabled) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php index 48c0825d0cf6..10659edfd23b 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php @@ -147,7 +147,7 @@ class SelectCheckBoxElement extends AbstractFormElement $fieldWizardHtml = $legacyFieldWizardHtml . $fieldWizardResult['html']; $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$disabled) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php index 9cfae06b710c..9c34a247ecbc 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php @@ -218,7 +218,7 @@ class SelectMultipleSideBySideElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; @@ -370,7 +370,7 @@ class SelectMultipleSideBySideElement extends AbstractFormElement } $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<label>'; diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php index 005f83dd0f16..c3cc6356faf8 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php @@ -115,7 +115,7 @@ class SelectSingleBoxElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$disabled) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php index 63319c7dc3c2..a79501f6a02e 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php @@ -202,7 +202,7 @@ class SelectSingleElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$disabled) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php index fc49a70ce414..6affcde3b8d2 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php @@ -110,7 +110,7 @@ class SelectTreeElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldInformationResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; if (!$readOnly) { $html[] = $fieldInformationHtml; } diff --git a/typo3/sysext/backend/Classes/Form/Element/TextElement.php b/typo3/sysext/backend/Classes/Form/Element/TextElement.php index a7d20fcc2741..632caf0d652d 100644 --- a/typo3/sysext/backend/Classes/Form/Element/TextElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/TextElement.php @@ -96,7 +96,7 @@ class TextElement extends AbstractFormElement if ($config['readOnly']) { $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -292,7 +292,7 @@ class TextElement extends AbstractFormElement $fullElement = implode(LF, $fullElement); } - $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; + $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>'; return $resultArray; } diff --git a/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php b/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php index d6d1c290a629..1584245af729 100644 --- a/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php @@ -101,7 +101,7 @@ class TextTableElement extends AbstractFormElement if ($config['readOnly']) { $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -185,7 +185,7 @@ class TextTableElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; $html[] = '<div class="form-wizards-wrap">'; diff --git a/typo3/sysext/backend/Classes/Form/Element/UserElement.php b/typo3/sysext/backend/Classes/Form/Element/UserElement.php index 37c1d5f1fb23..238a35b96281 100644 --- a/typo3/sysext/backend/Classes/Form/Element/UserElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/UserElement.php @@ -45,7 +45,7 @@ class UserElement extends AbstractFormElement if (!isset($parameterArray['fieldCong']['config']['noTableWrapping']) || (bool)$parameterArray['fieldCong']['config']['noTableWrapping'] === false ) { - $html = '<div class="t3js-formengine-field-item">' . $html . '</div>'; + $html = '<div class="formengine-field-item t3js-formengine-field-item">' . $html . '</div>'; } $resultArray['html'] = $html; return $resultArray; diff --git a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php index 979af07d3584..716a3bd2855a 100644 --- a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php +++ b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php @@ -57,7 +57,7 @@ class BackendLayoutWizardElement extends AbstractFormElement $json = json_encode($this->rows, JSON_HEX_QUOT | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-control-wrap">'; $html[] = '<div class="form-wizards-wrap">'; diff --git a/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts b/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts index 6bad4ded3a26..722a0b39caa3 100644 --- a/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts +++ b/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts @@ -583,7 +583,7 @@ class ImageManipulation { */ private initCoverAreas(container: JQuery, coverAreas: Area[]): void { coverAreas.forEach((coverArea: Area): void => { - let coverAreaCanvas: JQuery = $('<div class="t3js-cropper-cover-area"></div>'); + let coverAreaCanvas: JQuery = $('<div class="cropper-cover-area t3js-cropper-cover-area"></div>'); container.append(coverAreaCanvas); coverAreaCanvas.css({ height: ImageManipulation.toCssPercent(coverArea.height), diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css index 3a5fe2eb0bc3..6de535edcb00 100644 --- a/typo3/sysext/backend/Resources/Public/Css/backend.css +++ b/typo3/sysext/backend/Resources/Public/Css/backend.css @@ -9727,9 +9727,15 @@ iframe, width: 100% !important; max-width: 1000px !important; } +.cropper .ratio-buttons { + margin-bottom: 10px; +} .cropper .ratio-buttons .btn.btn-default { margin-bottom: 5px; } +.cropper .ratio-buttons .btn:not(.active) .fa { + display: none; +} .cropper .panel-group { position: relative; margin: -15px; @@ -9900,12 +9906,6 @@ iframe, bottom: 0; left: 0; } -.cropper .t3js-ratio-buttons { - margin-bottom: 10px; -} -.cropper .t3js-ratio-buttons .btn:not(.active) .fa { - display: none; -} .cropper .cropper-focus-area { cursor: move; height: 200px; @@ -9944,7 +9944,7 @@ iframe, pointer-events: none; overflow: hidden; } -.cropper .t3js-cropper-cover-area { +.cropper .cropper-cover-area { background: url("../Images/cropper-background-cover-area.svg"); pointer-events: none; cursor: not-allowed; @@ -9952,7 +9952,7 @@ iframe, opacity: 1; z-index: 99999; } -.cropper .t3js-cropper-cover-area:after { +.cropper .cropper-cover-area:after { background-color: rgba(255, 255, 255, 0.95); content: "Cover area"; position: absolute; @@ -11804,10 +11804,10 @@ div.t3-form-field-container:first-child .t3-form-field-label-flex { .t3-form-field-disable { display: none; } -.t3js-formengine-field-item.disabled { +.formengine-field-item.disabled { position: relative; } -.t3js-formengine-field-item.disabled .t3-form-field-disable { +.formengine-field-item.disabled .t3-form-field-disable { z-index: 8000; background: #fafafa; display: block; diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js index 15a571352a90..fd6907c5046c 100644 --- a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js +++ b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js @@ -452,7 +452,7 @@ define(["require", "exports", "TYPO3/CMS/Core/Contrib/imagesloaded.pkgd.min", "T */ ImageManipulation.prototype.initCoverAreas = function (container, coverAreas) { coverAreas.forEach(function (coverArea) { - var coverAreaCanvas = $('<div class="t3js-cropper-cover-area"></div>'); + var coverAreaCanvas = $('<div class="cropper-cover-area t3js-cropper-cover-area"></div>'); container.append(coverAreaCanvas); coverAreaCanvas.css({ height: ImageManipulation.toCssPercent(coverArea.height), diff --git a/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php b/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php index a6a0503e1386..1a405c096a6e 100644 --- a/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php +++ b/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php @@ -61,7 +61,7 @@ class RsaInputElement extends AbstractFormElement if ($config['readOnly']) { $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = '<div class="form-wizards-wrap">'; $html[] = '<div class="form-wizards-element">'; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; @@ -149,7 +149,7 @@ class RsaInputElement extends AbstractFormElement $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-control-wrap" style="max-width: ' . $width . 'px">'; $html[] = '<div class="form-wizards-wrap">'; diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php index 727fe9fb20b1..89f134423b7f 100644 --- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php +++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php @@ -100,7 +100,7 @@ class RichTextElement extends AbstractFormElement ]; $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-control-wrap">'; $html[] = '<div class="form-wizards-wrap">'; diff --git a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php index 3f779cfec37c..50729f884434 100644 --- a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php +++ b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php @@ -336,7 +336,7 @@ class RichTextElement extends AbstractFormElement $fieldWizardHtml = $legacyFieldWizardHtml . $fieldWizardResult['html']; $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $fieldWizardResult, false); - $result[] = '<div class="t3js-formengine-field-item">'; + $result[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $result[] = '<div class="form-control-wrap">'; $result[] = '<div class="form-wizards-wrap">'; $result[] = '<div class="form-wizards-element">'; diff --git a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php index 47d33450eeba..92079e1611b5 100644 --- a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php +++ b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php @@ -159,7 +159,7 @@ class T3editorElement extends AbstractFormElement $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $fieldWizardResult, false); $html = []; - $html[] = '<div class="t3js-formengine-field-item">'; + $html[] = '<div class="formengine-field-item t3js-formengine-field-item">'; $html[] = $fieldInformationHtml; $html[] = '<div class="form-control-wrap">'; $html[] = '<div class="form-wizards-wrap">'; -- GitLab