From 4a44304e5b30b97f411cc4bc6139e7795761f684 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 29 Nov 2021 20:19:35 +0000
Subject: [PATCH] Fix checkbox help alignment, add theme support for YUI modals

---
 core/src/main/resources/lib/form/entry.jelly  | 2 +-
 war/src/main/less/base/yui-compatibility.less | 5 +++++
 war/src/main/less/modules/form.less           | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/form/entry.jelly b/core/src/main/resources/lib/form/entry.jelly
index f7a9ab4d1285..578306c55dcd 100644
--- a/core/src/main/resources/lib/form/entry.jelly
+++ b/core/src/main/resources/lib/form/entry.jelly
@@ -96,7 +96,7 @@ THE SOFTWARE.
         </j:if>
       </j:when>
       <j:otherwise>
-        <div class="jenkins-checkbox-help-wrapper">
+        <div>
           <d:invokeBody />
           <f:helpLink url="${attrs.help}" featureName="${title}"/>
         </div>
diff --git a/war/src/main/less/base/yui-compatibility.less b/war/src/main/less/base/yui-compatibility.less
index 655054472655..a7df1a601559 100644
--- a/war/src/main/less/base/yui-compatibility.less
+++ b/war/src/main/less/base/yui-compatibility.less
@@ -216,3 +216,8 @@ div.yahooTree td {
     display: inline-block;
   }
 }
+
+.yui-panel,
+.yui-panel .bd {
+  background-color: var(--background) !important;
+}
\ No newline at end of file
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index 0ff5d62b5987..805e675ab234 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -372,12 +372,18 @@
   }
 }
 
+// Align help buttons correctly with checkboxes
+
 .jenkins-checkbox-help-wrapper {
   display: flex;
   align-items: center;
   justify-content: flex-start;
 }
 
+.jenkins-checkbox + a.jenkins-help-button {
+  vertical-align: top;
+}
+
 .jenkins-checkbox {
   position: relative;
   display: inline-flex;