Squashed commit of the following:

janfaracik · Sep 16, 2024 · 0f6466d · 0f6466d
1 parent 2d2adef
commit 0f6466d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy
@@ -31,20 +31,19 @@ st = namespace("jelly:stapler")
 
 f.section(title: _("Administrative monitors configuration")) {
     f.advanced(title: _("Administrative monitors")) {
-        f.entry(title: _("Enabled administrative monitors")) {
-            p(class: "jenkins-form-description", _("blurb"))
+        f.entry(title: _("Enabled administrative monitors"), description: _("blurb")) {
             for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all())
                     .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) {
-                div(class: "jenkins-checkbox-help-wrapper") {
-                    f.checkbox(name: "administrativeMonitor",
-                            title: am.displayName,
-                            checked: am.enabled,
-                            json: am.id)
-                    if (am.isSecurity()) {
-                        span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security"))
+                div(style: "margin-bottom: 0.625rem") {
+                    div(class: "jenkins-checkbox-help-wrapper") {
+                        f.checkbox(name: "administrativeMonitor",
+                                title: am.displayName,
+                                checked: am.enabled,
+                                json: am.id)
+                        if (am.isSecurity()) {
+                            span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security"))
+                        }
                     }
-                }
-                div(class: "tr") {
                     div(class: "jenkins-checkbox__description") {
                         st.include(it: am, page: "description", optional: true)
                     }

diff --git a/war/src/main/scss/form/_checkbox.scss b/war/src/main/scss/form/_checkbox.scss
@@ -187,9 +187,9 @@
 }
 
 .jenkins-checkbox__description {
-  margin-top: 0.3rem;
+  //margin-top: 0.3rem;
   margin-left: 34px;
-  margin-bottom: 1rem;
+  //margin-bottom: 1rem;
   color: var(--text-color-secondary);
   line-height: 1.66;
 }