Bug 1168528 - Tab close icons, new tab button, and tab arrows on Windows HiDPI are blurry. r=Gijs, a=lmandel
authorJared Wein <jwein@mozilla.com>
Wed, 27 May 2015 17:31:54 -0400
changeset 275251 1688652717d3b927394a64370e54386b8e48b693
parent 275250 0247cf3e7219e033feaf9ac1db0557fb158ce448
child 275252 1ff08390568260a5886953fc758711e7986cf3ac
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, lmandel
bugs1168528
milestone40.0
Bug 1168528 - Tab close icons, new tab button, and tab arrows on Windows HiDPI are blurry. r=Gijs, a=lmandel
browser/themes/windows/browser.css
browser/themes/windows/jar.mn
browser/themes/windows/tabbrowser/newtab-XPVista7@2x.png
browser/themes/windows/tabbrowser/newtab-inverted@2x.png
browser/themes/windows/tabbrowser/newtab@2x.png
browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7@2x.png
browser/themes/windows/tabbrowser/tab-arrow-left-inverted@2x.png
browser/themes/windows/tabbrowser/tab-arrow-left@2x.png
toolkit/themes/windows/global/global.css
toolkit/themes/windows/global/icons/close-lunaBlue.png
toolkit/themes/windows/global/icons/close-lunaOlive.png
toolkit/themes/windows/global/icons/close-lunaSilver.png
toolkit/themes/windows/global/icons/close-win8.png
toolkit/themes/windows/global/icons/close.png
toolkit/themes/windows/global/icons/close@2x.png
toolkit/themes/windows/global/jar.mn
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1918,16 +1918,33 @@ richlistitem[type~="action"][actiontype=
   margin: 0 0 var(--tab-toolbar-navbar-overlap);
 }
 
 #TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up,
 #TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down {
   list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png);
 }
 
+@media (min-resolution: 1.1dppx) {
+  .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png");
+  }
+
+  .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
+  .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon {
+    width: 15px;
+  }
+
+  #TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up,
+  #TabsToolbar[brighttext] > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-down {
+    list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted@2x.png);
+  }
+}
+
 .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled],
 .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] {
   opacity: .4;
 }
 
 .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
 .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) {
   transform: scaleX(-1);
@@ -1955,16 +1972,36 @@ richlistitem[type~="action"][actiontype=
 }
 
 #TabsToolbar[brighttext] .tabs-newtab-button,
 #TabsToolbar[brighttext] > #new-tab-button,
 #TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
   list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png);
 }
 
+.tabs-newtab-button > .toolbarbutton-icon,
+#TabsToolbar > #new-tab-button > .toolbarbutton-icon,
+#TabsToolbar > toolbarpaletteitem > #new-tab-button > .toolbarbutton-icon {
+  width: 16px;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .tabs-newtab-button,
+  #TabsToolbar > #new-tab-button,
+  #TabsToolbar > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab@2x.png);
+  }
+
+  #TabsToolbar[brighttext] .tabs-newtab-button,
+  #TabsToolbar[brighttext] > #new-tab-button,
+  #TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button {
+    list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted@2x.png);
+  }
+}
+
 #TabsToolbar > #new-tab-button {
   width: 26px;
 }
 
 #alltabs-button {
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
 }
 
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -263,26 +263,32 @@ browser.jar:
         skin/classic/browser/preferences/checkbox-classic.png        (preferences/checkbox-classic.png)
         skin/classic/browser/preferences/checkbox-xp.png             (preferences/checkbox-xp.png)
         skin/classic/browser/social/services-16.png                  (social/services-16.png)
         skin/classic/browser/social/services-64.png                  (social/services-64.png)
         skin/classic/browser/social/chat-icons.svg                   (../shared/social/chat-icons.svg)
         skin/classic/browser/social/gear_default.png                 (../shared/social/gear_default.png)
         skin/classic/browser/social/gear_clicked.png                 (../shared/social/gear_clicked.png)
         skin/classic/browser/tabbrowser/newtab.png                   (tabbrowser/newtab.png)
+        skin/classic/browser/tabbrowser/newtab@2x.png                (tabbrowser/newtab@2x.png)
         skin/classic/browser/tabbrowser/newtab-XPVista7.png          (tabbrowser/newtab-XPVista7.png)
+        skin/classic/browser/tabbrowser/newtab-XPVista7@2x.png       (tabbrowser/newtab-XPVista7@2x.png)
         skin/classic/browser/tabbrowser/newtab-inverted.png          (tabbrowser/newtab-inverted.png)
+        skin/classic/browser/tabbrowser/newtab-inverted@2x.png       (tabbrowser/newtab-inverted@2x.png)
         skin/classic/browser/tabbrowser/connecting.png               (tabbrowser/connecting.png)
         skin/classic/browser/tabbrowser/crashed.svg                  (../shared/tabbrowser/crashed.svg)
         skin/classic/browser/tabbrowser/loading.png                  (tabbrowser/loading.png)
         skin/classic/browser/tabbrowser/tab-active-middle.png        (tabbrowser/tab-active-middle.png)
         skin/classic/browser/tabbrowser/tab-active-middle@2x.png     (tabbrowser/tab-active-middle@2x.png)
         skin/classic/browser/tabbrowser/tab-arrow-left.png           (tabbrowser/tab-arrow-left.png)
+        skin/classic/browser/tabbrowser/tab-arrow-left@2x.png        (tabbrowser/tab-arrow-left@2x.png)
         skin/classic/browser/tabbrowser/tab-arrow-left-XPVista7.png  (tabbrowser/tab-arrow-left-XPVista7.png)
+        skin/classic/browser/tabbrowser/tab-arrow-left-XPVista7@2x.png  (tabbrowser/tab-arrow-left-XPVista7@2x.png)
         skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png  (tabbrowser/tab-arrow-left-inverted.png)
+        skin/classic/browser/tabbrowser/tab-arrow-left-inverted@2x.png  (tabbrowser/tab-arrow-left-inverted@2x.png)
         skin/classic/browser/tabbrowser/tab-background-start.png     (tabbrowser/tab-background-start.png)
         skin/classic/browser/tabbrowser/tab-background-start@2x.png  (tabbrowser/tab-background-start@2x.png)
         skin/classic/browser/tabbrowser/tab-background-middle.png    (tabbrowser/tab-background-middle.png)
         skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
         skin/classic/browser/tabbrowser/tab-background-end.png       (tabbrowser/tab-background-end.png)
         skin/classic/browser/tabbrowser/tab-background-end@2x.png    (tabbrowser/tab-background-end@2x.png)
         skin/classic/browser/tabbrowser/tab-overflow-indicator.png   (../shared/tabbrowser/tab-overflow-indicator.png)
         skin/classic/browser/tabbrowser/pendingpaint.png             (../shared/tabbrowser/pendingpaint.png)
@@ -582,17 +588,19 @@ browser.jar:
 % override chrome://browser/skin/sync-horizontalbar.png               chrome://browser/skin/sync-horizontalbar-XPVista7.png             os=WINNT osversion<=6.1
 % override chrome://browser/skin/sync-horizontalbar@2x.png            chrome://browser/skin/sync-horizontalbar-XPVista7@2x.png          os=WINNT osversion<=6.1
 % override chrome://browser/skin/syncProgress-horizontalbar.png       chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png     os=WINNT osversion<=6.1
 % override chrome://browser/skin/syncProgress-horizontalbar@2x.png    chrome://browser/skin/syncProgress-horizontalbar-XPVista7@2x.png  os=WINNT osversion<=6.1
 % override chrome://browser/skin/syncProgress-toolbar.png             chrome://browser/skin/syncProgress-toolbar-XPVista7.png           os=WINNT osversion<=6.1
 % override chrome://browser/skin/syncProgress-toolbar@2x.png          chrome://browser/skin/syncProgress-toolbar-XPVista7@2x.png        os=WINNT osversion<=6.1
 % override chrome://browser/skin/toolbarbutton-dropdown-arrow.png     chrome://browser/skin/toolbarbutton-dropdown-arrow-XPVista7.png   os=WINNT osversion<=6.1
 % override chrome://browser/skin/tabbrowser/newtab.png                chrome://browser/skin/tabbrowser/newtab-XPVista7.png              os=WINNT osversion<=6.1
+% override chrome://browser/skin/tabbrowser/newtab@2x.png             chrome://browser/skin/tabbrowser/newtab-XPVista7@2x.png           os=WINNT osversion<=6.1
 % override chrome://browser/skin/tabbrowser/tab-arrow-left.png        chrome://browser/skin/tabbrowser/tab-arrow-left-XPVista7.png      os=WINNT osversion<=6.1
+% override chrome://browser/skin/tabbrowser/tab-arrow-left@2x.png     chrome://browser/skin/tabbrowser/tab-arrow-left-XPVista7@2x.png   os=WINNT osversion<=6.1
 
 % override chrome://browser/skin/menuPanel.png                        chrome://browser/skin/menuPanel-aero.png                          os=WINNT osversion=6
 % override chrome://browser/skin/menuPanel.png                        chrome://browser/skin/menuPanel-aero.png                          os=WINNT osversion=6.1
 % override chrome://browser/skin/menuPanel@2x.png                     chrome://browser/skin/menuPanel-aero@2x.png                       os=WINNT osversion=6
 % override chrome://browser/skin/menuPanel@2x.png                     chrome://browser/skin/menuPanel-aero@2x.png                       os=WINNT osversion=6.1
 % override chrome://browser/skin/menuPanel-small.png                  chrome://browser/skin/menuPanel-small-aero.png                    os=WINNT osversion=6
 % override chrome://browser/skin/menuPanel-small.png                  chrome://browser/skin/menuPanel-small-aero.png                    os=WINNT osversion=6.1
 % override chrome://browser/skin/menuPanel-small@2x.png               chrome://browser/skin/menuPanel-small-aero@2x.png                 os=WINNT osversion=6
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4fcbd81b976c1243e1bd1427d5eb2d348635c3b1
GIT binary patch
literal 489
zc%17D@N?(olHy`uVBq!ia0vp^3P7yF!3-qto1VA;qz(l5gt!9f|JZ=AypEWno`R00
zmZ_telfO@RvXgIgTxO}0e{_6ynNvV)LQVxxnR8%lVs52-Xkv1HwWy-5xUzwUsiR+X
zMoM9=ih-@3m79%cXhdpZT5-L#XIMy5USwKPQbA36X``KQOk_rBY))lraYJT#Gtj8G
z+^X!#R*3Bp>7}{V9RUfsd9_`>F<AxmJ$`XHMUDLd@p&c969W_S%33G8g{P*Jwp`DR
zbO-vus3gcQn1P9%hnGP@3fUjxSbYZs9{>N_y5>$;_6ewanWu|mNCo57%hr6&20RUk
z`!^|{`m5g>VZp+)hVlB=)oRWQl26+wemps;RpG~_zYId%28pW{g|vRV#W646LB(kg
zgM-)>$0rPRjGyXWtmeDXbgn)5y!?aj(a||KY6K24ZK$ts-qcp{ZX?qKDM!W&Z1b3N
znROi|SG?(*zJ+O~E#t-qZ;KcYO*TK5ayHpVr~b=EFDZxfjq6Ttdc}I;=|44rzTf%Z
b%k3GXKij<w+$3`!=wb#>S3j3^P6<r_b=c#n
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..751e1ef98c4dbb6b1c6af0ca26740be960159db7
GIT binary patch
literal 164
zc%17D@N?(olHy`uVBq!ia0vp^3P7yF!3HE>yta4*q_RC-978H@y}e?{)nFjtaxvz>
zsdLt6WWQ(J(}{{;y;FKnN8|tD5;1+o%N-iGH|1HSn+LNV*fW*!mjDBUJ>!x8J9joz
zRFxd+WblspxSR2Z*n?Z|*7CdFPiL6LA)v3wz|dLr-bK}c&!M+tlI$;mqw1V*n4bcz
OW$<+Mb6Mw<&;$V3L_5>~
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..461e2d1244965a2f9e4c19ae3f97585403342a0b
GIT binary patch
literal 99
zc%17D@N?(olHy`uVBq!ia0vp^3P7yF0VEjCHl*7DDW;MjzhDN2vdL#HfIJyb7srqa
u#^eKRZjIamJt?eu5e%}T3I{S`dYBka`KUP>Pd<7Wq}$Wg&t;ucLK6VOix%+!
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5415ff01d81609d276c5b02bcf87a41274ec3beb
GIT binary patch
literal 939
zc$@*N162HpP)<h;3K|Lk000e1NJLTq0015U001Hg1^@s6NQh~4000AWNkl<ZSi|ks
zTS${(7zc1?+Q|Z;vvyF!%+SrbS#Fve;oNjHb7rEOIh{M{+}h@s)242oPbGpR*x^P9
zq6=>XBZ>l{i|8UEDU1lZDYJ{}qKR`oJ+FL*c;&^rAn=1fjBgL$kLUT`y?evLHm}WV
z0~Y{n!9=nN|Ci`)%zn&1Occ5Iuh5vpwCu5zGv|EdGiF!Fa26#%OtMfqd^kx6u}K0z
zyqm?NsE?gI@GqJn?MvW_K`2pzAg2K0Qbd6F`q|M((nd))G2F~tFF~{N)KFAm1XZ~K
z1QHdbiew{H;k76~OYVtJ75^3^T3l%XjmZV-Dl1f&oRj!{8at72s;E#>;95o1m+L@l
zZiGwvE1<Kwr-Q*@KGvMVL{LRfOO>|xRMGNUw5-+vm+Re6{ELePSi{3?#c-&hS+WbJ
zI7CIV;uW;g!a%vv30ey?!=ilZs3iYl4URV;l3}M+_1Iw(RG1miSeO^zfBaNojR3Qa
z7P^z5vZ8V=j(3T4T7qbm)s0<Vg>n<~YJTC{d92C6Y^Q;8*ayWZ)Y>xa)W3r2tWa%h
zA@38>#@WyF3q@FyNd;ZgZS?uFYBg>MzcO*W7j+Gww|hYEXak+?+T4eapGvSMn|&1=
zn!nfRVvV7MpQH2_<9PLsRxmL>&^y~eV`k=N-@R90&0)+An(*qV6Ng4`H<#8rmy9ki
zSgv-0!PyQ)S_`D-C|^!Je4L0i2dFHnbzPHfFK>8!qFqzx4w#q@AStb}gFvc+1fKZ$
z<EJyn**fa@L5zH0^ln$BwIyiAuE~2YtS|vDO98l7KYRV=?XghdhX~#^JU&=uYYkeO
zdY~3ZPH-;b$9dV0SbQIq4P+f2OK{)N*s#vt`rF#l3kKIJE{7BRvs0hHd_58>oIF_W
z=^MRS<7kHlPd^wMeNd<|16M4EME=<aEWS4s_)(0axqIYRt*ZlUo&hj6c3|gbNJTs;
zU2@OwUnJAnL**Z89Uf0`m+!`ef$0K!+YqkyPEaA9BFcl4Lg^hA-x-SY7Wo+|9Nz2q
z&F&s>cyFw9o?D`WbcynINZ>U%*+3Nbw!ulWyBCa2-MHYqQ-Q#82K7;|!z0LPgPc0*
zTY9JKn|mL!ClDTcxaWil=CG@myR;O@C!ux%*&t3jPi7Mta`eBv{s5rXI8yyIHd+7x
N002ovPDHLkV1n;kz<K}x
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5d5786cf34c58e579da7099840a0048c4c927412
GIT binary patch
literal 657
zc$@)|0&e|@P)<h;3K|Lk000e1NJLTq0015U001Hg1^@s6NQh~400075Nkl<Zc-rmO
zUr19?90zbgUn|ATG;>M1LK7bZK?s5%2z=_v#~un2L<(eq;h(Fcg`mugG3?)RT{g!}
z=gQP&TUYVlqBQ?3wbU7vMG#SMZo8YmAMAh}&qELAL=XPp3zyv=_rpCq_wY;FtG)W0
z+LxYv0U|*Rkn(?uQaLReJx{RV7cVDdhs(PIKPw77Ly-Qb1EcXoIbF(#C>+r;@^Gcs
z?Tb?dzxfmQ8+oFo1hvafZ=6xjo)3+Y9$si6dEmqD$Aht0Y!~Y2QNF-^TcWRmD{8Uc
z^{`O*uQ&G}JfcERH>8p)YVNeSHBH;44tYnur)B1jLXV7nTv1bNyTU^K>e!D2>g0vy
z6I3$Z>WN098jVg)1%75^=OOBXG;>Ak8YDRiMWb(LW`7;dEx;YD@IsRbT6_J5Jsgfi
zXmoxt_&ZCdN3<7FuBTG<)mj^%VH#at`S9nM{?s`1xFIdvkHea42HVzFIKqPS^u>dS
zQk#j}QkyScx-tuIt<iXBW8?GjlO-nlgyOZiIv~EwRW%EM$7p<YZ9SwbD7q;EKLNQ7
z@x!tQ@f&6=`zq{gqX@hZatCokUBeO!Us!y<A`-ViUez}lms#iZySe#bdX}zP6mCV_
z)Y|qj&ZxlaH*=!!Qb-r#ZRXB37Ct^XHFF>%M-qXTL+(LTYuEh{3-|fezz#f_Cw>m{
z0C5-yJ~7~F5ir3kAde8ose_<T`aE9&mFcDCjaNeKICZ!^1Dh~`e8X#c7!ZX^2&Eo6
rszMNTP^fU+!Ja_G<0+V=|Gl;W@Y;|^WaZg}00000NkvXXu0mjfM-MIT
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a05323d26965eaba7f032708450a4ba0d130cad9
GIT binary patch
literal 286
zc$@(q0pb3MP)<h;3K|Lk000e1NJLTq0015U001Hg1ONa4;(?+60002xNkl<ZcmeIw
zF)K%56vy%NxTV~bcf|5dDT6^a7V}+D21+RzEPob-iIGVe3^JL#9zycCNx#k_=a}x`
zeCJP{d(UG-oB!c}bxbMa_jaj$n}5Mu)bF;lc#W#|a=7C|bd+0r)zMQ*2CwigdO?H5
z@sgugq9MG%o9GSWSRBvsDtgBR7RT@``ap}t@ib4Ok4#}1Jd?-1Szg@QlR>QJ-4DB`
z4Pv$Eu6!Flm0EWE`X?TH*_YwxsXD4UrwL-U;rJOPh}DkcN0cB|`@)9_tVUn-STuzT
kC;H+zR%3mZ$7)#k6YJ$!9oo>ZLjV8(07*qoM6N<$f^?IGWdHyG
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,27 +331,28 @@ popupnotificationcontent {
 .close-icon:hover {
   -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 .close-icon:hover:active {
   -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
-%ifdef XP_WIN
-@media (-moz-windows-theme: luna-blue) {
-  .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaBlue.png");
-  }
+.close-icon > .button-icon,
+.close-icon > .button-box > .button-icon,
+.close-icon > .toolbarbutton-icon {
+  width: 16px;
 }
 
-@media (-moz-windows-theme: luna-olive) {
+@media (min-resolution: 1.1dppx) {
   .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaOlive.png");
+    list-style-image: url("chrome://global/skin/icons/close@2x.png");
+    -moz-image-region: rect(0, 32px, 32px, 0);
+  }
+
+  .close-icon:hover {
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
+  .close-icon:hover:active {
+    -moz-image-region: rect(0, 96px, 32px, 64px);
   }
 }
-
-@media (-moz-windows-theme: luna-silver) {
-  .close-icon {
-    list-style-image: url("chrome://global/skin/icons/close-lunaSilver.png");
-  }
-}
-%endif
deleted file mode 100644
index b657c47e44f9e2b6c75dfc7c7f59a181977e760f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b071b141b5db14b87eafcbd7d5f5cac19ae82a68..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 36cbda9ab129b3905b2d0f7ac9bca924107b54a9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 803e148b73b19b591bc8cb46289592f453fb1e50..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index ae989fd8b86625273be592b626efa84164b764ed..803e148b73b19b591bc8cb46289592f453fb1e50
GIT binary patch
literal 838
zc$@)71G)T(P)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn0009GNkl<Zc-rlk
z-%C?r7{?Q&n{^Q_FkFRH(wy_>w5H-FTiR3*6-_M*yy&Vwz&jbp{(-Ke-?X&NTytcC
zh~9M5@6>4!McKL&K@jJrPtW(z8864ZI}5uA^1z3^@AvsWgZI0$XJ-e9=)Yz^fWP%d
z5xd>T#2L~d4zITVW?`X^i8G`_9NvE}fR`>;GTPcoOFF>A-nh2^mc^0`*laXbRh1EV
z*t@GA<Q>b;7I^??&bOEuFJlli12oiR0YqC`2&@bb6RuBveWYqw<3bJlMMm5Iu&j)N
ze88E30s1*NN6#7>um@N}LrvMkD+vIv9wx>Zg~J-5p{5(a>2n^hfB}e_EP%!4W&*Uc
zlVZ8IS3%TNpSJ%&X{qw*#%5<zgq%(wYKjNm3<1Ohj6l?M1MmkU$4}Xsyy+MXO`2o@
zEO<NwmV0_=Cy_|Y64zAUt^i6(C{S5RA%}y0%*><(HF)5a1<-%>ni~gAN8jasmtFuM
zXJq`jsi4x$hrTcbu!e@3EP(l@CQ^xZchmOfrih}69&P`9tCgNqR49zs*VD@Mv<S3R
z9o`HxAQuOf96nb!0ARm(>CnkCr?;TIVF+Li4K*1b8XHMvv8#)=H#S5RP4J`*V6?nk
z;b~nReV>{Vfu`0o1^}YbXr49zXju)x6V^Hd<CS2L1@PYOCa}=iNy+u~v@CRVkm}R+
z-zzSr5gu-1e9&)`lW7^NtyMhmW|#p-nV1BlZUCktyH~{@44Z(c$pU!iauG<Zt)-Z6
zZ&wgC)u-*hYq8K{9&TSFkrct28X#(l2VPkK+S?xd(Gcvoa=kkLY_-=P2r1urfHgGK
zWC6V8pDOTqaF7zKtMsw04SRq!G}Ka>w*O915&3zzz2HIlB^;)J-HtuL8X9WK9$r}h
z;faYG;&)!038-Z=0}e7rGy^XO8fvlt-Z-5}hO#8SD*&@O`G{|Aztx%%c-WiiLFh1J
z69*pF&`^^Euy<ZN96lz_kPcg~*sJZoZ8rOuI72#Y!Mn#N!Tmo&`vLss7XoW=13x}{
Qod5s;07*qoM6N<$g7klW7XSbN
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..da1ad2f32695202aacf02fd13d9a1d98575214d4
GIT binary patch
literal 1764
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
GLSTZ{$4UDD
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -97,19 +97,17 @@ toolkit.jar:
         skin/classic/global/dirListing/up.png                    (dirListing/up.png)
         skin/classic/global/Filepicker.png                       (filepicker/Filepicker.png)
         skin/classic/global/icons/autoscroll.png                 (icons/autoscroll.png)
         skin/classic/global/icons/autocomplete-search.svg        (icons/autocomplete-search.svg)
         skin/classic/global/icons/blacklist_favicon.png          (icons/blacklist_favicon.png)
         skin/classic/global/icons/blacklist_large.png            (icons/blacklist_large.png)
         skin/classic/global/icons/Close.gif                      (icons/Close.gif)
         skin/classic/global/icons/close.png                      (icons/close.png)
-        skin/classic/global/icons/close-lunaBlue.png             (icons/close-lunaBlue.png)
-        skin/classic/global/icons/close-lunaOlive.png            (icons/close-lunaOlive.png)
-        skin/classic/global/icons/close-lunaSilver.png           (icons/close-lunaSilver.png)
+        skin/classic/global/icons/close@2x.png                   (icons/close@2x.png)
         skin/classic/global/icons/collapse.png                   (icons/collapse.png)
         skin/classic/global/icons/Error.png                      (icons/Error.png)
         skin/classic/global/icons/error-16.png                   (icons/error-16.png)
         skin/classic/global/icons/error-64.png                   (icons/error-64.png)
         skin/classic/global/icons/expand.png                     (icons/expand.png)
         skin/classic/global/icons/find-arrows.png                (icons/find-arrows.png)
         skin/classic/global/icons/folder-item.png                (icons/folder-item.png)
         skin/classic/global/icons/information-16.png             (icons/information-16.png)