From 00e79c8113def4fdc7ecd8ef87ae8befbb1e7941 Mon Sep 17 00:00:00 2001
From: Alex <mc.cache@web.de>
Date: Tue, 30 Nov 2021 22:07:27 +0100
Subject: [PATCH] style: Let core override icons on newer Jenkins versions
 (#481)

---
 .../workflow/cps/CpsThreadDumpAction/index.jelly  |   2 +-
 .../workflow/cps/PauseUnpauseAction/action.jelly  |   2 +-
 src/main/webapp/images/24x24/README.md            |   1 -
 src/main/webapp/images/24x24/pause.png            | Bin 785 -> 0 bytes
 src/main/webapp/images/pause.svg                  |   4 ++++
 5 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 src/main/webapp/images/24x24/README.md
 delete mode 100644 src/main/webapp/images/24x24/pause.png
 create mode 100644 src/main/webapp/images/pause.svg

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly
index 5430d6af7..0c2ac9d36 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsThreadDumpAction/index.jelly
@@ -28,7 +28,7 @@
   <l:layout title="${%Thread Dump}">
     <l:side-panel>
       <l:tasks>
-        <l:task icon="images/24x24/up.png" href="${rootURL}/${it.parentUrl}" title="${%Up}" contextMenu="false"/>
+        <l:task icon="icon-up icon-md" href="${rootURL}/${it.parentUrl}" title="${%Up}" contextMenu="false"/>
       </l:tasks>
     </l:side-panel>
     <l:main-panel>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly
index 1cf422aa3..3862473b2 100644
--- a/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly
+++ b/src/main/resources/org/jenkinsci/plugins/workflow/cps/PauseUnpauseAction/action.jelly
@@ -25,5 +25,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
-    <l:task icon="plugin/workflow-cps/images/24x24/pause.png" title="${%Pause/resume}" href="${h.getActionUrl(it.url, action)}/toggle" post="true" contextMenu="true"/>
+    <l:task icon="plugin/workflow-cps/images/pause.svg" title="${%Pause/resume}" href="${h.getActionUrl(it.url, action)}/toggle" post="true" contextMenu="true"/>
 </j:jelly>
diff --git a/src/main/webapp/images/24x24/README.md b/src/main/webapp/images/24x24/README.md
deleted file mode 100644
index ec637d6c2..000000000
--- a/src/main/webapp/images/24x24/README.md
+++ /dev/null
@@ -1 +0,0 @@
-From `tango-icon-theme-0.8.90.tar.gz`, scaled using `jenkinsci/jenkins/war/images/svg2png`.
diff --git a/src/main/webapp/images/24x24/pause.png b/src/main/webapp/images/24x24/pause.png
deleted file mode 100644
index 219f6c31025fd5a511b4222772517e6ac6efbe62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 785
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zu)P6cM!8Z8Q=p(^iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vgAVndW
zB{``KzNsmhi3$NZiIqu-$=M14iKWG<UX!1c09A>DR5_NGWaJky_#_tOD>x_SB<3dO
zr4*%R-k&I?1ym9NQsSInP+63jo>9W!>};SAP@0sJnXKTFpPQJOr{DrKJ~^=@Ge1uu
zqokz3N?$*@C>6*rOHIzt&CSm%2DwVV0IVkktVO>nwJ2ZTP|raB*yFuF85kHJdb&7<
zcyzuEJew8lC}Dfwym<1R>f+DNL3)uATvPY-YPiNbtXQ^h!X)zvv!?FQ+%YBNqo`Nu
z<YQ}mnx?9hKilCE>{!ga()wlO8H3`s&&Kiv?f>OAwO;1kv-{pz`R^<b%sX$`d_8=e
zf4<xu`wE5Ya+go${Ck!9-jboLfBsjkt4ns&RoDG{8vB3A{o6v{@=M}n_Rc%Euh>NH
z)9oLV=AUDm?6>@K&i3114<6^Ae6ivL5WUPf^zP%u**0_Uu&p|^dVY9>&NBuE|4m`5
z3pYkwm^|nFa{<PZtxwp_nhUU=n7z4J^7U7%xy5HTy=nWv(xYYGm6M;Kk(6+yfniQ@
zhKZDj;G`vnt1VAkomt1$n#8b}ONzURq4jE(sOKaBmO14g?j4lsUJ!9-ucM_WhoH`8
z)j7ohq02H)8SpGTHsN0LJORNYfqQm4inxY^uF&#u>fLlT%kZ=jo8trSR;4}P1Cj&u
z+$)W4^CU@R3*KN*VoGlLxOYZ%TE81>qway7JX%c}eR&^U3ukIE3AT1P98KE4>3q;i
zm%xC~hkvtnBuYFpJ0V*yGnGT=niR`6hQJLsbCi68yBgeh*K8FCbh)T2b;NUL{jYyt
z%>Dma)O<<dY)GHap0B?z?nw5kpq2BVgzY#i`%iK|!^!#k?kXQYb_<xG7(8A5T-G@y
GGywo6C`VTS

diff --git a/src/main/webapp/images/pause.svg b/src/main/webapp/images/pause.svg
new file mode 100644
index 000000000..6f885fc87
--- /dev/null
+++ b/src/main/webapp/images/pause.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#b4b4b4">
+    <path d="M0 0h24v24H0V0z" fill="none" />
+    <path d="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
+</svg>