From 8bffd29e53e9d71327c3592dcb01aa72f4cb4ed6 Mon Sep 17 00:00:00 2001 From: Richard Marti Date: Mon, 16 Feb 2015 18:43:54 +0100 Subject: [PATCH] Bug 1022581 - Use a svg image for the category icons. r=jaws --- browser/themes/linux/jar.mn | 3 +- browser/themes/osx/jar.mn | 3 +- .../themes/shared/incontentprefs/icons.png | Bin 4749 -> 0 bytes .../themes/shared/incontentprefs/icons.svg | 129 ++++++++++++++++++ .../themes/shared/incontentprefs/icons@2x.png | Bin 11707 -> 0 bytes .../shared/incontentprefs/preferences.inc.css | 58 ++------ browser/themes/windows/jar.mn | 6 +- .../preferences/in-content/preferences.css | 34 +++++ 8 files changed, 175 insertions(+), 58 deletions(-) delete mode 100644 browser/themes/shared/incontentprefs/icons.png create mode 100644 browser/themes/shared/incontentprefs/icons.svg delete mode 100644 browser/themes/shared/incontentprefs/icons@2x.png diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 94bdd793f65d..7720857eca88 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -174,8 +174,7 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico) - skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) - skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) + skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index c65bc244b5a8..ca58b7a9672a 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -280,8 +280,7 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico) - skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) - skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) + skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) diff --git a/browser/themes/shared/incontentprefs/icons.png b/browser/themes/shared/incontentprefs/icons.png deleted file mode 100644 index e42a3f71aa79195061e0f82a3f6f5932937e5bbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4749 zcmV;85_0W{P)70G`+2{Y?XP@(Z$t}gj#kYujPks?f{`31c z_-SnZE9I8&3jye(zo4LC(3LA!2Fm$=;C17Fj7KBJqVD&G0NL5ujf;wkl4&moDdxOH z^tt`JdiCmrvuDrVaXrAFpPxTjw}a!S{5z2Vdw*P5SlAWYw;@|O?;_wSqc5ru1RkV* zyWHH|B=pVaUI59(-;)D@z>AkJU%vZa9E@VI;SKt+J~cJ<_M3_TIN?#Q&zZms22$gf zM~9wu>&&TBr)uzgoj6F8+m-d+}`pFDZ89!@`Rw;}fq z9XeG1W(7Y4y_dnH zy>#HffmAnu+Oluoz9mzqPVEh-19I)qDPLx0=KtdKGhXyj?%M2FBt*htI?~-tKW58VfS#fKfe$k9Z&J&aEnA3u^wCGXPMkQg z*&xOSt}A%ajc*g_`%yRFXJuuLqF9s!2g;pMBr66`+aN*hvh;_s`#Cx;X}?2+V#Xzl zM{!;k!FoIo9z6I9aF$_#{VVjPqI;8hAHRHp-{QOyz`uY0{&&Q{bLY-2AmZ*<9ly9? z!-mOg)~p!^qsEHJx!l7cC7q)2J=96TSw(U!4zz)|Y15__%rK{=^V$h+z+?tE@WmHj z$TU{DfB*i?n6^_XPjh(-!%2ted}YcX)@^OvxN#~|=TzMe`u2bJ*=KPcr|+r`1KSWk zwZlivc^+v#Q+f82_@;q_u8P6hqW_(=%>wlQ;>YdkNChR;6B85fKXc~HR$UJNxA&0# zRK?cq!TitoK8x;h^lP4!F~j^+e=c?n$a* zJ1H0enD$PajWT&_IQOsPjAkkhJWVvLL1YQY1&~=h-5_UKL+f0Qhs!U8F#j&GUsk ze_B#Z063KXbq%&vi>=eNe?I^G^OqFpBdqP*3izh4E{CtChRS;x%h#Ozj}JD|r+o3p zqD70uAJN;lZ-1M9T(-;8hv&jUKcKBD<0*A%<6FX*4h=Q~TLg$;CQQ=6#z%`15)$rL zSo{G}MFoilqeqYKLYYh{C$q(;pMF}$shw*Guy^m?QUZv91_5rB9RuVT19^;r{-fM8 z382f%G1LrTi&@u@Lhj`&$z?DK1XRpEKlPZl_=ui^v_94#GuN$K*F*$z&DQrJ$saxF zi`cq#YezT2YWo@JWQm;iK$~SmAn{W{!0IOjO3`Hjc?*}a5rDO|)=OWLgXPlzF&5i) zS&>-$IgZCoR(N&sV_(K zoEbC=yUKecKn(ULYXXcJGv+A;_-JGNB2=*W5m=tA%W~e;$%l>vum?{OAchF@H+_!* znk@H(0CxFc1favG1=w^xAIZ}~R4hFj=lQB!z9K`B=uS&ZOY}kjY-@tU4r!avldTEG zd9J>XP1|Il9Et#|R;_BGZ7}4j9!#eJHp>`fC|a^)$^W^HLI7;HAdp|XorB)nvUV0ChG^1xSLeYF$ojDGlLt*w)LYo<(@ z(of2;&UlMD>Hp+(K>!~#wfi8TmW8IIB1pjS>lKL^E^@^v7m&J~ZojfJ)LauqzW(~_KSSR|vn~tK7rg|bZQHihX2!TcThgASp$Eai zN2>i2T?E$AZn`W2R3V+oREyh{Le3yIMC0SO1_6dEk_RUM3!JbCpgU(u5CWXUn5oqN z!_lKhyLu7Y?M4)Q1Lqy`LI9%qy#RWjlU>0?NWefRxDkL{JW)WytdcWr+O$sGi&uH) z50Sgbqqk{YO#55qo_Z!_;%Cg5(U~@Kg#--FPpm%pXnUnsTTK8t3BH

GuP~Bc=|@ z9C+Y?2ddlUY`Y}#GS0g!{b?Td*?nXRJ*6#D=JU)}sk3L#?p3>X?YkkyJZ7scJSzfU zd)+o7Yy#jvz4e*-!3Q5C1S0^m+bfy?tY_X(sZnSG7=S1_()khs5W%L&JrOz+HUV@B z)~LNh|*9qTAQEZ{O-ftHV+j5?p3b$8+70_F6&E-!P!* zS|`L!lY8<^%FyqL=+D-`>(r@}4ZKLooFG74P-XTr;|yipvP7=8Y}qn*#flXp0Lxjq zW+zKupA);~Ips^A)8<;0!suT)d#q$!+3g9L%hT@)l-+0g3}COY^k4I9+qSKreyoyu z)IU#ZB`-;D6Wmm+Sg`@wMvBr|1fE)WAV6g>I97ui8wR@wNOCNBhF zY9AkDAsNHF3`gDAR(dqgoyy{e2@d&alz{i^ufP63_Td*`Pk_aGf9^MeNMDft?P%7l z*-33hFi?Nzmx-^TP0V4mW(OJm@(0x8?C&3%6Q`G+1odYE?jm|f!0 zJzJLnqbV^lF}GX(a3;Xcojc#r25XT{$WDoXUf;th6PWUocvfJS7ja900P}GoK|dmZ zY+v2yRob;{*P66qGtLTxB7oQ#42(8dO`&cu0{FXi>vo@z*Qu^4Zfy#wyLa#Y6NffR z2tWXu#Cbyil1BNf*wa2LDyk8)%NhbldbMiRYVv|GiD&X+aD~1WfHHeXRIbi!FhdAo z4Y;2*OKZvnOgjPI2-}zF86cmn=y5~WT+3%y(bXcz-g-I4*bipoL6`e%W& z-V)HjkKn6hZNP3z9vcu0X~*_)FGBPmNu8MhRL}Sx@lhx4q1qT+U}<{c}J*T}9Q|`dZqMcLB_RGv&>(MF1ZQ+#dq$9hTh% zlA@XZqiY%Hogg5l%{Oc;pnH$Q+M(n-AL=FnxJ+zsDpEs#^Ija@4x^4(>$x{5;=tcM+}?uI2IcI$>Uh4Y%SnC*XWOZ z9grErVaku@E$M5v|2ba4)-e)&0sU=4G`R;5)13UzOg_SCOHn>K(e}zqM|{vmQZjIp zf<1dAXmCFVy}2AO$UU}QKO>FniSK?3>GtUQ6#cWyrx4=1$}&sNojdm>bfwy0mz^Sl z$PCiS@u5g?4FNFdT`>TomlEL*$T`jt0{lHGDd}N$FNTpz4(rvc*F!|Q6m2l+$v$R} zWf~B{2!P)0kY|;E(oN_<=~0A~U_Es&iSAGYK=%}rTzqajyng-qiOga z$$hdV3t);gAUqI24?-1ElY55_9s2u;6DRh0{PD+|bFYT#w}7K|zkdDNlAgRiY}l~p zX{(9a4RYH#DItJUFmVz)VAuhL@o*wQMEUaN@4!E4wm$r^s8y?0(Tw3!!Sn;#y`4LE zcKU#=B=Bf`f*Bz&cBIJLYIba%88BeL(@00z7UuJo4g`dbjLl2v{8WOJ)Y0_`PV$YG z-{oUCX$K<-J34ge(3Eszo36uo7Q0gS zvuhJ8U*EdvC-pf2;oCaxr;E=jRjO29cBhyL3Z)Lw*{okE8z7SF%cchBrzAbn&$V#B zP{yoAjT%1+LI53vqLu$^sF!(l)L7r9d@r+Y0^fhVZ<9d#<{ARoyYvr(o`j%WFsf6|?vz!2c_`NBeKP>63JY-Iia6n8gH;^>}IdETEf<4SPsy@w#Y4I(B)F5{Hh}2AmNa*ynmHW*BFwKqAdypYy?erthHCn8bA0(X-+c2? zaWKbV(xc*M0#+#uu=XBOZLKl8iw4Xa=qv>Izig5N(6gFMCFG! z+aJP2D&RH_(>J!Cs)u?><&-+A?b&JyoOdgcyt<|eY_Vks5I!Rn^eej}jbP&o<8$cm zN`e?ggwplejrgw+Cb^=*kaE`{I{Vc?-WFz_|NlJ`gzKB@=_j32>!7BA8gU~6#&sls btNwog_Hb;Lkmbvc00000NkvXXu0mjf9c4Sg diff --git a/browser/themes/shared/incontentprefs/icons.svg b/browser/themes/shared/incontentprefs/icons.svg new file mode 100644 index 000000000000..b74eb6dcc791 --- /dev/null +++ b/browser/themes/shared/incontentprefs/icons.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/browser/themes/shared/incontentprefs/icons@2x.png b/browser/themes/shared/incontentprefs/icons@2x.png deleted file mode 100644 index eea84f566aae0c17455f3b81bd29f73fd7d593ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11707 zcmWlfbyQSc8^!N1bazXGq_ngQ-7s`_2`H&D^ia|g(%taVUDBO`NJ@80O2d47|J+*Z zu655@&pmrT`*$Ls>IyiRl$Zbj;3z4|Y5@QU{&LNOj{0&W_pbDRIZ=F)Gx((KV)x0@ z(%lx2vT?DprBnK7X>Y4#YiZ-X@vQj#*KPRSWFp>e%)vFLD-CcdvhH=VdHyWD^okdWRj_` z&Byc0=_)++sq=EB?niyS{bVMhA#L`JNlWgCPKzmlF~CYrJV-o_AaM>g-q`Iep3ex- zpT-2ON1_Eu516;SJO-fX0HW|@|5pLYx%eL3E?dN-*q2@bv$^+#TUng^(<|0|eBl3Y zEY{W6i|y_1(g3Cwf5H%=B<{to9LvwkKXWA4$hS5*qN9XdT6dCjrGb`S0JtFpl!r$~ zyzp~;lnAC--kC1cNtLT-iyL0Jx49TRH0PP`G3{{Q`@G@cDEHZzx+xzg0nLJQT+r4e z8Qj1-kP%oB%dM)>F=)By3L7_gxt9qaPGu1G76G(Z56)Kz z`Nw%;;%mwRwi7LILnYGeva-T01HAR11G;~6PJ z%l@q3DA&DV(>n7Mqd+y=4!iz1P}_IjVJGzu2h&BM>PIrM7~8wBi>|{kTL17zs-qAd zz{q8Jh{jC=4Ufhb{3FsSfK-{77(g$gZU1~U7s*5CgA_ef;1cy~&~EDOl-{Emsz@5_ zaOOXSTysYiIKGAB!~+;OGbc307>%5X!8w@>Je&Jsb%%IAKajjYM`L=*_+mhO5y&?Z`cx#u5 zZC54?H|g4%3{1*t0HuC9{&ao3XvkEqZj0E<3HTd$E#25iX8Yu6 zL@)Mfyt}g@qSlI*0464ZxRTqOy;SKY=A(x2zghcSPdNbI%D_P+{ZN9r;)q zKZ!_i^3us`8z;}9Z?8BCVi>$zdxYt%omhxx)>SB0`Tl&PmCQzp%L;kkL0=?mupaux zCL9vUn4cMqk^!t^T()2S6dT~V{<@_3=pB@u*6zMDig`?cJPKK72acDTxoM)8Ht^&e ziI9Iv<(U_GTf4NM%M+u{Fg=0wHKQ?y?0Y_%B*(=~eYn^j(U884RUERy&NRnxDwhY1 zc>$b}^80-v^$$EP)gCVe_A#F%Ib0N{aYb3L3w*~bPJ?(A#<{Zn8pu79r!GA{s_yb9 zl7=6hj3Rz!iM`(Pz0hH>Neko~gO8tn|AxR+Za%cN_&1a*`6LyPy1aC!Z|22J6qf9I zIJ*DkrpG31e8b>#M7k;DNNF zuYCx#c$Ii#?fSvCc}R=m`eaE6SNb`E`{^uSyxwAmd*HKUB8UE)r#?JMUu31CwZiMV zU-OMMsfVPw?PxueS!_2%LCH640Vy{HvGv4WMlGflkNn+z+N;}W?JEy2V|laE?sfTz z0l1ncmwe!aQ?y;ehysSuygLn*)e~qp_pI)Vx3{0EHxw)%pcB2cAX_;0} z=z0ruTi@jwLuhen9K_AZgc5+YD(V5Xh8z{<9Jw; zOG5CwFV>xQ@30%Cf{kQu^XPVvvqDB-K&QBq9Ps0fW_BHI#zb& zJ8~rWK#RI~DJv_RfI!1shD+xn5uR(aa55?t>hN0_AJ^l@C+pl8!5_3R#@FHF*L~@J zl~Y(yyb=p)ar?os7%CxuNS+k6!YXYjh>bRJTqhJ!o{^fmKp5{Avv=DV7SyB$!szRiAj37f8?=r8+BH^gh=^XR6DJ9#(*ktx zAzkDcUT#cZ4otpPzpGygF0cE@W_0rH($dnha@Wn}yM$mP7~>z8nm%ey?7DO70r()5 zt{j`dJ-X{B0+YoJi&X;f*v^@Ti6esr(KU1V?0{xw^vHV6m_*j)IRkF4bYhx~aF0UwK+<3v=MH@9`)mHD4+pZWwfLT2kVNWVzo zM}Oz;ytSI#=nGp5J1vR+i?;WSgjc*!bcICc5udx63#HnFj@Pr!u8`#hDFLxJ>F;f2)&nid0N~=Aq@y(X1q`b*m7fIj6%gyld@Mlr{%xMgQ5U?ITmq{b#rRIBh zRhAMgAEbRj)_kZp86ySuxc~_YHgzm4X&6vz^vr}qc%}sercX-Tn0Ugw-`@EeSP%&y zbe56x8UBk}^kX;>_=>{nH<2!A9rHH>f@!h*bK+U^Gqzf7Gk#|s6xTBkkG6n&``{Ju zvG+#5wmLH9a?|bS@5B#7=RU&J{4p$Mmga0Ixo(shxFNlNZI~p1+Z7y20lK3~!l99< z_jg6!fkw}=Irysz5a@p-Z!>+mhowXLj@EnmF$U{Xx5^)7B088x#Jr>mDmg!RNk+HX zV|I6=%lBI}Ec#Irw5JwPBe_!nNVkRxQX?9?n$P7wJ|BHyjGd%BW=`I!NzAR|)E3aJ zbWUQ|9nv?v5Wi<^UZpY;b9%pSH2b+(!a!KyLkNBGHJAY>9wjw3BsNkX_*%I z)cwz%XFo!*Ap#)u`3~HVRmdwxXClbK8htVMQE~gmoWI>LCq?37^Q^z;nXK{GL3yWg z{+*{GL*D-Rj{PS-K)im-`_8=W(}Cad01Sfdy`j!J8KXzqM8}@;RX^uY*9A%l;XS>CrTlvBpS;bDQRu6mt=RREW_q3Hhgv? ze`0mS;syE(z}flF;X_UV$vT=P1^Bp1L9We^itn3QTwM=;f9y_5B7E68MMR642;*oM zpzTcnkbI6^qP!O5o*UlOq6it2$ZBL%kPzBYKQUQflWcpuL0i+H-Jj(VziAIjX&pJJ10rpe$rqX$!2(1U9Eo_TQz}!B z!Dxyb*KpaSFp%$uh*poi>$#g8DX)asNhWl-q(ah~@b%g29A7^2+WjTEHMF9=xG0`2 z93%fH$sLfgZkf&j`|usI->_UV*PYm(0OQNG_U{mwYF5l(AW09@XVigw7#Zm2JJv+c zlCUf+&0}1(+|f|(U^?nUe~Z0sODBDYAW!C|oOFmH<)XBic_Uumd}mN(%e9OOuZ=e9 zfj$=ToOP0s*5ET~p+f$Hb+(f0P^i@v_+|m{G)Nl?`u+94et<{KLwK=&$uHqw(Dmg0 z18BetIm%ejuACu}L`nSFN#2X>Nn(mAXNWeSJp>C_*ZdG}UQ)19-+4jH=RvtXLmu3K z>reZ6G~mGdwaB^sJk@118t`aR@T`%>w_`WqFGBx{3Wwudui*JR+EMT?e0YnGT7!>r zDB_Ix3m%Pli`Y=!?=|nEN;J3VxN?u%m1vT#Gqd;9S{Sw+cb9v3%ms>p2nEYTrUy1+ zV%7CyWPt90<92l!8K88j1+@CkCQCI7+Uj<4hTVzED8`RxFYIx{TtfmOxmtZ+aWbaa z(eA(Sn$4ZnW9Y}rF#|kA)EyR}lT|BbGUULvpC2rco{Y{X7!>`wM8-D0Pl2*t7~2 z)o>sB-?vfvbAS9=gPX^yEI7RRT7EsKh^vg(0Qn9ZC>=Si7CmDE&=+eg`_$}$!n9hO z7^E1$aLh#%pgFOvdK(XbY&P*F{z$VLzs{$_sT5=lN_&~CNH<1q&2qg;J{_FTt!L(K zLnr6w=S2b!N1d>W&)98?@+SL4sb&zN2dgzu$M6=C??)s*v(D zgW#lDeS&ji?QRx#kD<8&c5s)@}~&td>%M(o>( z+U+K0)A$;=L1PRJy1hh)>3M206WXkQId_ozgo|CGA3cacJYdwuVoK$gtJV8nH|qAq z3|C=}J%x}+;y0OgldwimI}@r9{%#x<{P?GV;GQQ%Tojxgp-hGp7>RBx;rLl%c_`j< z&96CV%rX~x<`|!5vYt)`Gx6?>LTo>sVbAyQb8Zp>=+8-SwWfF&SZNKi%gde#Bd?Hv zpfwu!S6o;RGEkL#0sIBQXS)-{;pqLvE`l;<6&)+_@!Uq&K*b+VOrS8@a)h&EFWaY$ z4s~^LO_o2kc5t|_<_m6k=hiz@Fu+>t-coYM{^=Wc5v4pUnfWrXK&HL z3D3n1v1+BdB>tNr=rk9lNX?z^S4Nuo-v0jTU{afEW=?_D?+TlJjFf1a%9P47X*T_j z38B$$t^{-C%5J@Ow~TocK7Q#LEqx3X@x3>Vliic?gU8RHcQ*LrksZ_(2vO4?U$`8Q z(xur*sx=GbUkyLflpp20%sc#56TjLPUD)T-IRkpX4_jWL#L@8nnS7Lt9hTLe*ibck z>7H2~3WO!1!@aa_U&|J$WqC@8HW9be$lw7U{^=L>_2V9FAb8oj3JnCg;<3tZNa=j~ zJ$z7BEO-n90G>1$nf`TN?;WeM-zi`6&%WdkmyOW3R4b@}-m{Zm?S<`_g6|<3D(vkN z8h-8`5mx!J*qyiHZM96r7XjTgivXFbfU3U9&`u#)h6`r{#ih!741edq-c$NUZGGpL zyy9K64C)XBb#Clq4~OB;rc-2 zIV-gaAA(IbX98_pi_<)8@yNy1dySCJe_!x}_>%;Or2~4z7=wybTN4MTK(yXsKb6=T zNC3#!WXhSN>Y>bdOgl?T6yPi|1FX194uZVcVC{)^tQ??Q8Ty0+eBufNTv3BWVqP02 zuB*05vc=Dl4;3cTGKcQ)192B&?as8uynN$oToL2}HR*oRKYu^X?g}QCXw9 zEP^7aMtWm8XIkIN861C6V;Urcjo-)kJ%DQF`BU|Oy~!5WPF`Z6tHQf`(s2gowS-p8 zv`d6R;PYZ-zV(|0)sspA;`eVCR1gv*tTkU!jQ`Qj!f1IW$LHn==loLbI{M*5Sa1@F z=`sYg;neA!YG;BFY?)wv=!SatJnmLK2b%CYZoL?@k`i$@86b+z-5pM+pOFLGjCeoM zqlIZlPq&{NA+PMcSZAAtD*xR9aE#3<1^^t+ zs96fNmImstA!BspSoB0uXRYDyo}_fNHAW0g#1yVp^nu(|Nwxs7$U%L%0k8uN7sg*? z;Ov9soat*c%uTr}pEsj=*5n+y3?CZfq?P6T?qK!))|I6~!VZS%lLRLr=bnx~h+%J| ztJrd|j=bvZIwp>$)}JkA3%52$SmI??0cOclsGPs*R{;&)2bUIj$_qx#R`? zRT=hd08@*Suj2eVN+;4@-`aBbg{nAna;+1eBZI)m3J} zaGj0@Sh(s_M63Y751N+%bd`aJ;f_3MD=RJ*fM}nhnXre-aL?6>7)Xp-th9ZWiN3|y z$iXSEL@BNeJ0e!);W*PGFZ9g#hsHhAqL$Jy?i5T4mPsuUtm2*AU)~u@xv7WY&Zsl} zL<}g>bVm^p`v-YmG7=;%(pu40RD0aIWGtY?eymm}_-$k)sr2A^_z>24Dvz$(a8C3* zHb)zL*?GYy+1=-(TxC4M53IA1VG)V@f?e^TaU~~jCL%D9s?A7mMs8BEfYhp|r$~25Y>r?`|)qs&Dld%alTH{A~c;z5{Dm4>YLS%7UBsh>WW*(ArE2 z=7^sqv)9XBJO%cm&QQW2A9=;LZ`t>?u@?G{<`jiyxq1dwTAu1xNkP5@Fkef+C_lAy zK#7KiCIk*&QC7~lvF|x7+@VUJdZ#+)fJb4%XqegxjU)bYUU3yZJ%Zg|R5ErGCVSgF zGBVQ8>7(rkwzd^siB(tfJCREk$ADe=)XsXyTlOn{dyUqD49K~5ZH*6h(6M&9VOk20 z9a;Wc5jNsV%{h^q?}nwtoPZ3L4Dqidv~@m-Lj2e&k@eIW~r4;Q~YR? zK#)ei5}NKE$U6X#2y<;I=QhOQBzZOjCH*=Vpnz)o;PuH7WtPt1tk>T2d83XAE39)p zt}9s(0aGHW>jIX`EpC2_tx;b9@rSsrJY`ZXo<;(pXCbv>E4fdY+~{plH?xlORi?&u z`#b)01kd898d2fl??VdreZ3@!FBRHz+?fwbOMS)wz^WYtSdBkb+)8n%IR53*AcQCU zdSCWf*Y@WAy0o~d;>SEME>>qj#p8iC3m;QM6q)=btL7u3{U=YHqzC=!Xw;ck?VKD^ z2Q?<)pESecE6MEwvfYXBJK!Rt1Bq!&5_@9|SCOvztuYR<6a7lx_uEJZ=LzIw5M=Vb z#D%o$+KW>?hEV|Pf~q`Dlific*nqGQ7WhVg3YW(>>^8CMcL`NU)0f@^VY-_o1%MTa znfFSIO}$?ZO*DLQ8ely?D9O2g>-}wYd-!91(@5l3t4{r~fTx^!LOp|f8UXS$$Q||H z|KpF85N7q0U()Xt`-|K~%-K7zf_h~datIgDh!kz)2o%qaBB+!vhnf7YzAg;`{wcSxyFSwtFLyP0ySLT2bdDQMqd4;BEP59eclw~#jrYu6uIrIue;4| z)&N_4*qeGKfiJ=~c|p-j8X$h9^m=&JCW@@@!+_YRPhH^FsuAR+c)+@naTrgU2U260 zWCVbPEH)6YIBlx&J+xf{`ziP{5+HoTnYcjRvRv8Q*Jlh*fB2rCpKo;icjX7w-xK{` zE-=wf08&T*Ea(=h#}0XT4+a*I_me^~J4k;iOHmoRs-KSS`=)bupRebWUU(1y5a-n* zkg75{M#ry<&v_8Ci+iPP5{o=lT4uunC#_5>a2+Mbc_Ijm`iaO4DaQvp*^a7dE}_=Z z$qA;CQS@$4+Rob}A;a!Z@zxC{3SKwAGw*-@(ZKghNrdw&?TPnfP0%Qh)#$AsCu_X@ z6Zv}<6fb!(sNobxw(omHUG9-K-j15eK?1c#Y*?Nz+ow=zbn#sFeyL>Dyth>n!mH#K`m)YaW_!5$Ab=Daz%MUFckyn(v#z1*b~DP+ zV56p<4A_S&e-kZ>G-vq%bmLtK5GI^@IM5k>oPAWB@&BC2W)_3iDRs4k^Ro1P`Z9t! zg(89s2foOtXy3iU@oj!6Qf|4HN=$CDjap_;OnT`Pmy0jGY|>_fsQp-*af*Z@(5RVL z%dC?IdlJ_y@D09UC>AYXR(w^`@0dy*@D})@v)egYM7Pvqp_QJrX?vdlUviW z!vIQ-Y^^iVuEtFq$fgka$E3LqHFIxQEHDNFcokN0?j>`7J;wl|fxr+zyZ5N?{(zIb!d~Fo6F?VeMj|e_%z9a* zKA`s=qtU?VNRl;0`dyxsUGF$LURce^$cZNwz@r$}R&;xkAOpnNe`o1Cd3_{Yp8KFa z`Fzs6#-hSw*mIA-0^;QG&N}oB+;t3*sx6v)aad3C9zU>A>wvR+(W8T@^=fjg)`#k* z%W+#_*nXmnKa1Qg$AhYdBYu?mJzRI7jDG1V%*A6gk>yTTf`osrV*v2iwk!{D^)_BQ z3)=Ee-o~hby)3bpwdQoK-tia3Nk)|wZc@Vm*fSqE2c)QAP?9TQu8%Pq%I>IOgQLJ$ z`-x8|tW-lZ0)G^8!zM57_NKiQuk=yYRHg*oTx6iiWz}ulLKZfEV4@q zShXpB*LqA2wDT;+oxd=ak4Pvv4ngB&#p+r2+??67f9!tH)PVtuE9`^&#j9OrZ%gD^ z*h7ZJ)2rl%6FdM4Qe}M3IJp4>+m&7#*#rZ>ewlsKmE1<;Ug=5eW%qeM$XNbzZuH98 zvpm7EtXBP8`792^{gG61K?27W(ry1fi&vnzBlGgS_?MUXK!+@wm;H$oWjc~nljy*>p0~KZX>iJO$^dgGR0DSZ_-LT>9 zxGwap^-~2V{1yOuG1+^2bG|luqxSSlIDDoh|6p$+8$EromgKGbe;{G7cBy*{ccNC9 z_5}2&6X!0>?eY_T`gtA;QwprKsPKKJ`ST>lSKIkA(c zXTF=np!NKFziWo?!X-LnV^R%)3If!1HCl4#zp=jIZ_x(x>0x5otuLok{*=mZ4->+N zA^{nS=}#}vw@LO|^fz{zC5|bceoLikA*I)9A*#xXIBoLjE<9r(?g-F168P!mW;GCC4&iX1U3%; zbHT}MO_R%BrUpfoFvbf76J~8TEsLzA+g4yf0q|A$`x%eZdf@pp0jwS0g`d?zKIiuv zNXuz5x8k^EW<3+FyOHPxNk2*gfY@ksPQ$n`mk_tKy8%&|m^&L0Tg11$FUwRfVIWlO ztJ@tIQ*Th4jhljk$(lGH6?n4vLQ};Hx$OMX^@|+W4xe>Yq{!y2`e9gTsG#5VqW!5+ zoy`c87*#dMQ-o^XJbZF;T}hoj4zB5EE-fvMmAx+iROneIG$_J-kA&0&K;rB242-OI zCX5;u5}oO`r#DT6Rz7L7hvWrMe0c?i&jO7MBv`%5pj_^EAOP9FwAml382FlAa9g;3 zz9*cVz4aW&!KmF(T*qYWW#n!L@AZZo9$mpqa2F}@#z(mhJAfFCSQ$KFZB!Ss_0;3_g4>)Xiy zAoH!UL-!}t5qZaZfnE8^uhD%w`%v!8M|BN&F}H+50EJ9EM&?s(U$iVVMfy~p6Bb_c zAYuly_URD=>_Y2X&6 zj}`|+YKTtPjb5QV*se6p-4_Ia#33^U4NL;~U)(@bge^ag6cy#VUb=As!|;-pl5XWH zoH4tsMK}|d;e!XgAYri)`aBLJO&S|b3IO>%E3d!%4hk!AGchsoXmUKPi!zD4Bk2|Y zQCgvHpz(<&p<@2*PTwsf>5ei!{mB!t3xaEhp1Nou1H2Rw5PqER0x7KQh=RmEYp2;u zQg(w;^ZRLYN+0rvS0v>%;@)VM*=F8Px${Jv1&i+kaJmDSdPkcZUl^N6EI6USyJGo> zzsTv1V`#4P{;-@XmV&<+Yx}|L?24+vYwplnwx;bz6rbKp@D>ayP42SO6%S(_t6we- zSC(eUJL9O4(oUFU>j9*#i?VU>(FM~#S0Dr1R=iek3kQ-_QgEsWC#b~p|ZeVr)dAHBtmm$`|$6`6MQQi#7VRHnjnDo{Hzbpe6sg@cTOWK??I7Y zGXOCt-bmmuiANC+t$g5{zIvhqn}yGBGGDY>br+tUYGt}&%~N+OYvKX&q@@-3k81Zv z97ynW!9WW`oxcsmQ|Y>hcuxwtfrDTuD2bkm50{ln&)b|z*Pz$qKkP~CexLFw7bj^>)WS_gQ`O|Wt2}3H!f%{>q2+17q3S%;4t$~-9omq zSMf-r>`$%r5H|WBRNkq_mw$ZUHX#JI9a3KZo-Hcs*{*# zgAG>r$dp<<8Y$&F)VP8SED~Z`2Xc-QPxO8ijF5XLl#HgpiNKw&NO_}&1dw3q$XPxp z-yca;>3|?G)BcR@7balYW=Iivas!^T+XvSiEkF$UVOMfH#&NM!V-b_PX@ze#yd~sQ@o9> z;7=QcT1d$26L@E+NYi`-Qpy0J)2d>JJj<&6VJ*6~lh4R^8rxEboI3GF`{30YoC}}> z1+52!l6z70r&4Y0?8Q7P2@HYEeoBywqsguLy$DB=`~ljVB)Q(0BA6F5%{IMOX`yiT zZw7y`9tu+&`)`lnf43qWs`^+!}1d&9y!F1(;BcrrUDX6^I zXkqWxFBu<@;H(489Chq0J1eU01*ei$+grlEEUUPr(OcdkCyayKx|TSbvc81P|FJ(< zJ)?(898N8*LND%c*epppto8A{8258Mcoe%RML+FJd=S@-yCi=Hz@I57M(R1|1NqkX zqgg4C552)4Hi0r^fZ)aGmdWQ~zm9HJvG}rD@|b1%gCCvw^VE#l9vS)(b6{fC&xBD+ z&pD2bg?0_bgjinD?9L-%$Q!Gg(+2>ME3F_k8~4#U0aR=Vt)7W^iaHs6s0SLN%%Abm zfiiX5Z0J1}IkgoAc4<4|=iL!4Nm+w|Ex|-?^G@E5#;7W(`5^tXH;&0JS44oxw+u8O zxBFUD*Z;W&vh&nlnw2#$BfAh&apqWQ)aWRK;o;059`*RqLoRketnM})pp#lT z5HjqH&1!4-H~7P7dz@1IsRP7IcKGRG*yU-T7`x&MJ75wiw%O7&8>40SRi-ha97e4? zJuxk)+uc2FfbdrU2o&P|aFiq&edFM(n#c}7`yz%@?R)Q6^XxN84k(VUq^R?)9A z$Zc1{)?-o)0gm$!Eg^5FEV>8WV5P~4JmpoX?LYDXK-n(P_-jn{MS&zOQPZH)wf=8n z72=fjeoIl71swT-)c_F(cIj~XnkJ{IrQ^(N+VxsKet!Po4vZhV26lJZHrFhN)+n=f zcoJ7o&;5{;n&CgHCNALUnYF3CdKSzTosF$a>`zNl+gNjb-RYq0cExJWm~Y>lN4Gd* zsAf+CdslEgqttc?9JdvgWZd*2O^SQ@>ls%eJ0WYT z?l8FG8clOa7Qf$x&CTm(#dB>qvb4~OIzB{#(%D!AeegQyN(Xyi{I-!rLZTxbuiinX zFhs+vm}$ayaULJO#`Vc>vZem{v3I}F42Qdwr8ye00nt$%wU)0zs&=UEN8_pSts_c%= z5=!DB(e#tb($`ew)UNx(;lsIBVhIK{{x?4okr0PM1<2T$AA5V2z60&a5LBgTO8H+*O{9SBM4PGfuhLZB@LjWm=LRw$wOa|k3=43HW zd>tZQt8ONo*3tkqS5&-2##<%fxetq5OO0hK9D`#ca=ujy1Q&0N9433hi##q&Lb@t= zG?7K$$butL^(s9m(%L9hXngOcDTMjx(5+gKL@fCEZ9iwrt~$`{zMraNF?@TUqjnx( zgoXvFBcA)Ll0ss_pFty&LNwE147HgdOXI%Y+ObS z?{Pf$4I|Zh85i*W9K}FS5?^+IHH&Jn)Cs@WBCP!P^G0(fkE23^_`mjoBpO$x_HmmK zvk1B>kpwi2(io?w?{5k2nP_Gqv&LlO#908I^4;PCyX5_)5=H@@3wTDXzD{|H*zC44 zms7fEGyz~!O&rda^48MQLLL3;(#P~)XE;aKH}vj#as^`xofByTOSavk=mD!Qeb8V@ z{J}YyRL!Lh<7VfNN3-SnQ4a?V)bmvE5$44F$cj`Q>9l_D0`a4Ao8rhvbBa0Jh~*)x zWqIOe3U+4mk6})4YL78j!})%}xVoYRl=;0LQb)Z>d-~%Wa?7huo%ql@ajc*=|v1>oAymO2cXa)JKgOh zZW#G16{X72OsvTn+O{N{8&OnC1-fQL^_Qm{4u;sdt9vP1+qc$q-=1c0gG~#t*OMaltCut{R^Qo4KvC*IN4Y&fdzE^)w@YS`*Pi|w;Mj?~dL=*+-6kvGev-t>MvE6}umxja*-XNQm z$@iAl;SYI_Xm9CUn$wZ`y_2h`%Xt`(X|l++*q(WS7`^9OWij#He%Xx;D9NeIR!Lg~ F{SR1F|6l+B diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css index 1d8a308f7b2a..a790e973889a 100644 --- a/browser/themes/shared/incontentprefs/preferences.inc.css +++ b/browser/themes/shared/incontentprefs/preferences.inc.css @@ -43,78 +43,36 @@ treecol { visibility: collapse; } -.category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png"); -} - #category-general > .category-icon { - -moz-image-region: rect(0, 24px, 24px, 0); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general"); } #category-search > .category-icon { - -moz-image-region: rect(0, 192px, 24px, 168px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search"); } #category-content > .category-icon { - -moz-image-region: rect(0, 48px, 24px, 24px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content"); } #category-application > .category-icon { - -moz-image-region: rect(0, 72px, 24px, 48px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications"); } #category-privacy > .category-icon { - -moz-image-region: rect(0, 96px, 24px, 72px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy"); } #category-security > .category-icon { - -moz-image-region: rect(0, 120px, 24px, 96px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); } #category-sync > .category-icon { - -moz-image-region: rect(0, 144px, 24px, 120px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync"); } #category-advanced > .category-icon { - -moz-image-region: rect(0, 168px, 24px, 144px); -} - -@media (min-resolution: 2dppx) { - .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons@2x.png"); - } - - #category-general > .category-icon { - -moz-image-region: rect(0, 48px, 48px, 0); - } - - #category-search > .category-icon { - -moz-image-region: rect(0, 384px, 48px, 336px); - } - - #category-content > .category-icon { - -moz-image-region: rect(0, 96px, 48px, 48px); - } - - #category-application > .category-icon { - -moz-image-region: rect(0, 144px, 48px, 96px); - } - - #category-privacy > .category-icon { - -moz-image-region: rect(0, 192px, 48px, 144px); - } - - #category-security > .category-icon { - -moz-image-region: rect(0, 240px, 48px, 192px); - } - - #category-sync > .category-icon { - -moz-image-region: rect(0, 288px, 48px, 240px); - } - - #category-advanced > .category-icon { - -moz-image-region: rect(0, 336px, 48px, 288px); - } + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced"); } @media (max-width: 800px) { diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 7eee5ca28fe3..307dfa4c0e6d 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -202,8 +202,7 @@ browser.jar: * skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico) - skin/classic/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) - skin/classic/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) + skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg) skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) @@ -670,8 +669,7 @@ browser.jar: * skin/classic/aero/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css) * skin/classic/aero/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css) skin/classic/aero/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico) - skin/classic/aero/browser/preferences/in-content/icons.png (../shared/incontentprefs/icons.png) - skin/classic/aero/browser/preferences/in-content/icons@2x.png (../shared/incontentprefs/icons@2x.png) + skin/classic/aero/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg) skin/classic/aero/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css) skin/classic/aero/browser/preferences/applications.css (preferences/applications.css) skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) diff --git a/browser/themes/windows/preferences/in-content/preferences.css b/browser/themes/windows/preferences/in-content/preferences.css index 2a0a451643b7..6c7c4b9c8e4e 100644 --- a/browser/themes/windows/preferences/in-content/preferences.css +++ b/browser/themes/windows/preferences/in-content/preferences.css @@ -4,6 +4,40 @@ %include ../../../shared/incontentprefs/preferences.inc.css +@media not all and (-moz-windows-default-theme) { + #category-general > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-native"); + } + + #category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-native"); + } + + #category-content > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-native"); + } + + #category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-native"); + } + + #category-privacy > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-native"); + } + + #category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-native"); + } + + #category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-native"); + } + + #category-advanced > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-native"); + } +} + .actionsMenu > .menulist-label-box > .menulist-icon { -moz-margin-end: 9px; }