update global in both themes to withstand a manual diff check

[themes.git] / EarlyBlue / global / menu.css

diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index 6a72e596905d733af3cff286ae4bcbc334612c9c..70740c1717a534deb58a1f4b5d8bea84a9890ee7 100644 (file)
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -69,8 +69,10 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 }
 
 menubar > menu {
-  padding: 2px 0px 2px 3px;
-  margin: 0px 2px 0px 0px;
+  padding: 2px 0px;
+  -moz-padding-start: 3px;
+  margin: 0px 2px;
+  -moz-margin-start: 0px;
   border: 1px solid #CCD0DD;
 }
 
@@ -86,6 +88,14 @@ menubar > menu[open] {
   border: 1px inset #CCD0DD;
 }
 
+menubar > menu:-moz-lwtheme {
+  -moz-appearance: none;
+}
+
+menubar > menu:-moz-window-inactive {
+  color: #808080;
+}
+
 menuitem.spell-suggestion {
   font-weight: bold;
 }
@@ -105,10 +115,7 @@ popup > menuitem {
 menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 22px;
+  padding: 1px 5px;
   max-width: none;
 }
 
@@ -174,15 +181,15 @@ menulist > menupopup > menu {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif");
 }
 
-.menu-right[chromedir="rtl"] {
+.menu-right:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-rtl.gif");
 }
 
-.menu-right[chromedir="rtl"][_moz-menuactive="true"] {
+.menu-right:-moz-locale-dir(rtl)[_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-hover-rtl.gif");
 }
 
-.menu-right[chromedir="rtl"][disabled="true"] {
+.menu-right:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled-rtl.gif");
 }
 
@@ -234,14 +241,6 @@ menuitem[checked="true"][type="radio"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.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;
-}
-
 /* ::::: menuseparator ::::: */
 
 menuseparator {
@@ -264,6 +263,6 @@ menulist > menupopup > menuseparator,
 /* ::::: tree column picker ::::: */
 
 .treecell-popupcell-menu {
-  margin-left: -2px;
+  -moz-margin-start: -2px;
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
\ No newline at end of file