From 2b7c2a2c1d6df335aed791412ca9901e8aedef20 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Wed, 18 Sep 2024 10:43:45 +0100
Subject: [PATCH] EXPERIMENTAL: Remove help-sibling2 wrapper

---
 .../main/resources/lib/form/hetero-list.jelly | 38 +++++++++----------
 war/src/main/scss/form/_reorderable-list.scss |  9 ++---
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index 3341ba640ab4..ea48919bd1e4 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -81,33 +81,31 @@ THE SOFTWARE.
   </st:documentation>
   <d:taglib uri="local">
     <d:tag name="body">
-      <div class="help-sibling2" style="width:100%">
-        <j:set var="help" value="${descriptor.helpFile}" />
-        <j:set var="disableHandle" value="${attrs.disableDragAndDrop or readOnlyMode}" />
+      <j:set var="help" value="${descriptor.helpFile}" />
+      <j:set var="disableHandle" value="${attrs.disableDragAndDrop or readOnlyMode}" />
 
-        <div class="repeated-chunk__header ${disableHandle ? 'repeated-chunk__header--TODO' : ''}">
-          <j:if test="${!disableHandle}">
-            <div class="dd-handle" />
-          </j:if>
+      <div class="repeated-chunk__header ${disableHandle ? 'repeated-chunk__header--TODO' : ''}">
+        <j:if test="${!disableHandle}">
+          <div class="dd-handle" />
+        </j:if>
 
-          ${descriptor.displayName}
+        ${descriptor.displayName}
 
-          <f:helpLink url="${help}"/>
+        <f:helpLink url="${help}"/>
 
-          <j:if test="${!readOnlyMode}">
-            <f:repeatableDeleteButton value="${attrs.deleteCaption}" />
-          </j:if>
-        </div>
+        <j:if test="${!readOnlyMode}">
+          <f:repeatableDeleteButton value="${attrs.deleteCaption}" />
+        </j:if>
+      </div>
 
-        <f:class-entry descriptor="${descriptor}" />
+      <f:class-entry descriptor="${descriptor}" />
 
-        <div class="notafoodwriter">
-          <j:if test="${help!=null}">
-            <f:helpArea />
-          </j:if>
+      <div class="notafoodwriter">
+        <j:if test="${help!=null}">
+          <f:helpArea />
+        </j:if>
 
-          <d:invokeBody/>
-        </div>
+        <d:invokeBody/>
       </div>
     </d:tag>
   </d:taglib>
diff --git a/war/src/main/scss/form/_reorderable-list.scss b/war/src/main/scss/form/_reorderable-list.scss
index 5c1802df31b7..b75d9ed2b6d0 100644
--- a/war/src/main/scss/form/_reorderable-list.scss
+++ b/war/src/main/scss/form/_reorderable-list.scss
@@ -5,6 +5,9 @@ $exit-animation: 0.2s;
 
 .repeated-chunk {
   position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
   background: var(--card-background);
   border-radius: calc(var(--form-input-border-radius) / 2);
   transition:
@@ -197,12 +200,6 @@ $exit-animation: 0.2s;
   opacity: 0 !important;
 }
 
-.help-sibling2 {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-}
-
 .notafoodwriter2 {
   padding: 0 $inset $inset;