From ca1e2ba91e5678ee910d755af9894c30e4cb996d Mon Sep 17 00:00:00 2001 From: hankhill19580 Date: Wed, 7 Oct 2020 04:47:27 +0000 Subject: [PATCH] Switch Snark dark and light themes to using images embedded in the .war, and remove the images substitutions from the filesystem and css --- .../src/org/klomp/snark/SnarkManager.java | 22 +++++ .../org/klomp/snark/web/I2PSnarkServlet.java | 2 +- .../resources/icons/solid}/application.png | Bin .../resources/icons/solid}/basket_put.png | Bin .../resources/icons/solid}/cancel.png | Bin .../i2psnark/resources/icons/solid}/cd.png | Bin .../i2psnark/resources/icons/solid}/clock.png | Bin .../resources/icons/solid}/clock_red.png | Bin .../resources/icons/solid}/compress.png | Bin .../i2psnark/resources/icons/solid}/ebook.png | Bin .../i2psnark/resources/icons/solid}/film.png | Bin .../resources/icons/solid}/folder.png | Bin .../i2psnark/resources/icons/solid}/html.png | Bin .../resources/icons/solid}/itoopie_xxsm.png | Bin .../resources/icons/solid}/magnet.png | Bin .../i2psnark/resources/icons/solid}/music.png | Bin .../resources/icons/solid}/package.png | Bin .../i2psnark/resources/icons/solid}/page.png | Bin .../resources/icons/solid}/page_white.png | Bin .../icons/solid}/page_white_acrobat.png | Bin .../i2psnark/resources/icons/solid}/photo.png | Bin .../resources/icons/solid}/plugin.png | Bin .../i2psnark/resources/icons/solid}/tick.png | Bin .../resources/themes/snark/dark/snark.css | 80 ------------------ .../snark/light/images/icons/application.png | Bin 368 -> 0 bytes .../snark/light/images/icons/basket_put.png | Bin 513 -> 0 bytes .../snark/light/images/icons/cancel.png | Bin 599 -> 0 bytes .../themes/snark/light/images/icons/cd.png | Bin 605 -> 0 bytes .../themes/snark/light/images/icons/clock.png | Bin 580 -> 0 bytes .../snark/light/images/icons/clock_red.png | Bin 339 -> 0 bytes .../snark/light/images/icons/compress.png | Bin 275 -> 0 bytes .../themes/snark/light/images/icons/ebook.png | Bin 407 -> 0 bytes .../themes/snark/light/images/icons/film.png | Bin 249 -> 0 bytes .../snark/light/images/icons/folder.png | Bin 429 -> 0 bytes .../themes/snark/light/images/icons/html.png | Bin 514 -> 0 bytes .../snark/light/images/icons/itoopie_xxsm.png | Bin 661 -> 0 bytes .../snark/light/images/icons/magnet.png | Bin 559 -> 0 bytes .../themes/snark/light/images/icons/music.png | Bin 325 -> 0 bytes .../snark/light/images/icons/package.png | Bin 385 -> 0 bytes .../themes/snark/light/images/icons/page.png | Bin 459 -> 0 bytes .../snark/light/images/icons/page_white.png | Bin 459 -> 0 bytes .../light/images/icons/page_white_acrobat.png | Bin 324 -> 0 bytes .../themes/snark/light/images/icons/photo.png | Bin 158 -> 0 bytes .../snark/light/images/icons/plugin.png | Bin 548 -> 0 bytes .../themes/snark/light/images/icons/tick.png | Bin 525 -> 0 bytes .../resources/themes/snark/light/snark.css | 80 ------------------ 46 files changed, 23 insertions(+), 161 deletions(-) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/application.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/basket_put.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/cancel.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/cd.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/clock.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/clock_red.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/compress.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/ebook.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/film.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/folder.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/html.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/itoopie_xxsm.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/magnet.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/music.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/package.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/page.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/page_white.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/page_white_acrobat.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/photo.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/plugin.png (100%) rename {installer/resources/themes/snark/dark/images/icons => apps/i2psnark/resources/icons/solid}/tick.png (100%) delete mode 100644 installer/resources/themes/snark/light/images/icons/application.png delete mode 100644 installer/resources/themes/snark/light/images/icons/basket_put.png delete mode 100644 installer/resources/themes/snark/light/images/icons/cancel.png delete mode 100644 installer/resources/themes/snark/light/images/icons/cd.png delete mode 100644 installer/resources/themes/snark/light/images/icons/clock.png delete mode 100644 installer/resources/themes/snark/light/images/icons/clock_red.png delete mode 100644 installer/resources/themes/snark/light/images/icons/compress.png delete mode 100644 installer/resources/themes/snark/light/images/icons/ebook.png delete mode 100644 installer/resources/themes/snark/light/images/icons/film.png delete mode 100644 installer/resources/themes/snark/light/images/icons/folder.png delete mode 100644 installer/resources/themes/snark/light/images/icons/html.png delete mode 100644 installer/resources/themes/snark/light/images/icons/itoopie_xxsm.png delete mode 100644 installer/resources/themes/snark/light/images/icons/magnet.png delete mode 100644 installer/resources/themes/snark/light/images/icons/music.png delete mode 100644 installer/resources/themes/snark/light/images/icons/package.png delete mode 100644 installer/resources/themes/snark/light/images/icons/page.png delete mode 100644 installer/resources/themes/snark/light/images/icons/page_white.png delete mode 100644 installer/resources/themes/snark/light/images/icons/page_white_acrobat.png delete mode 100644 installer/resources/themes/snark/light/images/icons/photo.png delete mode 100644 installer/resources/themes/snark/light/images/icons/plugin.png delete mode 100644 installer/resources/themes/snark/light/images/icons/tick.png diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 4f1cb9a2d6..1b29273927 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -881,6 +881,28 @@ public class SnarkManager implements CompleteListener, ClientApp { } return theme; } + + /** + * Get the path to the preferred embedded icons for toImg, "solid/" for + * dark and light, "" for everything else. + * + * If you add a theme with a new icon set, then you need to add a + * corresponding condition here. + * + * @return String "solid/" or "" + * @since 0.9.48 + */ + public String getThemeIconSet() { + String iconset = ""; + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Theme was: " + this.getTheme()); + if (this.getTheme().equals("dark") || this.getTheme().equals("light")) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Using solid iconset."); + iconset = "solid/"; + } + return iconset; + } /** * Get all themes diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index b4737ee610..d74d579287 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -4206,7 +4206,7 @@ public class I2PSnarkServlet extends BasicServlet { * @since 0.8.2 */ private String toImg(String icon, String altText) { - return "\"""; + return "\"""; } /** diff --git a/installer/resources/themes/snark/dark/images/icons/application.png b/apps/i2psnark/resources/icons/solid/application.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/application.png rename to apps/i2psnark/resources/icons/solid/application.png diff --git a/installer/resources/themes/snark/dark/images/icons/basket_put.png b/apps/i2psnark/resources/icons/solid/basket_put.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/basket_put.png rename to apps/i2psnark/resources/icons/solid/basket_put.png diff --git a/installer/resources/themes/snark/dark/images/icons/cancel.png b/apps/i2psnark/resources/icons/solid/cancel.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/cancel.png rename to apps/i2psnark/resources/icons/solid/cancel.png diff --git a/installer/resources/themes/snark/dark/images/icons/cd.png b/apps/i2psnark/resources/icons/solid/cd.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/cd.png rename to apps/i2psnark/resources/icons/solid/cd.png diff --git a/installer/resources/themes/snark/dark/images/icons/clock.png b/apps/i2psnark/resources/icons/solid/clock.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/clock.png rename to apps/i2psnark/resources/icons/solid/clock.png diff --git a/installer/resources/themes/snark/dark/images/icons/clock_red.png b/apps/i2psnark/resources/icons/solid/clock_red.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/clock_red.png rename to apps/i2psnark/resources/icons/solid/clock_red.png diff --git a/installer/resources/themes/snark/dark/images/icons/compress.png b/apps/i2psnark/resources/icons/solid/compress.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/compress.png rename to apps/i2psnark/resources/icons/solid/compress.png diff --git a/installer/resources/themes/snark/dark/images/icons/ebook.png b/apps/i2psnark/resources/icons/solid/ebook.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/ebook.png rename to apps/i2psnark/resources/icons/solid/ebook.png diff --git a/installer/resources/themes/snark/dark/images/icons/film.png b/apps/i2psnark/resources/icons/solid/film.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/film.png rename to apps/i2psnark/resources/icons/solid/film.png diff --git a/installer/resources/themes/snark/dark/images/icons/folder.png b/apps/i2psnark/resources/icons/solid/folder.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/folder.png rename to apps/i2psnark/resources/icons/solid/folder.png diff --git a/installer/resources/themes/snark/dark/images/icons/html.png b/apps/i2psnark/resources/icons/solid/html.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/html.png rename to apps/i2psnark/resources/icons/solid/html.png diff --git a/installer/resources/themes/snark/dark/images/icons/itoopie_xxsm.png b/apps/i2psnark/resources/icons/solid/itoopie_xxsm.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/itoopie_xxsm.png rename to apps/i2psnark/resources/icons/solid/itoopie_xxsm.png diff --git a/installer/resources/themes/snark/dark/images/icons/magnet.png b/apps/i2psnark/resources/icons/solid/magnet.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/magnet.png rename to apps/i2psnark/resources/icons/solid/magnet.png diff --git a/installer/resources/themes/snark/dark/images/icons/music.png b/apps/i2psnark/resources/icons/solid/music.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/music.png rename to apps/i2psnark/resources/icons/solid/music.png diff --git a/installer/resources/themes/snark/dark/images/icons/package.png b/apps/i2psnark/resources/icons/solid/package.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/package.png rename to apps/i2psnark/resources/icons/solid/package.png diff --git a/installer/resources/themes/snark/dark/images/icons/page.png b/apps/i2psnark/resources/icons/solid/page.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page.png rename to apps/i2psnark/resources/icons/solid/page.png diff --git a/installer/resources/themes/snark/dark/images/icons/page_white.png b/apps/i2psnark/resources/icons/solid/page_white.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page_white.png rename to apps/i2psnark/resources/icons/solid/page_white.png diff --git a/installer/resources/themes/snark/dark/images/icons/page_white_acrobat.png b/apps/i2psnark/resources/icons/solid/page_white_acrobat.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/page_white_acrobat.png rename to apps/i2psnark/resources/icons/solid/page_white_acrobat.png diff --git a/installer/resources/themes/snark/dark/images/icons/photo.png b/apps/i2psnark/resources/icons/solid/photo.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/photo.png rename to apps/i2psnark/resources/icons/solid/photo.png diff --git a/installer/resources/themes/snark/dark/images/icons/plugin.png b/apps/i2psnark/resources/icons/solid/plugin.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/plugin.png rename to apps/i2psnark/resources/icons/solid/plugin.png diff --git a/installer/resources/themes/snark/dark/images/icons/tick.png b/apps/i2psnark/resources/icons/solid/tick.png similarity index 100% rename from installer/resources/themes/snark/dark/images/icons/tick.png rename to apps/i2psnark/resources/icons/solid/tick.png diff --git a/installer/resources/themes/snark/dark/snark.css b/installer/resources/themes/snark/dark/snark.css index 49a00edd32..3cb668a784 100644 --- a/installer/resources/themes/snark/dark/snark.css +++ b/installer/resources/themes/snark/dark/snark.css @@ -3272,83 +3272,3 @@ th a img { background-size: 14px auto !important; } -.snarkTorrentDetails img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -.snarkDirInfo img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -img[src*="i2psnark/.resources/icons/application.png"]{ - background: url("/themes/snark/dark/images/icons/") center no-repeat -} -img[src*="i2psnark/.resources/icons/basket_put.png"]{ - background: url("/themes/snark/dark/images/icons/basket_put.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cancel.png"]{ - background: url("/themes/snark/dark/images/icons/cancel.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cd.png"]{ - background: url("/themes/snark/dark/images/icons/cd.pmg") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock.png"]{ - background: url("/themes/snark/dark/images/icons/clock.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock_red.png"]{ - background: url("/themes/snark/dark/images/icons/clock_red.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/compress.png"]{ - background: url("/themes/snark/dark/images/icons/compress.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/ebook.png"]{ - background: url("/themes/snark/dark/images/icons/ebook.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/film.png"]{ - background: url("/themes/snark/dark/images/icons/film.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/folder.png"]{ - background: url("/themes/snark/dark/images/icons/folder.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/html.png"]{ - background: url("/themes/snark/dark/images/icons/html.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/itoopie_xxsm.png"]{ - background: url("/themes/snark/dark/images/icons/itoopie_xxsm.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/magnet.png"]{ - background: url("/themes/snark/dark/images/icons/magnet.png") center no-repeat; - height: 0px; - width: 0px; - padding: 16px; - margin: -4px !important; -} -img[src*="i2psnark/.resources/icons/music.png"]{ - background: url("/themes/snark/dark/images/icons/music.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/package.png"]{ - background: url("/themes/snark/dark/images/icons/package.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page.png"]{ - background: url("/themes/snark/dark/images/icons/page.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white.png"]{ - background: url("/themes/snark/dark/images/icons/page_white.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white_acrobat.png"]{ - background: url("/themes/snark/dark/images/icons/page_white_acrobat.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/photo.png"]{ - background: url("/themes/snark/dark/images/icons/photo.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/plugin.png"]{ - background: url("/themes/snark/dark/images/icons/plugin.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/tick.png"]{ - background: url("/themes/snark/dark/images/icons/tick.png") center no-repeat -} - diff --git a/installer/resources/themes/snark/light/images/icons/application.png b/installer/resources/themes/snark/light/images/icons/application.png deleted file mode 100644 index 3ae1e2e41903e40555617b64fd983a4257ca6bc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmV-$0gwKPP)10Qvw#@?O$~q&om0c}ntHQa@@R0E_?}StOLx>GX=^4aueVenPS| zvzeLANS5(!NpcyvB>*r@QvrApobU<~40=37g1UOCVWz?~k)A8v%g#e!eL{6VI~jQBrT6 z!PhaaLJ0bnE;)$T^%!>@fC8VpFm9weB>7Y6!*~|XId}4#Rc@pETl)Z{tc$i_CgrXG O0000EaloalZG0wU=|E2+IR~ z`y%hRth-e>lscTgE$W@NtATmqlv{tfJG3ucGs$z_aAxm>2<;95fo_3r?T?N^bFbzmgPae zcLxK#rdr|}QIe8al4_M)lnSI6j0}tnbPX(Y4GlvKOstFztV|8H4GgRd3})MFJVMcs zo1c=IR*74~tE35WKn;>08-nxGO3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSV(@hJ Kb6Mw<&;$UxdAZa8 diff --git a/installer/resources/themes/snark/light/images/icons/cancel.png b/installer/resources/themes/snark/light/images/icons/cancel.png deleted file mode 100644 index fd36e7ae4582d937f482408a109d416a0d8796c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kS+sZM!#w`4j_ZQ#M9T6{Rsy*i=095!x_;G42-ItE{-7@=W{Pw=Lr{z9DS%i z?f7F8Pky0koi|;xj{R^<+{o=w8UFG8roJPrlVp#Xa-UeNyv=38f^DZYBxfGFVbpQ? z?(vE5-rr%4HZ58Ffr~%$*{RFRYCojk=`L0ed-lR&n@9S(vb6b&y0U9a1I#;Suc+Bl z9A3CEGyd$39xrhz!~SgFEl(A$A4|M*%v|z)^4k9E8+$rqv{#Pd~E`Y_X z=ShG4_9$;ob#iKBpYr#YK0nQamUTFB-@oj$v-W%bjcaNDKTnwD3JgQl64!{5l*E!$ ztK_0oAjM#0U}T_cV4-Vh7-C>zWo%$&VxetdU}a!%h&OjViiX_$l+3hB+!{6qTondt wkObKfoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i^X^r>mdKI;Vst00({OssI20 diff --git a/installer/resources/themes/snark/light/images/icons/cd.png b/installer/resources/themes/snark/light/images/icons/cd.png deleted file mode 100644 index 8303483dfa881527e52656676b70a7698e6dd1c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kgf#cGRFP7Q|?NMQuIx`ZxLM?kPrW$#kb!|w+tbA{MB{w!L|c!hM3L6{ z;rq9+d|$DGM@mLYO6kSzNo=xGvRo>Q99JH*j<`6@b^AhvOiqzSV(GVITB8=vzj!92 zn@zj$1e<+5*ZGp2=O5nTK7L_Re@BZ1qgIr{`SRjinLS$7JeMxc&YPGk*|WqmKy|I< zyd}5HmX=O#W6hcTz)yVUX_J5Z z5(AUC82G(YO2iscZTR$ezGWyY-X`8Pf6B+rYVKbw+tw&5^jExGJB#gZjY$2Qfc$mV zPht<)rQ810Y@fR+ETw;;-j7wDdb@77Fe(|H*9f@Abp6V#*YT5TL+d7e3~>O4q-u$4 zL`h0wNvc(HQ7VvPFfuSQ&^55oH8cz{FtIW=urf8&HZZUN&PEETh{4m<&t;ucLK6TR Ci`%{c diff --git a/installer/resources/themes/snark/light/images/icons/clock.png b/installer/resources/themes/snark/light/images/icons/clock.png deleted file mode 100644 index 5263abbc805b60d0aa16e941e0f372b2310e05c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kS+sZM!#w`4j_ZQ#M9T6{Rsy*i=6(wms8g#{F zrV9szHCPvZ*Zgyw|K7nk&FvRAZv0!mWlz%$qr_vE=JoSUIwMQ#THJ_ ze!iTJ4C@^4)eM^HHpQFrEsj*|aLs)G<5KrMOV${hq~m@WiCzcW_a?ZUV*8MJiyz=q>^hblCxk7o?A1Ueh!U6U!gCqRIM=4X|;w?RHeLUmA|g9do9K~6Tv z33vn+N?QOMr9ao^UWuzhDz0FqxDLPo%TjiVZVl`wPOwkW-R5us8dH)|beliS1z#yT zpTAq9y1l!?T(HYkY>gt1{|Go=rI}i#@CwYw1Rc=SVv6n_zy^7GDMpnYEh4}=dvda;KxR}eoS4SuwRj)>rgXO l2bA4f8)RDNggb@j|D2lQ zd45t(yW6T?3;|pAeZRL-tM@O5;+ogH>JEAI$m(t@6ttY08hOLn(Pfp_`@P*QY!fsR zmNd(Iye`@Pga-_kEX!4Qo@8REm}q16&2Bd{gSB8JBg08&vxX;=p4f)o(E8P5xvAkrxNP9`->lkV Wi5(yA$0`B+#Ng@b=d#Wzp$PyHDsUD6 diff --git a/installer/resources/themes/snark/light/images/icons/ebook.png b/installer/resources/themes/snark/light/images/icons/ebook.png deleted file mode 100644 index c114c853f06dd0825a13b803fd0899fda150e1ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kZuFwGREka_JTkLdx@v7EBg};ZWcLHdo2rT;T?nS_}SJ7`yMd~{7O z=RGXXbMnZgN}lSO5^|5tn*vg7Q_?J|-b~%9)U3dF9q71YJEY!B3UH4FTBus$8c~vx zSdwa$T$Bo=7>o>z40H`FbPWwd3{0$y4XjL!wG9lc3=DV{Se{1Fkei>9nO2EgL+#(j za-arDkPX54X(i=}MX3zs<>h*rdD+Fui3O>8`9dCKqt%HLSQf&+Kc!0VVCO8y|#&qdu=G zG&-KQ}ze}UC!X?>gTe~DWM4fG#X`= diff --git a/installer/resources/themes/snark/light/images/icons/folder.png b/installer/resources/themes/snark/light/images/icons/folder.png deleted file mode 100644 index 1d66db72e8b76a8079e181450c9d9a92eef573d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kS+sZM!#w`4j_ZQ#M9T6{Rsy*i=0VFPmB{#sM^!TF+}5ha>4=;gK66gMT|E% zR+{g!m6Thc{o`c8tcM&eXD1x`u=2KGC};A^|L@$|*fh>>DB*7wnDj=!O-@YY^SScd zQ``(U9QtX-bChT4|A)T}9i3m+t2ynH;NgmpsGAy9K0SH5&epUaCnIj13Si>TD*4d8 zaP|b=7Dk3syW|qq_pZ4QbcSk)YeY#(Vo9o1a#1RfVlXl=GSD@!&^0s+F)*<*Hn1`^ z(l#)#GB8+m-KZW#LvDUbW?Cg~4Y#|x4g)nvf@}!RPb(=;EJ|f4FE7{2%*!rLPAo{( X%P&fw{mw=TsEEPS)z4*}Q$iB}qacYk diff --git a/installer/resources/themes/snark/light/images/icons/html.png b/installer/resources/themes/snark/light/images/icons/html.png deleted file mode 100644 index 03f83ce0d955a5ccfe0e87b53bbfdaf1e56ac88d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)VMz&ZCN2!dO{10WQUqb$n?0FtKZrnUB)7dJ|&^{T4QyzrGbI;g7ZOewVvG(c#r z{hFrfra0&JfIB|XPFa@UyOF#p*4hsMp4;)g1LxeHD5bW6xd(UCG`$ZXBCkEx)OFne zcy8C@Kb2D3QkLaRL>_n1oO7p1lH7C7J@@fH0(k7S8&yOem1Q{-fTAeo*4iy^a@@A< zFQwEI{|}!57K_CkI0hPP?N(6~^Gj>2>$K^Wl!$_e7PV>9##*!r+O*Lul@@`R2|^^aa|lJL z$m=+Hoz#E+w}mazbUJVr-^Y2+`QGPz#?}!mD6qPsA{sm%Y;uzBu`%@k-@yQFBO?!> zu&RoYc-%BQYf2_fqob&?(I$Wr{uiMT@A~`w>hC|IM8dDBsVu#CQLete9V#i|>*jjT z#-o*nLe#CSJ|H)@i_WeH0|Up1M!WHPTdAxh40b+410rQ*F!%F4H8lrWnEyl|Fi3s< z0mjCjQ(X<9Xa)mzqP7;LQfPeKyidU6 zO#dLgXa64e^3xl%eR)Ns^%|WuyUDqKflCjsl9U6`oT&kc@x+20m(=1if&4t?zD@IM zeu>rP6$>v!eW|pQPWZF^$kp=N>e>Ww{qN%6{|p7B5TPSn00000NkvXXu0mjfjNvo7 diff --git a/installer/resources/themes/snark/light/images/icons/magnet.png b/installer/resources/themes/snark/light/images/icons/magnet.png deleted file mode 100644 index d50e84e11a8446623b20994eac7afef5a77b07fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kS+sZM!#w`4j_ZQ#M9T6{Rsy*i=5Hk_dm;lLVrD7978nDw@xthZVD7>n_s;~ zL@8s1nz%HJ^rFAY8I#0Xw{gAVe^T|lWQsKl7q8ymmVZvob-}H{j(ToeGz4!bO`6X) z@4Zz<$+G7*@1GXE&psijaKQZgAEVi!em7XuOnTpLHr@QLE7~?-Q|Z!uM+`SS&V0A6 zwLYy?O7rQo?Y>f8&W9zXciDVcHsz^DW`vu$b<$7Uz1!nU zOZa{fPv!~BUflIo@?m3*opdmB#-j^n&un+BN<6#m(lIz2h zPkZ!_$iJK6?!oXu@?PuWg#J?A{W}V$mo)59`TLhqvPJKFPqHPeM7Pb<#`oFnz<^LK zag8WRNi0dVN-jzTQVd20Mh3bD7P^LpAqFN^#s*fV2HFM&Rt5&P9?D@T8glbfGSez? zYw!`B4T@YzkPX54X(i=}MX3zs<>h*rdD+Fui3O>8`9V z9umYMkf?D1h$FbOhsKsr>=!#Q-R|4{c6J}Jh0-+LFUxW&=@P&Kz!!&_f*?3BvujCn zlBWRne!uqu;y6B+bOzuCz|p1w9Y7RC?*I;moVBu^+)(o?$-6e#9WkVov?TdN^3gf> z-8jA72q5`D^0_FAmpsoaU!51=oC`*{>%GBN`Zr+A5di>6k{nl6bx-o*Pk_3vmn0`0 z2VoeV0B{Z2du@+Ctoh&8){d{z%x02SZ7gYJW((g6pX-S%%iaLYI$%ljbuxgfu{-<# XJtt8t2zu>R00000NkvXXu0mjfgQ12w diff --git a/installer/resources/themes/snark/light/images/icons/package.png b/installer/resources/themes/snark/light/images/icons/package.png deleted file mode 100644 index f7730fca6c267ab95d466705c902a06f3cfe3897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kS+sZM!#w`4j_ZQ#M9T6{Rsy*i=0VFPmB{#$lue&F+}71+1`VK4F)`ir^slR zNY2m>-XIpatX1;C-Pfu=AFWT3?&`3tJ`@|w)Bb6RlOH3?o8FI_QMx&k@9$_#vlYl$ z!~OJVJPZHJ(5sF7``mc?43%0=0F72Hag8WRNi0dVN-jzTQVd20Mh3bD7P^LpAqFN^ z#s*fVM%o4jRt5&Et{c^(Xvob^$xN%nt>Jc8*I}RrNstY}`DrEPiAAXl<>lpinR(g8 c$%zH2dih1^v)|cB0TnTLy85}Sb4q9e022ptjQ{`u diff --git a/installer/resources/themes/snark/light/images/icons/page.png b/installer/resources/themes/snark/light/images/icons/page.png deleted file mode 100644 index 05fb6f8eb4fb044e9861654431acbdb78e86a528..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9ke&;~WsF8Y&UykF>?NMQuIx`ZxLM>3Ri3Rl3ly5^>EaloaXvZagkElnK$-(< zy+mJmx=~DO0ubo@J$K;Xg-(@~2OpgOFw3#yVS2gQVJ0@VwoCt){tql^pY~5b_Gm)< zuPtBdUn;TXsj2M-(!=nMX5t?V3@$=s~L_cHwMSB5e}_2=GcFa7}?saoP1 zQIe8al4_M)lnSI6j0}tnbPX(Y4GlvKOstFztV}Gm4GgRd3{tAnq){~F=BH$)RpQnl zs(x=dP=h4MhT#0PlJdl&REF~Ma=pyF?Be9af>gcyqV(DCY@~pS7(8A5T-G@yGywp! C&6$A! diff --git a/installer/resources/themes/snark/light/images/icons/page_white.png b/installer/resources/themes/snark/light/images/icons/page_white.png deleted file mode 100644 index f76c0652ca38ededdc0ab467f6194278533a2948..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9ke&;~WsF8Y&UykF>?NMQuIx`ZxLM>3f*;O^1`5seba4#PIG>zyLN7N(AkBfb zUZSr&-6$qC0SI*do;z^xLZ`~ggAdMsnB~~cptHiBg zbHG($paw~h4Z-BuF?hQAxvX?E4nW5>kXBpMAexm$OThsm zu7HF@fpP()q(~7LoB-j%67y-WW$@Z@{HxuaKTm%&EBKZ7eg|NIh(ZYBz2BMHd7kG* zyQZykw7FeZ)mP`-AD{NQ$3hMTG?4l-8`I&OTZ9lKR%;%;_dFy<4ICPwFtcL-FGHXq zz!!iyfbCSkNtR`60H;#{o3bpANIpygh{!$3rHFixyd-%A;O@V#Z;j7YRXrt1@(JKf zRlh~#&CFI~0JmoLn5O9s$!h>02{OLr&Iqcy6p@R%d7nB7%PZyiO_?GGH-mNfI=wk!dW$3MBI37hKc@fh;x^tFoe9$s+9KqpH;W_CdIJLWoLMQkF#$<>Vm_E=QH^( zI4aeUyw3NwdT5o^qmaB#qs2?OJ10Kz6?VJvK{{2pB7Db%e|2o;r|Vfd3l&X&s_Z`f zVU_4krKg6+-F{pvUiM?jSycw@X+IcGuZb{VHLJO)c)9AB>@>0d9K|EN{YN&gUw$~o zIHj&dg!QE5dG0ssDv}O#b>3^XGfwfDEv4>ugXwLpJG*~|IuFqIswJ)wB`Jv|saDBF zsX&Us$iT=z*T6#8&@jZn#LC#f%EUt3z`)AD;1F-_dK3-0`6-!cmAEx*4!9}|)F276 tAviy+q&%@Gm7%=6TrV>(yEr+qAXP8FD1G)j8!4b722WQ%mvv4FO#nB5!7%^; diff --git a/installer/resources/themes/snark/light/images/icons/tick.png b/installer/resources/themes/snark/light/images/icons/tick.png deleted file mode 100644 index 2431994ab7ec96e41c92de7ec4734a2fecc789fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 525 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP zfk$L9kZuFwGREka_JTkLdx@v7EBg};ZWcL%;D(<2IWbZ}5k`x2Gk_H)p=|Wh-y{d{>NTy5P5icRp;qJvot+S@`g}JodKq z6MRXHo9jxC8?H&Xaq(yEr+qAXP8F VD1G)j8!4b722WQ%mvv4FO#rOSxugI9 diff --git a/installer/resources/themes/snark/light/snark.css b/installer/resources/themes/snark/light/snark.css index f97743e1ba..3d81895e20 100644 --- a/installer/resources/themes/snark/light/snark.css +++ b/installer/resources/themes/snark/light/snark.css @@ -2709,83 +2709,3 @@ a, a:link, th, td, button, input, select, textarea { background-size: 14px auto !important; } -.snarkTorrentDetails img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -.snarkDirInfo img { - height: 0px !important; - width: 0px !important; - padding: 16px !important; -} - -img[src*="i2psnark/.resources/icons/application.png"]{ - background: url("/themes/snark/light/images/icons/application") center no-repeat -} -img[src*="i2psnark/.resources/icons/basket_put.png"]{ - background: url("/themes/snark/light/images/icons/basket_put.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cancel.png"]{ - background: url("/themes/snark/light/images/icons/cancel.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/cd.png"]{ - background: url("/themes/snark/light/images/icons/cd.pmg") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock.png"]{ - background: url("/themes/snark/light/images/icons/clock.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/clock_red.png"]{ - background: url("/themes/snark/light/images/icons/clock_red.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/compress.png"]{ - background: url("/themes/snark/light/images/icons/compress.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/ebook.png"]{ - background: url("/themes/snark/light/images/icons/ebook.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/film.png"]{ - background: url("/themes/snark/light/images/icons/film.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/folder.png"]{ - background: url("/themes/snark/light/images/icons/folder.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/html.png"]{ - background: url("/themes/snark/light/images/icons/html.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/itoopie_xxsm.png"]{ - background: url("/themes/snark/light/images/icons/itoopie_xxsm.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/magnet.png"]{ - background: url("/themes/snark/light/images/icons/magnet.png") center no-repeat; - height: 0px; - width: 0px; - padding: 16px; - margin: -4px !important; -} -img[src*="i2psnark/.resources/icons/music.png"]{ - background: url("/themes/snark/light/images/icons/music.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/package.png"]{ - background: url("/themes/snark/light/images/icons/package.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page.png"]{ - background: url("/themes/snark/light/images/icons/page.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white.png"]{ - background: url("/themes/snark/light/images/icons/page_white.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/page_white_acrobat.png"]{ - background: url("/themes/snark/light/images/icons/page_white_acrobat.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/photo.png"]{ - background: url("/themes/snark/light/images/icons/photo.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/plugin.png"]{ - background: url("/themes/snark/light/images/icons/plugin.png") center no-repeat -} -img[src*="i2psnark/.resources/icons/tick.png"]{ - background: url("/themes/snark/light/images/icons/tick.png") center no-repeat -} -