From 0a331569d4c5402ffef095753fc527c3e14b61f7 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Fri, 7 May 2021 16:34:53 -0700 Subject: [PATCH] Revert "Merge pull request #393 from timja/use-svgs" This reverts commit 87fe08f10078db299586f1fd541d534802c56510, reversing changes made to 523fad393b6702f180f186bff0b8850b319b9fd8. --- pom.xml | 2 +- .../GitHubSCMNavigator.java | 61 +++++++----------- .../webapp/images/16x16/github-branch.png | Bin 0 -> 319 bytes src/main/webapp/images/16x16/github-repo.png | Bin 0 -> 221 bytes .../webapp/images/24x24/github-branch.png | Bin 0 -> 486 bytes src/main/webapp/images/24x24/github-repo.png | Bin 0 -> 315 bytes .../webapp/images/32x32/github-branch.png | Bin 0 -> 556 bytes src/main/webapp/images/32x32/github-repo.png | Bin 0 -> 321 bytes .../webapp/images/48x48/github-branch.png | Bin 0 -> 902 bytes src/main/webapp/images/48x48/github-repo.png | Bin 0 -> 399 bytes src/main/webapp/images/svgs/sprite-github.svg | 12 ---- 11 files changed, 25 insertions(+), 50 deletions(-) create mode 100644 src/main/webapp/images/16x16/github-branch.png create mode 100644 src/main/webapp/images/16x16/github-repo.png create mode 100644 src/main/webapp/images/24x24/github-branch.png create mode 100644 src/main/webapp/images/24x24/github-repo.png create mode 100644 src/main/webapp/images/32x32/github-branch.png create mode 100644 src/main/webapp/images/32x32/github-repo.png create mode 100644 src/main/webapp/images/48x48/github-branch.png create mode 100644 src/main/webapp/images/48x48/github-repo.png delete mode 100644 src/main/webapp/images/svgs/sprite-github.svg diff --git a/pom.xml b/pom.xml index 1b9cfa9d9..f0ef9e0db 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ jenkinsci/${project.artifactId}-plugin 2.2.0 8 - 2.283 + 2.277.1 true diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java index 425bef352..d44adb13e 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java @@ -83,7 +83,6 @@ import net.jcip.annotations.GuardedBy; import org.apache.commons.lang.StringUtils; import org.jenkins.ui.icon.Icon; -import org.jenkins.ui.icon.IconFormat; import org.jenkins.ui.icon.IconSet; import org.jenkins.ui.icon.IconSpec; import org.jenkinsci.Symbol; @@ -1777,77 +1776,65 @@ public List>> getTraitsDefaults() { IconSet.icons.addIcon( new Icon( "icon-github-logo icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-logo.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-logo.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-logo.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-logo icon-xlg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-logo", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-logo.png", + Icon.ICON_XLARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-repo.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-repo.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-repo.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-repo icon-xlg", - "github-branch-source/images/svgs/sprite-github.svg#github-repo", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-repo.png", + Icon.ICON_XLARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-sm", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_SMALL_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/16x16/github-branch.png", + Icon.ICON_SMALL_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-md", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_MEDIUM_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/24x24/github-branch.png", + Icon.ICON_MEDIUM_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-lg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_LARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/32x32/github-branch.png", + Icon.ICON_LARGE_STYLE)); IconSet.icons.addIcon( new Icon( "icon-github-branch icon-xlg", - "plugin/github-branch-source/images/svgs/sprite-github.svg#git-branch", - Icon.ICON_XLARGE_STYLE, - IconFormat.EXTERNAL_SVG_SPRITE)); + "plugin/github-branch-source/images/48x48/github-branch.png", + Icon.ICON_XLARGE_STYLE)); } } diff --git a/src/main/webapp/images/16x16/github-branch.png b/src/main/webapp/images/16x16/github-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..50bee5ced9c721a10fbc62e44fe9a548d39dec79 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4q+Vx)*RgX zppp5%Od4PMv*+_aHnFBjlo-x`UTQ+ zt}i`RxF$n#o#^V+SRSFAjR%v(o9kYz&MN-e@w}ivaL;kxUr&D=Tdhr}}LDkzXhO(QD&>&ARL*75sLkh8ex`BH{W8t-Heh0R6$>>FVdQ I&MBb@06dC%mH+?% literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/16x16/github-repo.png b/src/main/webapp/images/16x16/github-repo.png new file mode 100644 index 0000000000000000000000000000000000000000..8b066c9a6bca10fe3445a76335ba660ff5aff4c3 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4zopr0EJaVasU7T literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/24x24/github-branch.png b/src/main/webapp/images/24x24/github-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..97e02334f741f29b87741b2131e3654585561183 GIT binary patch literal 486 zcmV@P)p-9*n1e*AW{m$j#vlH^Fa$e<>+uHDYBnB^6HupA5c`+qZ*9 z97f!(YA}G^5Iu52K#Y?F&Y6nc1^eCerQ9(u!Ur^XNOq zFpCv@jQ97Lmb7V4NUQsYzZsrgPx#iWaNeM7ohTk39r#d^FFLwQ?BNziI9B7wrsBIg z=ggg?E&GCW*yZQUVjZ!fdoY7jTm`=hK3m722#bp6Oyx;g1=~93%vN2YZWnC4nJ zh#UrCM$rOaC!nBYiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vJJY5_^ zJUZV__2oKbAmBD%Y0>kGvD|X2^_ayLeqZ%nK>vYN-YX@+EDxiUTd8s_ebnmsCIlJ7QJAr>hV-+|DzJO1l z04(_w{{RBuLLvZaz@iTWWf9D3TvoU<9|oGJr#4Xm-d%}|MdaE*st=z6I+lA@P;ag& zQ35ha&E>_!rp9dvcWe=FNd8))BU~aA3qVyCtN@qt`wf`yQ(u;RPUE(PD?4Z!c739$FfNDRyx^$&vHKRvctd u2TF6kH-Kdy20{}>)R`{)YvxV-Z{P=lhrCdtD)NN@00000_vJcdAmA2%^>C#A66>#Nd3!p($`xK@yJT|okB^7gXN4&(iD^HcEjHNjl*y+- z&`#KZ?N#oIz&rE$<8wGn5|omPHdKcHqI}?{OmL_=&UG*>4(^T|AIEUzX@XceChM_iIvSO zH;T^vo22>q^)Y7t2Vp@b;>>sE{uXWA|HM$SjA7onzkB!W^^*F*7`rh;d6Le`Z$O_g Nc)I$ztaD0e0sv6weP#dv literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/48x48/github-branch.png b/src/main/webapp/images/48x48/github-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..4a1a940654834be6bf6d9eecf7c3fd6e874ca7d1 GIT binary patch literal 902 zcmV;119|+3P)daECZEkSK-V${^Hi%5@N#DfVc*k(PQ!;d9NPLt`jz50O4Ay|BNHOtH@$Ndo(K{US1QxORar|_-K}iECxVwG@Btgnq?xZ z0bq`14eX-X3cfe7VuPW55xZ!%Laz+iZ)pFTcA{PxaNf}V%*U5!-2S3sEb$ z1iUr$C6#xGw2e195oszP@w9PuT#26oHhR_$9g5Y!1~_Ej3((A93avmJA8_=b)f?A5I7<~F91(v{Wv1-E55st<`(^@ zp!a-^3uY1GZ1Oo}kGfK4rymg=L6(90vc4v>(*=38$>#)}%jq8K&x={i`J6d9X5OPN zYsP79(xiOOn0Iv+6bYxlOGM{$YINxj3KxtJHln@MfNecfXGsy^BJ+q$b6wWQSi>vd cr%w$30i@V!UA#NJT>t<807*qoM6N<$g4&{!r~m)} literal 0 HcmV?d00001 diff --git a/src/main/webapp/images/48x48/github-repo.png b/src/main/webapp/images/48x48/github-repo.png new file mode 100644 index 0000000000000000000000000000000000000000..227787a7da4848a6652c1e6e5b45ed0395d9de86 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq zG}}O!QR&V79-yFPiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?Jf1F& zAsLNtXZrFr8Hlv7o5tK+TDZ7^*MAXrzETXc_@yP88uq%W5|{K}wk1j?!j`F z4-6L=GCWta1(Zgm1q-(Bel3^O@blT-t3O=CnAvVM7<(sYzo>nesH%8!f_XugjeXRk zD<{Go?m6Ue2i`j7wvXu(TM^gBiRKf6J9_st&T-0l!uv!dNjYC(xqx&fvt{dz6Ve=+ ziud*1xjuA_ zTnc(*KY#5(>GgGtcMJ?(^!aw&U3#JV;cwOBdf%7sE-PD?FBQJ$pxMUEUq_^SI+w^O npBHCXH*c^1_WxZq#}w=jeA%NZq0E~B3_J!;S3j3^P6 - - - - - - - - - \ No newline at end of file