some small adjustments to make it work better

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

diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index 68d83410b6b6580f615866124072e671ec13e791..3f1fede5c2b87e18f645cdc817b2b43956e54b9a 100644 (file)
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -43,7 +43,7 @@
 
 /* ::::: menu/menuitem ::::: */
 
-menu, 
+menu,
 menuitem {
   -moz-box-align: center;
   color: #000000;
@@ -52,22 +52,20 @@ menuitem {
 
 menuitem[default="true"] {
   font-weight: bold;
-}  
+}
 
 menu[disabled="true"],
 menuitem[disabled="true"],
-menu[disabled="true"]:-moz-menuactive,
-menuitem[disabled="true"]:-moz-menuactive {
+menu[_moz-menuactive="true"][disabled="true"],
+menuitem[_moz-menuactive="true"][disabled="true"] {
   color: #999999;
 }
 
 /* ..... internal content .... */
 
-.menu-text, 
-.menu-accel,
+.menu-text,
 .menu-iconic-left,
-.menu-iconic-text,
-.menu-iconic-accel {
+.menu-iconic-text {
   margin: 0px 2px 0px 0px !important;
   color: inherit;
 }
@@ -77,18 +75,22 @@ menuitem[disabled="true"]:-moz-menuactive {
   font-weight: inherit;
 }
 
-.menu-accel {
-  margin-left: 4px;
-  padding-right: 14px;
+.menu-description {
+  font-style: italic;
+  color: #808080;
+  margin-left: 1ex !important;
 }
 
+.menu-accel,
 .menu-iconic-accel {
-  margin-left: 4px;
+  margin: 0px 2px 0px 7px !important;
   padding-right: 14px;
+  color: inherit;
 }
 
-.menu-iconic-icon {
-  list-style-image: inherit;
+menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon,
+menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
+/*  width: 16px; */
 }
 
 .menu-iconic-left {
@@ -106,7 +108,7 @@ menuitem[disabled="true"]:-moz-menuactive {
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
 }
 
-menu:-moz-menuactive > .menu-right {
+.menu-right[_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif");
 }
 
@@ -122,11 +124,11 @@ menubar > menu {
   border: 1px solid #CCD0DD;
 }
 
-menubar > menu:-moz-menuactive {
+menubar > menu[_moz-menuactive="true"] {
   border: 1px outset #CCD0DD;
 }
 
-menubar > menu[open="true"]:-moz-menuactive {
+menubar > menu[_moz-menuactive="true"][open="true"] {
   border: 1px inset #CCD0DD;
 }
 
@@ -152,10 +154,10 @@ popup > menuitem {
   max-width: 42em;
 }
 
-menupopup > menu:-moz-menuactive,
-menupopup > menuitem:-moz-menuactive,
-popup > menu:-moz-menuactive,
-popup > menuitem:-moz-menuactive {
+menupopup > menu[_moz-menuactive="true"],
+menupopup > menuitem[_moz-menuactive="true"],
+popup > menu[_moz-menuactive="true"],
+popup > menuitem[_moz-menuactive="true"] {
   background-color: #336699;
   color: #FFFFFF;
 }
@@ -167,20 +169,11 @@ menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
   border: 1px solid transparent;
-  padding: 1px 16px 1px 5px;
+  padding: 1px 22px 1px 1px;
   max-width: none;
-/*  font-size: smaller;
-  color: -moz-FieldText */
 }
 
-.menulist-menupopup > menuitem > .menu-iconic-left,
-menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
-menulist > menupopup > menu > .menu-iconic-left {
-  display: none;
-}
-
-menulist > menupopup > menuitem:-moz-menuactive {
+menulist > menupopup > menuitem[_moz-menuactive="true"] {
   border: 1px dotted #666699;
 }
 
@@ -194,7 +187,7 @@ menuitem[checked="true"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 
-menuitem[checked="true"]:-moz-menuactive {
+menuitem[checked="true"][_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
 }
 
@@ -208,20 +201,20 @@ menuitem[checked="true"][type="radio"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
 }
 
-menuitem[checked="true"][type="radio"]:-moz-menuactive {
+menuitem[checked="true"][type="radio"][_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
 }
 
 /* ::::: menuseparator ::::: */
 
 menuseparator {
-  border: 1px inset #CCD0DD; 
+  border: 1px inset #CCD0DD;
   margin: 2px 0px 2px 0px;
 }
 
 menulist > menupopup > menuseparator,
 .menulist-menupopup > menuseparator {
-  border: 1px inset #CCD0DD; 
+  border: 1px inset #CCD0DD;
   margin: 2px 0px 2px 0px;
 }
 
@@ -234,4 +227,4 @@ menulist > menupopup > menuseparator,
 .treecell-popupcell-menu {
   margin-left: -2px;
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
-}
+}
\ No newline at end of file