From ef2818c64649b9cd5ad4b95893a5c9d614491f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Thu, 9 Jul 2009 13:06:56 -0700 Subject: [PATCH] Bug 500494 - Faststripe theme doesn't show arrows & checkboxes in menus, r=vlad --HG-- extra : rebase_source : b5ed4eb4b32ac71ef201d3c67aad046703e13f32 --- toolkit/themes/faststripe/global/menu.css | 37 ++++++++++++----------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/toolkit/themes/faststripe/global/menu.css b/toolkit/themes/faststripe/global/menu.css index 1996d37ca30..146dabbd888 100644 --- a/toolkit/themes/faststripe/global/menu.css +++ b/toolkit/themes/faststripe/global/menu.css @@ -122,13 +122,18 @@ menuitem.menuitem-iconic > .menu-iconic-left { /* ..... menu arrow box ..... */ .menu-right { - -moz-appearance: menuarrow; -moz-margin-end: -2px; - list-style-image: none; + list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); + -moz-box-pack: center; min-width: 1.28em; padding-top: 1px; } +.menu-right[_moz-menuactive="true"] { + /* XXXzpao We need a new image, essentially arrow-rit-sharp but white */ + list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif"); +} + /* ::::: menu/menuitems in menubar ::::: */ menubar > menu { @@ -225,30 +230,28 @@ menulist > menupopup > menuitem > .menu-iconic-text { /* ::::: checkbox and radio menuitems ::::: */ -menuitem[type="checkbox"], -menuitem[checked="true"] { - -moz-appearance: checkmenuitem; -} -menuitem[type="checkbox"] > .menu-iconic-left, menuitem[checked="true"] > .menu-iconic-left { - -moz-appearance: menucheckbox; - padding-top: 0px; + list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); +} +menuitem[checked="true"] > .menu-iconic-left[_moz-menuactive="true"] { + /* XXXzpao We need another image for here too */ + list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif"); } -menuitem[type="radio"] { - -moz-appearance: radiomenuitem; +menuitem[type="radio"][checked="true"] > .menu-iconic-left { + list-style-image: url("chrome://global/skin/radio/radio-check.gif"); } -menuitem[type="radio"] > .menu-iconic-left { - -moz-appearance: menuradio; - padding-top: 0px; +menuitem[type="radio"][checked="true"] > .menu-iconic-left[_moz-menuactive="true"] { + /* XXXzpao We need another image for here too */ + list-style-image: url("chrome://global/skin/radio/radio-check-dis.gif"); } menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon, menuitem[checked="true"] > .menu-iconic-left > .menu-iconic-icon, menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon { - /* prevent .menu-iconic-icon from enforcing a minimal height of 16px (see bug 411064) - XXXzeniko apply that .menu-iconic-icon rule only for children of .menu-iconic */ - display: none; + padding-top: 0px; + height: 7px; + width: 7px; } /* ::::: menuseparator ::::: */