From 88e1017c601cd8237d6cab7dbbee7ca86a8d7f3f Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Tue, 30 Nov 2021 10:03:52 +0000
Subject: [PATCH] Fix additional paddings at bottom of forms/optional blocks

---
 .../jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly  | 2 +-
 .../jenkins/tools/GlobalToolConfiguration/index.groovy       | 2 +-
 core/src/main/resources/lib/form/entry.jelly                 | 2 +-
 core/src/main/resources/lib/form/rowSet.jelly                | 5 ++++-
 war/src/main/less/base/style.less                            | 1 +
 war/src/main/less/modules/form.less                          | 5 +++++
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly b/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
index fcd17978b2e1..3f3ff2065305 100644
--- a/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
+++ b/core/src/main/resources/jenkins/mvn/FilePathGlobalSettingsProvider/config.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
-    <f:entry title="${%File path}" field="path">
+    <f:entry title="${%File path}" field="path" class="jenkins-!-margin-bottom-0">
         <f:textbox />
     </f:entry>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
index db0b5b9f276b..713cdba946eb 100644
--- a/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
+++ b/core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy
@@ -31,7 +31,7 @@ l.layout(permission:app.SYSTEM_READ, title:my.displayName) {
             Functions.getSortedDescriptorsForGlobalConfigByDescriptor(my.FILTER).each { Descriptor descriptor ->
                 set("descriptor",descriptor)
                 set("instance",descriptor)
-                f.rowSet(name:descriptor.jsonSafeClassName, isFormItem: "false") {
+                f.rowSet(name:descriptor.jsonSafeClassName, class: "jenkins-!-margin-bottom-0") {
                     st.include(from:descriptor, page:descriptor.globalConfigPage)
                 }
             }
diff --git a/core/src/main/resources/lib/form/entry.jelly b/core/src/main/resources/lib/form/entry.jelly
index 578306c55dcd..8751a5ea12ec 100644
--- a/core/src/main/resources/lib/form/entry.jelly
+++ b/core/src/main/resources/lib/form/entry.jelly
@@ -52,7 +52,7 @@ THE SOFTWARE.
       This content is HTML (unless the boolean variable escapeEntryTitleAndDescription is set). Use h.escape if necessary.
     </st:attribute>
     <st:attribute name="class">
-      Classes to apply to the form
+      Classes to apply to the form item
     </st:attribute>
     <st:attribute name="help">
       URL to the HTML page. When this attribute is specified, the entry gets
diff --git a/core/src/main/resources/lib/form/rowSet.jelly b/core/src/main/resources/lib/form/rowSet.jelly
index 94468d70a689..2ede2c842d40 100644
--- a/core/src/main/resources/lib/form/rowSet.jelly
+++ b/core/src/main/resources/lib/form/rowSet.jelly
@@ -38,6 +38,9 @@ THE SOFTWARE.
     <st:attribute name="isFormItem">
       Removes the "jenkins-form-item" class if false
     </st:attribute>
+    <st:attribute name="class">
+      Classes to apply to the container (this will be the form item if 'isFormItem' is true)
+    </st:attribute>
   </st:documentation>
 
   <j:choose>
@@ -46,7 +49,7 @@ THE SOFTWARE.
       <d:invokeBody />
     </j:when>
     <j:otherwise>
-      <div class="${isFormItem.equals('false') ? '' : 'jenkins-form-item'}">
+      <div class="${isFormItem.equals('false') ? '' : 'jenkins-form-item'} ${class}">
         <div ref="${attrs.ref}" class="row-set-start row-group-start tr" style="display:none" name="${attrs.name}"></div>
         <d:invokeBody />
         <div class="row-set-end row-group-end tr"></div>
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
index a9761fb937ef..6182f2abd215 100644
--- a/war/src/main/less/base/style.less
+++ b/war/src/main/less/base/style.less
@@ -1149,6 +1149,7 @@ table.fingerprint-in-build td {
   opacity: 0!important;
   max-height: 0!important;
   height: 0!important;
+  overflow: hidden;
 }
 
 .row-set-end { display: none; }
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index 9ff72c2090af..1c7555496aa8 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -637,3 +637,8 @@
     }
   }
 }
+
+// TODO Remove when https://github.com/jenkinsci/jenkins/pull/5916 is merged in
+.jenkins-\!-margin-bottom-0 {
+  margin-bottom: 0 !important;
+}