Merge pull request #2175 from kohsuke/JENKINS-33799

[FIX JENKINS-33799] Enforce correct icon size in list view
jenkinsci · Mar 29, 2016 · 62d0e0c · 62d0e0c
2 parents bcbc019 + b23cb10
commit 62d0e0c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/core/src/main/resources/lib/hudson/ballColorTd.jelly b/core/src/main/resources/lib/hudson/ballColorTd.jelly
@@ -71,7 +71,7 @@ THE SOFTWARE.
             <j:otherwise>
               <!-- We don't seem to have this icon in the IconSet... fallback again... -->
               <j:set var="iconUrl" value="${it.getImageOf(iconSize)}"/>
-              <l:icon src="${iconUrl}" alt="${it.description}" tooltip="${it.description}" style="${attrs.style}" />
+              <l:icon src="${iconUrl}" class="${iconSizeClass}" alt="${it.description}" tooltip="${it.description}" style="${attrs.style}" />
             </j:otherwise>
           </j:choose>
         </j:otherwise>

diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
@@ -1975,3 +1975,24 @@ body.main-panel-only #main-panel {
         padding: 2em 10%;
     }
 }
+
+/* see the Icon class for the definition of these CSS classes */
+.icon-sm {
+    width: 16px;
+    height: 16px;
+}
+
+.icon-md {
+    width: 24px;
+    height: 24px;
+}
+
+.icon-lg {
+    width: 32px;
+    height: 32px;
+}
+
+.icon-xlg {
+    width: 48px;
+    height: 48px;
+}