From 36ae3456ba9437482a72bd37b8837e31aacd6acc Mon Sep 17 00:00:00 2001 From: "stefanh@inbox.com" Date: Fri, 4 Jul 2014 20:01:29 +0200 Subject: [PATCH] Bug 1012445 - Implement NS_THEME_CHECKMENUITEM for Mac OS X, css part. r=dao. --- toolkit/themes/osx/global/jar.mn | 2 -- toolkit/themes/osx/global/menu.css | 32 ++---------------- toolkit/themes/osx/global/menu/menu-check.png | Bin 263 -> 0 bytes .../themes/osx/global/menu/menu-check@2x.png | Bin 532 -> 0 bytes 4 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 toolkit/themes/osx/global/menu/menu-check.png delete 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 d4dd2d5d520e..ebf934cae194 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -181,8 +181,6 @@ 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-arrow@2x.png (menu/menu-arrow@2x.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/menu/shared-menu-check.png (../../shared/menu-check.png) skin/classic/global/menu/shared-menu-check@2x.png (../../shared/menu-check@2x.png) skin/classic/global/scale/scale-tray-horiz.gif (scale/scale-tray-horiz.gif) diff --git a/toolkit/themes/osx/global/menu.css b/toolkit/themes/osx/global/menu.css index 0cdd28d4f9d2..8629beba78c0 100644 --- a/toolkit/themes/osx/global/menu.css +++ b/toolkit/themes/osx/global/menu.css @@ -185,35 +185,9 @@ menulist[editable="true"] > menupopup > menuitem > .menu-iconic-left { /* ::::: checked menuitems ::::: */ -: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, 11, 11, 0) bottom left no-repeat transparent; -} - -:not(menulist) > menupopup > menuitem[checked="true"] > .menu-iconic-left:-moz-locale-dir(rtl), -:not(menulist) > menupopup > menuitem[selected="true"] > .menu-iconic-left:-moz-locale-dir(rtl) { - background-position: bottom right; -} - -: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, 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); - } +:not(menulist) > menupopup > menuitem[checked="true"], +:not(menulist) > menupopup > menuitem[selected="true"] { + -moz-appearance: checkmenuitem; } 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 deleted file mode 100644 index 79cd1442060e8be9facf9d0ca03030e698e215fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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<>1%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=;