Merge pull request #9614 from NotMyFault/backporting-2.462.2

Backporting for 2.462.2
jenkinsci · Aug 15, 2024 · 816597f · 816597f
2 parents 7ca169b + bb61a4e
commit 816597f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js
@@ -145,8 +145,10 @@ $.when(getItems()).done(function (data) {
 
       var iconDiv = drawIcon(elem);
       item.appendChild(iconDiv);
+      var labelContainer = document.createElement("div");
+      item.appendChild(labelContainer);
 
-      var label = item.appendChild(document.createElement("label"));
+      var label = labelContainer.appendChild(document.createElement("label"));
 
       var radio = label.appendChild(document.createElement("input"));
       radio.type = "radio";
@@ -158,7 +160,7 @@ $.when(getItems()).done(function (data) {
 
       displayName.appendChild(document.createTextNode(elem.displayName));
 
-      var desc = item.appendChild(document.createElement("div"));
+      var desc = labelContainer.appendChild(document.createElement("div"));
       desc.className = "desc";
       desc.innerHTML = checkForLink(elem.description);
 

diff --git a/war/src/main/js/widgets/add/addform.scss b/war/src/main/js/widgets/add/addform.scss
@@ -59,16 +59,13 @@
   }
 
   .default-icon {
-    position: absolute;
-    left: 10px;
-    top: 10px;
-    height: 48px;
-    width: 48px;
+    height: 40px;
+    width: 40px;
     border-radius: 50%;
     text-align: center;
-    line-height: 48px;
+    line-height: 36px;
     font-weight: bold;
-    font-size: 175%;
+    font-size: 125%;
     color: #ffffff;
     text-shadow: rgba(0, 0, 0, 0.25) 0 -1px 1px;
     opacity: 0.75;

diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss
@@ -157,11 +157,12 @@
   .jenkins-button {
     margin: -10px 0;
     padding: 0.5rem 0.75rem;
+    min-height: 1.75rem;
 
     // Increase the size of symbols compared to regular buttons
     svg {
-      width: 1.375rem !important;
-      height: 1.375rem !important;
+      width: 1.5rem !important;
+      height: 1.5rem !important;
     }
   }
 
@@ -170,8 +171,8 @@
     svg,
     .build-status-icon__wrapper,
     img {
-      width: 1.375rem !important;
-      height: 1.375rem !important;
+      width: 1.5rem !important;
+      height: 1.5rem !important;
     }
   }
 
@@ -192,6 +193,15 @@
         height: 1.3rem !important;
       }
     }
+
+    .jenkins-button {
+      padding: 0.4rem 0.6rem;
+
+      svg {
+        width: 1.3rem !important;
+        height: 1.3rem !important;
+      }
+    }
   }
 
   &--auto-width {
@@ -215,6 +225,15 @@
         height: 1rem !important;
       }
     }
+
+    .jenkins-button {
+      padding: 0.3rem 0.5rem;
+
+      svg {
+        width: 1rem !important;
+        height: 1rem !important;
+      }
+    }
   }
 
   &__button,