From 78735a6fe9c08013d8e54a8a2f1e2993ccc03927 Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 22 Nov 2021 22:46:09 +0000
Subject: [PATCH] Restore missing description for administrative monitors

---
 .../AdministrativeMonitorsConfiguration/config.groovy     | 7 ++++++-
 war/src/main/less/modules/form.less                       | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy
index 931f78b3ed2f..fb00245ad877 100644
--- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy
+++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy
@@ -35,7 +35,7 @@ f.section(title: _("Administrative monitors configuration")) {
             p(class: "jenkins-form-description", _("blurb"))
             for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all())
                     .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) {
-                div(class: "jenkins-checkbox-help-wrapper", style: "margin-bottom: 0.75rem;") {
+                div(class: "jenkins-checkbox-help-wrapper") {
                     f.checkbox(name: "administrativeMonitor",
                             title: am.displayName,
                             checked: am.enabled,
@@ -44,6 +44,11 @@ f.section(title: _("Administrative monitors configuration")) {
                         span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security"))
                     }
                 }
+                div(class: "tr") {
+                    div(class: "jenkins-checkbox__description") {
+                        st.include(from: am, page: "description", optional: true)
+                    }
+                }
             }
         }
     }
diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
index d7ebfb3a82ab..0ff5d62b5987 100644
--- a/war/src/main/less/modules/form.less
+++ b/war/src/main/less/modules/form.less
@@ -468,9 +468,11 @@
 }
 
 .jenkins-checkbox__description {
-  margin-top: 15px;
-  margin-left: 65px;
-  opacity: 0.75;
+  margin-top: 0.3rem;
+  margin-left: 34px;
+  margin-bottom: 1rem;
+  color: var(--text-color-secondary);
+  line-height: 1.66;
 }
 
 .jenkins-toggle-switch {