From e95386a6de3cfe59bc531110d6bde76288b89872 Mon Sep 17 00:00:00 2001 From: Richard Marti Date: Thu, 12 Oct 2017 22:27:07 +0200 Subject: [PATCH] Bug 1408154 - Use SVG icons for the AppMenu. r=aceman --- mail/themes/linux/mail/messenger.css | 108 ++++++------------ mail/themes/linux/mail/primaryToolbar.css | 47 ++++++-- mail/themes/osx/jar.mn | 4 - .../osx/mail/icons/appmenu-icons-active.png | Bin 523 -> 0 bytes .../mail/icons/appmenu-icons-active@2x.png | Bin 399 -> 0 bytes mail/themes/osx/mail/icons/appmenu-icons.png | Bin 641 -> 0 bytes .../osx/mail/icons/appmenu-icons@2x.png | Bin 704 -> 0 bytes mail/themes/osx/mail/primaryToolbar.css | 35 ++---- mail/themes/shared/jar.inc.mn | 1 + mail/themes/shared/mail/icons/quit.svg | 6 + .../themes/shared/mail/icons/search-glass.svg | 2 +- mail/themes/windows/jar.mn | 1 - .../windows/mail/icons/appmenu-icons.png | Bin 1993 -> 0 bytes mail/themes/windows/mail/primaryToolbar.css | 24 ++-- 14 files changed, 107 insertions(+), 121 deletions(-) delete mode 100644 mail/themes/osx/mail/icons/appmenu-icons-active.png delete mode 100644 mail/themes/osx/mail/icons/appmenu-icons-active@2x.png delete mode 100644 mail/themes/osx/mail/icons/appmenu-icons.png delete mode 100644 mail/themes/osx/mail/icons/appmenu-icons@2x.png create mode 100644 mail/themes/shared/mail/icons/quit.svg delete mode 100644 mail/themes/windows/mail/icons/appmenu-icons.png diff --git a/mail/themes/linux/mail/messenger.css b/mail/themes/linux/mail/messenger.css index 4bfbf24850..7972cccfe9 100644 --- a/mail/themes/linux/mail/messenger.css +++ b/mail/themes/linux/mail/messenger.css @@ -293,41 +293,24 @@ menuitem:not([type]) { list-style-image: url("moz-icon://stock/gtk-new?size=menu"); } -menuitem[command="cmd_newMessage"], -splitmenu[command="cmd_newMessage"] { - list-style-image: url("chrome://messenger/skin/icons/mail-toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); -} - -#menu_newFolder, -#appmenu_newFolder { +#menu_newFolder { list-style-image: url("moz-icon://stock/gtk-directory?size=menu"); } -#menu_newVirtualFolder, -#appmenu_newVirtualFolder { +#menu_newVirtualFolder { list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); -moz-image-region: rect(128px 16px 144px 0px); } -#menu_newCard, -#appmenu_newCard { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); - -moz-image-region: rect(44px 22px 66px 0px); /* contact-add.png */ -} - -#openMessageFileMenuitem, -#appmenu_openMessageFileMenuitem { +#openMessageFileMenuitem { list-style-image: url("moz-icon://stock/gtk-open?size=menu"); } -#menu_close, -#appmenu_close { +#menu_close { list-style-image: url("moz-icon://stock/gtk-close?size=menu"); } -#menu_saveAs, -#appmenu_saveAs { +#menu_saveAs { -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic"); list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } @@ -338,47 +321,47 @@ splitmenu[command="cmd_newMessage"] { list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } -menuitem[command="cmd_print"], +#printMenuItem, #mailContext-print, #mailContext-print { list-style-image: url("moz-icon://stock/gtk-print?size=menu"); } -menuitem[command="cmd_printpreview"], +#printPreviewMenuItem, #mailContext-printpreview, #mailContext-printpreview { list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); } -menuitem[command="cmd_quit"] { +#menu_FileQuitItem { list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); } -menuitem[command="cmd_undo"] { +#menu_undo { list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); } -menuitem[command="cmd_undo"][disabled] { +#menu_undo[disabled] { list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); } -menuitem[command="cmd_redo"] { +#menu_redo { list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); } -menuitem[command="cmd_redo"][disabled] { +#menu_redo[disabled] { list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); } -menuitem[command="cmd_cut"] { +#menu_cut { list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); } -menuitem[command="cmd_cut"][disabled] { +#menu_cut[disabled] { list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); } -menuitem[command="cmd_copy"], +#menu_copy, #mailContext-copy, #mailContext-copyimage, #mailContext-copylink, @@ -386,31 +369,31 @@ menuitem[command="cmd_copy"], list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); } -menuitem[command="cmd_copy"][disabled], +#menu_copy[disabled], #mailContext-copy[disabled] { list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); } -menuitem[command="cmd_paste"]{ +#menu_paste { list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); } -menuitem[command="cmd_paste"][disabled] { +#menu_paste[disabled] { list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); } -menuitem[command="cmd_delete"], +#menu_delete, #mailContext-delete, #folderPaneContext-remove { list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); } -menuitem[command="cmd_delete"][disabled], +#menu_delete[disabled], #mailContext-delete[disabled] { list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); } -menuitem[command="cmd_selectAll"] { +#menu_SelectAll { list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); } @@ -418,13 +401,7 @@ menuitem[command="cmd_selectAll"] { -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic"); } -#appmenu_find > .splitmenu-menuitem, -#appmenu_customize > .splitmenu-menuitem { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -#menu_find, -#appmenu_find { +#menu_find { list-style-image: url("moz-icon://stock/gtk-find?size=menu"); } @@ -440,79 +417,70 @@ menuitem[command="cmd_selectAll"] { list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); } -#menu_preferences, -#appmenu_customize { +#menu_preferences { list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); } -menuitem[command="cmd_fullZoomEnlarge"] { +#menu_fullZoomEnlarge { list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); } -menuitem[command="cmd_fullZoomReduce"] { +#menu_fullZoomReduce { list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); } -menuitem[command="cmd_fullZoomReset"] { +#menu_fullZoomReset { list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); } -menuitem[command="cmd_goBack"] { +#menu_goBack { list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu"); } -menuitem[key="cmd_goBack"][disabled] { +#menu_goBack[disabled] { list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=menu&state=disabled"); } -menuitem[command="cmd_goBack"]:-moz-locale-dir(rtl) { +#menu_goBack:-moz-locale-dir(rtl) { list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu"); } -menuitem[command="cmd_goBack"][disabled]:-moz-locale-dir(rtl) { +#menu_goBack[disabled]:-moz-locale-dir(rtl) { list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=menu&state=disabled"); } -menuitem[command="cmd_goForward"] { +#menu_goForward { list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu"); } -menuitem[command="cmd_goForward"][disabled] { +#menu_goForward[disabled] { list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=menu&state=disabled"); } -menuitem[command="cmd_goForward"]:-moz-locale-dir(rtl) { +#menu_goForward:-moz-locale-dir(rtl) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu"); } -menuitem[command="cmd_goForward"][disabled]:-moz-locale-dir(rtl) { +#menu_goForward[disabled]:-moz-locale-dir(rtl) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu&state=disabled"); } -#goStartPage, -#appmenu_goStartPage { +#goStartPage { list-style-image: url("moz-icon://stock/gtk-home?size=menu"); } -#menu_openHelp, -#appmenu_openHelp { +#menu_openHelp { list-style-image: url("moz-icon://stock/gtk-help?size=menu"); } -#aboutName, -#appmenu_about { +#aboutName { list-style-image: url("moz-icon://stock/gtk-about?size=menu"); } -#addressBook, -#appmenu_addressBook { +#addressBook { list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png"); } -#javascriptConsole { - list-style-image: url("chrome://global/skin/console/console.png"); -} - statusbarpanel { -moz-appearance: none !important; } diff --git a/mail/themes/linux/mail/primaryToolbar.css b/mail/themes/linux/mail/primaryToolbar.css index 254652a028..5e09fbf81d 100644 --- a/mail/themes/linux/mail/primaryToolbar.css +++ b/mail/themes/linux/mail/primaryToolbar.css @@ -248,32 +248,65 @@ toolbar[mode="text"] .button-appmenu .toolbarbutton-icon { -moz-image-region: auto; } +#appmenu_find, +#appmenu_openHelp, +#appmenu_addressBook, +#appmenu_print_popup, +.appmenu-edit-button, +#appmenu-editmenu-cut, +#appmenu-editmenu-copy, +#appmenu-editmenu-paste, +#appmenu_addons, +#appmenu-quit { + -moz-context-properties: fill, fill-opacity; + fill: currentColor; + fill-opacity: var(--toolbarbutton-icon-fill-opacity); +} + .appmenu-edit-button[disabled="true"] { - opacity: .3; + fill-opacity: .3; } #appmenu-cut, #appmenu-editmenu-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/cut.svg"); } #appmenu-copy, #appmenu-editmenu-copy { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/copy.svg"); } #appmenu-paste, #appmenu-editmenu-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/paste.svg"); } #appmenu_print, #appmenu_print_popup { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/print.svg"); +} + +#appmenu-quit { + list-style-image: url("chrome://messenger/skin/icons/quit.svg"); +} + +#appmenu_find { + list-style-image: url("chrome://messenger/skin/icons/search-glass.svg"); +} + +#appmenu_find > .splitmenu-menuitem { + -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } #appmenu_addons { list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg"); - -moz-context-properties: fill; - fill: currentColor; +} + +#appmenu_openHelp { + list-style-image: url(chrome://global/skin/icons/help.svg); +} + +#appmenu_addressBook { + list-style-image: url("chrome://messenger/skin/icons/address.svg"); } diff --git a/mail/themes/osx/jar.mn b/mail/themes/osx/jar.mn index 1a23df14af..32bea2e36d 100644 --- a/mail/themes/osx/jar.mn +++ b/mail/themes/osx/jar.mn @@ -140,10 +140,6 @@ classic.jar: skin/classic/messenger/smime/icons/hdrCryptoOk.png (mail/smime/hdrCryptoOk.png) skin/classic/messenger/smime/icons/hdrCryptoNotOk.png (mail/smime/hdrCryptoNotOk.png) skin/classic/messenger/icons/twisty-open.gif (mail/icons/twisty-open.gif) - skin/classic/messenger/icons/appmenu-icons.png (mail/icons/appmenu-icons.png) - skin/classic/messenger/icons/appmenu-icons-active.png (mail/icons/appmenu-icons-active.png) - skin/classic/messenger/icons/appmenu-icons@2x.png (mail/icons/appmenu-icons@2x.png) - skin/classic/messenger/icons/appmenu-icons-active@2x.png (mail/icons/appmenu-icons-active@2x.png) skin/classic/messenger/icons/attachment-deleted.png (mail/icons/attachment-deleted.png) skin/classic/messenger/icons/attachment-deleted-large.png (mail/icons/attachment-deleted-large.png) skin/classic/messenger/icons/attachment-selected.svg (mail/icons/attachment-selected.svg) diff --git a/mail/themes/osx/mail/icons/appmenu-icons-active.png b/mail/themes/osx/mail/icons/appmenu-icons-active.png deleted file mode 100644 index fb7a6a67523b08b2a630a8d97572e01209ae5d69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)t}gM$xH97J4{?*0KT3XX2w92{H(u{imdgo=w! z7KAE3tF%z7_4-9lFovYby`@VJ{J58sljM9i$;tKkYRw$SnJv>cqwyC&5qyFY_$GgU z1$pc_f41+Y;~|JD{84bA=_4B#@C>><3ixMkI&OhH2noIr`8F&Clmveo_$}vN2Ct6Z zvS8IT$N~jtKnsx}-<%r(9=`g6W43qGAOUbk!6||Z3RnvGB7a)m26()IV41UIG~1<= zZP9kWvcs&~$HK>GQ;d_R!#kj8i-8wg0rlWon47IgoeKd)g8*iiigDTvd9{LL8v%Ww z13U^7F1Zl!;iZxwWWvzi0Jcqoj8Q#bBOy7yEm&J60wgOa#$k8Kw8HNP^ZbzO5+4L7 zbP+MT1&yEw-0f4b1}(k zd=&)bEb`C!H2*p0;0Sb=NvIPfDK=&y;EFCM6)8o0+#rIr#cS&C`3Efe`pvd~WMlvU N002ovPDHLkV1hsR<4yno diff --git a/mail/themes/osx/mail/icons/appmenu-icons-active@2x.png b/mail/themes/osx/mail/icons/appmenu-icons-active@2x.png deleted file mode 100644 index 0a812c96028920898efa5d8677c21ee25b250a08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)faDw0 zA7&d01cuQDDodiJ`zMJ)#9+3Bi`X^?F!~mI0Pt8LjVzOBU>dUq!1^S*uK?+Qt!;SK z4D1zTzW>b#0EtHScuW%$!-y3Cq^gfN%7F@#tN=8V!J4%23OQR2C;$@yV2;Zr39kr% zm5Bdx7Ze2`v<}Ezh*{rlQ04^P;xVhoSpd+265ZZ;9i&A7_|}eQ6B&RvgeU;gm4DkN zqa#lUkpN6=p5EP$XFK6C;q29?@1||g@54->X002ovPDHLkV1hjUqU`_x diff --git a/mail/themes/osx/mail/icons/appmenu-icons.png b/mail/themes/osx/mail/icons/appmenu-icons.png deleted file mode 100644 index 5ac8b0aa5e6e395145f8a00b9484f410895b8642..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 641 zcmV-{0)G98P)jO=5F?-&-8c-}mY!rKcfQ>>*yL1*Q(g>nhnOF%4 zHd-YRFyb@H4J22S>o=Qo~XGiPSLJu`E*(b#U6G;AzSrxd^JU8DIb z&;fn`>%a!dg%Kxf=b^+D{B$iIhcDFpDH0v^BtHt>lbki(3^uI%GmrUTEdm*zRTho| zD^kj#-!eRtOlfgHkidG6d;yPrA+eR=H(~$PUc00;dreA^Rzso8Aqs6e1oNMIAMvwnEO z50vD!59?l(65xg(hqHrHvyVLiZ&V<#R%epPI2tL^CrPqPY4)(t3AXCIo#%In2<~lH z7Nq+d0vW7&{B#iGk|#tTGn{kQuUL>RP zp}xRQD0{;GYXa>60_{f5f6go5Icn~3!5BLPn`dN8b2)&(8+$nUF#AU(D0ZiWM4N23 b)!*|k)tp-K20(Y(00000NkvXXu0mjfIP)XS diff --git a/mail/themes/osx/mail/icons/appmenu-icons@2x.png b/mail/themes/osx/mail/icons/appmenu-icons@2x.png deleted file mode 100644 index 19ca6b8da66be4a6ade5750cd7c01f0633badfe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmV;x0zdtUP)5XXI~eS&=h6+cis`2AG{Q4lX46b}l5pon-B1&=;q)_++=y0LANN!q#%3@s(e zB=c)CGf5MPxWpwc9wnJfGST{?ZBR<35_`1ul2j_iw%aWW(k|_Go8|L)TUxCa(`I~8 zgUYmVwhKFiY&OdpjRsq-R<__C&$JoeuQ6rX$O3pk*zI;kA#}T4*6DQE<#J);@tBQ9 zBm3U6Ec>}O0DcT=0)VrwX$ZMoj-5^?HlNR*W57M0WilDP0Nji!156eG4}uP3SF2UK zZ=NpRxOjEZ$43HC@i%@-v)SY>dB@}Nt**o2@CO*AUa#wgAPS4h2j~RAGvstS_0%(& zOt|2*`2s3~1Z8L)Uo`2sMb=_d07SnIL@2t(W8}pVH3TJS3ILFPzpu0;BKldc*S`8# zEEf6!P?OdT05TX1gqIPl--!1`=Tj^eX_w9@0^rp};^cQch=gS4bG=^aeV5lHO#xQP z8AP&rReNEJLOXz0ql6WJOwK@Mv`07_ScV)X9}olp_>UNXB!Eh#qCBt7W@F9?e;NSD ze!rKVSGipN-%$_+0L1^Ib3xAG+{!SP2ZS{dQ#sr4n+MEhGkZ%~$tJ2Ho~-g(trl7U z>2%t)&G~$0g+f97rBn^?Ol_o@1^_`!&#Q;6W)ht$6EF=S2mp}V?e=Ut91iU-gG49A z;7vjZ3IO(ZmdmAm08gs(wc=et1n7+4Yn{Gtj8rTuH^?>q + + + diff --git a/mail/themes/shared/mail/icons/search-glass.svg b/mail/themes/shared/mail/icons/search-glass.svg index e4afef4a6f..f964e61e24 100644 --- a/mail/themes/shared/mail/icons/search-glass.svg +++ b/mail/themes/shared/mail/icons/search-glass.svg @@ -2,5 +2,5 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/mail/themes/windows/jar.mn b/mail/themes/windows/jar.mn index c89f5281df..6f6a51a469 100644 --- a/mail/themes/windows/jar.mn +++ b/mail/themes/windows/jar.mn @@ -128,7 +128,6 @@ classic.jar: skin/classic/messenger/icons/message.png (mail/icons/message.png) skin/classic/messenger/icons/multicolor.png (mail/icons/multicolor.png) skin/classic/messenger/icons/license.txt (mail/icons/license.txt) - skin/classic/messenger/icons/appmenu-icons.png (mail/icons/appmenu-icons.png) skin/classic/messenger/icons/arrow-dn-inverted.png (mail/icons/arrow-dn-inverted.png) skin/classic/messenger/icons/attachment-deleted.png (mail/icons/attachment-deleted.png) skin/classic/messenger/icons/attachment-deleted-large.png (mail/icons/attachment-deleted-large.png) diff --git a/mail/themes/windows/mail/icons/appmenu-icons.png b/mail/themes/windows/mail/icons/appmenu-icons.png deleted file mode 100644 index 13ff83e95f87f2d70b6033f15666a0d68457e233..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1993 zcmV;)2R8VLP);OOWzLY`5TIL0-d4s8*e_GCV}Z0m`hpO^1g;q0Kr| zOl-H(WsQcVXp3bjYN661pdm%N6`^ILgFFR+Q69rnzkAM4emKDJO4+10`DA{-d(XLZ z`QCHSxr2#`k!GC;pyF)?+qk(fTea^<(ruY94x#n${cQtr24o-w88XH97RbO-&6hUApwBxurR7so(#Xr1;vMyJSO*GI4+1V*T3M+GKkDF#7uX z1bTaW(bLm|?(S}Mb$6koqXTtywX*-KcqGwRh0m+${8o<7_+E zJb8I}c<|r>y1Kg1b?=@aSbKXrT3cIjx1|NQZ{G&n81wzo%`Jl%C9nW&lQFM=)_;y? z(N?dM#i{98N6*iRW5&ef$z;<= zNl6vPK8djwM4V4RolYl2-u<5Y6m{K#kewZ!Xl-i~He@aVuX%b-H2VAF#|2;;vK^f_ z3Mucw^{?;2F)@vW4C21^(Qm8WRBA{+{1nayk4-yPrKP198ym&w$nX@8A3s6|?S8XX ziyJp?EGQro=WmX{S0zT_F-4%I@M&z0f`S5X7N?H{;909kcH{XQV$Isk&jNcoGc?G0nt94c$1w~+?@GeixeR?@6?#Z4!#)`?YslrlRT#S)nJ%$Db1V)C3v6RB{R6Hwz zBqG@D_p>&jwDc?dJxxAq@in#IZ)yDRotC!FE|8FdZAnQ93JT64=aU>9KYkplci)9V zaez`x4W*T`mNRGacN)%d%f|=IPusTPF|E}YKhl_JH*XH4$bh_^%5At~4j2|-qnZg}y@Cb0MuPv8yU zoH}y@-chA}r0uwmy80$$XP=;xjDM(02K%`ubu&^-rP{h3E{u(SSEs>UX1gG==iOj6`DI^ zilC>>7}n2*$JlqnhK*rg6cwYgsv7V8O^sbUcR(Kb7G%42;EnJwgm2x7Q2N9D{e1Ap zS2rRlNh#Q}kE4TAxVVPzNo;1ED!52}aIk=3pJ+EtfIUj3-BFE3mztG@?{3~iq(YJM zb1&p#VHwsxh2KSZ+)%*yDe=q^=VuOIr&Tz2?wpVs#NuQKkFl@4y?rDL($LVbB-qEn z!9gyrp^hSzxqa{;#_0-lGcXWhA3t*+kBNQL#M7KQrOV3B#=kCHKu&(Xb~%30h=rw+ zipmsMuL^KKj~fce!tM2E@yxKt*9==6e+SO310>*}5qM0vv)bCqFVMO<;^X(mBIQ&$ zf;Fwk|DhAvWnaT5K?bXUAUMj^P|+Rs!2W%LZDC;{$Tvz{!wnCQ2?C4c=|ws!Awjn{ zIXQR#p+kjNYip5|n(DC}0!|ec1B?kE3do|x`bZE>cRs%NdD*`JA-8f~?Vk;gvG0l% zD_o>f=|70iLxO|Kn!5)vA0Z*ZWr1W%RXLY^#WmEryJrxi1QuZIJF=bnLuGMstNHW& zlPBwv)6&!?%hYBTmYG6`0?hm^EE4+4ACQrefqu$6)8?3j$0ptRXXYy6CBntpdR?-k z-TL(PHa6*YFWaR%Iy$F2IXS00J2|9V+t?(t&7|$BN#EsZbd+_(vQ0R%uo&a#&hbn5 b&(;3``v+AJS&^_G00000NkvXXu0mjf2ou>D diff --git a/mail/themes/windows/mail/primaryToolbar.css b/mail/themes/windows/mail/primaryToolbar.css index 72d5fdb0f7..04c95ae56d 100644 --- a/mail/themes/windows/mail/primaryToolbar.css +++ b/mail/themes/windows/mail/primaryToolbar.css @@ -321,38 +321,44 @@ toolbar[mode="text"] .button-appmenu .toolbarbutton-icon { -moz-box-pack: end; } -#appmenu_print, +#appmenu_openHelp, #appmenu_print_popup, .appmenu-edit-button, #appmenu-editmenu-cut, #appmenu-editmenu-copy, #appmenu-editmenu-paste, +#appmenu_addons, #appmenu-quit { - list-style-image: url("icons/appmenu-icons.png"); + -moz-context-properties: fill, fill-opacity; + fill: currentColor; + fill-opacity: var(--toolbarbutton-icon-fill-opacity); } #appmenu-cut, #appmenu-editmenu-cut { - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://messenger/skin/icons/cut.svg"); } #appmenu-copy, #appmenu-editmenu-copy { - -moz-image-region: rect(0 32px 16px 16px); + list-style-image: url("chrome://messenger/skin/icons/copy.svg"); } #appmenu-paste, #appmenu-editmenu-paste { - -moz-image-region: rect(0 48px 16px 32px); + list-style-image: url("chrome://messenger/skin/icons/paste.svg"); } -#appmenu_print, #appmenu_print_popup { - -moz-image-region: rect(0 64px 16px 48px); + list-style-image: url("chrome://messenger/skin/icons/print.svg"); } #appmenu-quit { - -moz-image-region: rect(0 80px 16px 64px); + list-style-image: url("chrome://messenger/skin/icons/quit.svg"); +} + +#appmenu_openHelp { + list-style-image: url(chrome://global/skin/icons/help.svg); } #appmenu-edit-label { @@ -363,8 +369,6 @@ toolbar[mode="text"] .button-appmenu .toolbarbutton-icon { #appmenu_addons { list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg"); - -moz-context-properties: fill; - fill: currentColor; } .mail-toolbox > toolbar {