From a1cc00316843cc015183fb3f6cfb7da9b9804d7f Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 24 Oct 2021 21:00:51 +0100
Subject: [PATCH 1/2] Fix error/warning icon

---
 war/src/main/less/base/style.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index abbde0ad28a3..4ab6e1e413c4 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -577,9 +577,9 @@ label.attach-previous {
     min-height: 16px;
     line-height: 16px;
     background-image: url("../../images/svgs/error.svg");
-    background-position: left center;
+    background-position: left top;
     background-repeat: no-repeat;
-    background-size: contain;
+    background-size: 16px 16px;
 }
 
 .error-inline {
@@ -594,9 +594,9 @@ label.attach-previous {
     min-height: 16px;
     line-height: 16px;
     background-image: url("../../images/svgs/warning.svg");
-    background-position: left center;
+    background-position: left top;
     background-repeat: no-repeat;
-    background-size: contain;
+    background-size: 16px 16px;
 }
 
 .warning-inline {

From e894c56addae94520d01833e6fb1c94432231d2b Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Sun, 24 Oct 2021 21:08:27 +0100
Subject: [PATCH 2/2] Draggable cards now have a max width

---
 core/src/main/resources/lib/form/hetero-list.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly
index 966d72f81e51..c99847676c40 100644
--- a/core/src/main/resources/lib/form/hetero-list.jelly
+++ b/core/src/main/resources/lib/form/hetero-list.jelly
@@ -114,7 +114,7 @@ THE SOFTWARE.
   <st:adjunct includes="lib.form.hetero-list.hetero-list"/>
 
   <j:set var="targetType" value="${attrs.targetType?:it.class}"/>
-  <div class="hetero-list-container ${hasHeader?'with-drag-drop':''} ${attrs.oneEach?'one-each':''} ${attrs.honorOrder?'honor-order':''}">
+  <div class="jenkins-form-item hetero-list-container ${hasHeader?'with-drag-drop':''} ${attrs.oneEach?'one-each':''} ${attrs.honorOrder?'honor-order':''}">
     <!-- display existing items -->
     <j:forEach var="i" items="${attrs.items}"><!-- TODO consider customizedFields: how to distinguish default items from user-configured items? -->
       <j:set var="descriptor" value="${i.descriptor}" />