From 80b5d6e6b5727ca7964ec0bb2b9d7314e29a86b4 Mon Sep 17 00:00:00 2001 From: Richard Marti Date: Tue, 5 Mar 2013 00:11:25 -0800 Subject: [PATCH] Bug 845516 - Use 2x images for menu checkmarks. r=fryn --- toolkit/themes/osx/global/jar.mn | 1 + toolkit/themes/osx/global/menu.css | 18 ++++++++++++++++-- toolkit/themes/osx/global/menu/menu-check.png | Bin 298 -> 263 bytes .../themes/osx/global/menu/menu-check@2x.png | Bin 0 -> 532 bytes 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 toolkit/themes/osx/global/menu/menu-check@2x.png diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 8cd2ddd4fc6..42f4ba3e32c 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -177,6 +177,7 @@ toolkit.jar: skin/classic/global/media/videoClickToPlayButton.svg (media/videoClickToPlayButton.svg) skin/classic/global/menu/menu-arrow.png (menu/menu-arrow.png) skin/classic/global/menu/menu-check.png (menu/menu-check.png) + skin/classic/global/menu/menu-check@2x.png (menu/menu-check@2x.png) skin/classic/global/scale/scale-tray-horiz.gif (scale/scale-tray-horiz.gif) skin/classic/global/scale/scale-tray-vert.gif (scale/scale-tray-vert.gif) skin/classic/global/splitter/dimple.png (splitter/dimple.png) diff --git a/toolkit/themes/osx/global/menu.css b/toolkit/themes/osx/global/menu.css index c221e8dc5e0..c198e2fcade 100644 --- a/toolkit/themes/osx/global/menu.css +++ b/toolkit/themes/osx/global/menu.css @@ -166,9 +166,10 @@ menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left { :not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left, :not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left { + padding-top: 1px; -moz-margin-start: -15px; -moz-padding-start: 15px; - background: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 10, 11, 0) bottom left no-repeat transparent; + background: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 11, 11, 0) bottom left no-repeat transparent; } :not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left:-moz-locale-dir(rtl), @@ -178,7 +179,20 @@ menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left { :not(menulist) > menupopup > menuitem[checked="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left, :not(menulist) > menupopup > menuitem[selected="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left { - background-image: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 20, 11, 10); + background-image: -moz-image-rect("chrome://global/skin/menu/menu-check.png", 0, 22, 11, 11); +} + +@media (min-resolution: 2dppx) { + :not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left, + :not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left { + background-size: 11px 11px; + background-image: -moz-image-rect("chrome://global/skin/menu/menu-check@2x.png", 0, 22, 22, 0); + } + + :not(menulist) > menupopup > menuitem[checked="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left, + :not(menulist) > menupopup > menuitem[selected="true"][_moz-menuactive="true"]:not([disabled="true"]) > .menu-iconic-left { + background-image: -moz-image-rect("chrome://global/skin/menu/menu-check@2x.png", 0, 44, 22, 22); + } } menulist:not([editable="true"]) > menupopup > menuitem[checked="true"]::before, diff --git a/toolkit/themes/osx/global/menu/menu-check.png b/toolkit/themes/osx/global/menu/menu-check.png index 3679724b5b8ceba19ca8405e71088c7893d57dda..79cd1442060e8be9facf9d0ca03030e698e215fc 100644 GIT binary patch literal 263 zcmV+i0r>ujP)vPaBjJcFqQ=Cdx`;ZK$eCu;xKz(Jqlz96UJRqgo)2FRBZ8E9ywTu*WKl46 z9&a{0s9BWQBdaJdL$0)<;9gxt!I^rs6(y!f&V(*^az^pyRLz~(^=|Gcevu(hPRJ%c z%+#kRbrXL`*dcNwjSmxdmTsm|MTZMHCegFnpf<>zkh+^KoY`6Bme#T2NVI4cQ^XZ0vak^666=mz{jVn>+2gEo0C&p z+uJ*L?wU1w_ntlb{{6py73MFGf$a8laSY**Wj)xQc-TOI#bAP#-{zAdQ-A+u=VeI9 zVJK#=c*3;jDsRLj^$lTr8_J$$EVy4ae~Vsgu^}wKGHIB~E(O8Lm#d zD!)bh1%L&!qe_yZ^#79?4@_aDGgDT;~M*dQXxR}u>;i%Bf)Sc+m+vXCOtEZEp9 z`6!Gro>T9s({Vqhd*1ujujahx^xWspdGC9U?KqCb5LMs=41lamW-=Le-Gs#xtDs$Y z1PvBn{L|$y+yO@EcP)w6#HDL$xB~0|TghF6=eTrD4KIN@W&8$)8U9^gT@%Biw#KyF z1b8wu8>k!Aa5>loB}(oLqz%o6>P9s@uXTeDFa!#QhC_8#!}Xx72+EctpA}c%UQ(-tFC_1y@GD=;