Push

janfaracik · Aug 1, 2024 · 15a2e9b · 15a2e9b
1 parent 3bc918f
commit 15a2e9b
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 19 deletions.
diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -96,13 +96,15 @@ THE SOFTWARE.
           </j:if>
         </div>
 
-        <j:if test="${help!=null}">
-          <f:helpArea />
-        </j:if>
-
         <f:class-entry descriptor="${descriptor}" />
 
-        <d:invokeBody/>
+        <div class="notafoodwriter">
+          <j:if test="${help!=null}">
+            <f:helpArea />
+          </j:if>
+
+          <d:invokeBody/>
+        </div>
       </div>
     </d:tag>
   </d:taglib>
@@ -120,7 +122,7 @@ THE SOFTWARE.
       </div>
     </j:forEach>
 
-    <div class="repeatable-insertion-point" />
+    <template class="repeatable-insertion-point" />
 
     <div class="prototypes to-be-removed">
       <!-- render one prototype for each type -->
@@ -153,10 +155,8 @@ THE SOFTWARE.
     </div>
 
     <j:if test="${!readOnlyMode}">
-      <div>
-        <button type="button" class="jenkins-button hetero-list-add" menualign="${attrs.menuAlign}" suffix="${attrs.name}">${attrs.addCaption?:'%Add'}<l:icon src="symbol-chevron-down"/>
-        </button>
-      </div>
+      <button type="button" class="jenkins-button hetero-list-add" menualign="${attrs.menuAlign}" suffix="${attrs.name}">${attrs.addCaption?:'%Add'}<l:icon src="symbol-chevron-down"/>
+      </button>
     </j:if>
   </div>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly
@@ -153,7 +153,9 @@ THE SOFTWARE.
         <div class="repeated-chunk__header">
           <j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/>${header}</j:if>
         </div>
-        <d:invokeBody />
+        <div class="notafoodwriter">
+          <d:invokeBody />
+        </div>
       </div>
     </j:forEach>
     <j:remove var="${var}" />
@@ -170,7 +172,7 @@ THE SOFTWARE.
       </j:forEach>
     </j:if>
 
-    <div class="repeatable-insertion-point" />
+    <template class="repeatable-insertion-point" />
     <j:if test="${!attrs.noAddButton}">
       <button type="button" class="jenkins-button repeatable-add">
         ${attrs.add?:'%Add'}

diff --git a/war/src/main/scss/form/_reorderable-list.scss b/war/src/main/scss/form/_reorderable-list.scss
@@ -4,14 +4,24 @@
   position: relative;
   border: var(--card-border-width) solid var(--card-border-color);
   background: color-mix(in srgb, color-mix(in srgb, var(--white) 10%, var(--background)) 60%, transparent);
-  border-radius: var(--form-input-border-radius);
+  border-radius: calc(var(--form-input-border-radius) / 2);
   transition:
     opacity var(--standard-transition),
     max-height var(--standard-transition),
     rotate var(--standard-transition),
     box-shadow var(--standard-transition);
   height: unset !important;
-  margin: 0.4rem 0;
+  margin: 0 0 var(--card-border-width) 0;
+
+  &:first-of-type {
+    border-top-left-radius: var(--form-input-border-radius);
+    border-top-right-radius: var(--form-input-border-radius);
+  }
+
+  &:last-of-type {
+    border-bottom-left-radius: var(--form-input-border-radius);
+    border-bottom-right-radius: var(--form-input-border-radius);
+  }
 }
 
 .repeated-chunk.fade-in,
@@ -116,6 +126,7 @@ div.to-be-removed {
   box-shadow: 0 15px 30px rgba(0, 0, 20, 0.05);
   opacity: 1 !important;
   backdrop-filter: blur(10px);
+  border-radius: var(--form-input-border-radius);
 
   & > * {
     display: none;
@@ -132,11 +143,11 @@ div.to-be-removed {
   opacity: 0.2 !important;
 }
 
-.help-sibling {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
+//.help-sibling {
+//  display: flex;
+//  flex-direction: column;
+//  gap: 10px;
+//}
 
 .repeated-chunk {
   & > div > *:last-of-type {
@@ -242,3 +253,11 @@ div.to-be-removed {
     }
   }
 }
+
+.notafoodwriter {
+  padding: 0.5rem 1rem 1rem;
+
+  &:empty {
+    display: none;
+  }
+}