Restore missing description for administrative monitors

janfaracik · Nov 22, 2021 · 78735a6 · 78735a6
1 parent 40191ec
commit 78735a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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 {