X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Fmenu.css;h=13ef457a855d675c5d7fad3f35b47e6710282415;hp=778f406270871048505a47022e8edfdbc37b0472;hb=ddc494fc510684ce84c8818a5859c8a9717c5f5d;hpb=e20d243c9ffcc255a5eb40a0bae66bf492e561a7

diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index 778f4062..13ef457a 100644
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -54,22 +54,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: #8050B0;
 }
 
 /* ..... 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;
 }
@@ -79,18 +77,22 @@ menuitem[disabled="true"]:-moz-menuactive {
   font-weight: inherit;
 }
 
-.menu-accel {
-  margin-left: 4px;
-  padding-right: 14px;
+.menu-description {
+  font-style: italic;
+  color: #8050B0;
+  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 {
@@ -108,7 +110,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");
 }
 
@@ -124,13 +126,13 @@ menubar > menu {
   border: none;
 }
 
-menubar > menu:-moz-menuactive {
+menubar > menu[_moz-menuactive="true"] {
   background-color: #FFCF00;
   color: #000000;
   border: none;
 }
 
-menubar > menu[open="true"]:-moz-menuactive {
+menubar > menu[_moz-menuactive="true"][open="true"] {
   background-color: #FF9F00;
   color: #000000;
   border: none;
@@ -158,10 +160,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: #FFCF00;
   color: #000000;
 }
@@ -173,18 +175,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;
 }
 
-.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 #FF9F00;
 }
 
@@ -194,12 +189,12 @@ menuitem[checked="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check.gif");
 }
 
-menuitem[checked="true"][disabled="true"] {
-  list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
+menuitem[checked="true"][_moz-menuactive="true"] {
+   list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
 }
 
-menuitem[checked="true"]:-moz-menuactive {
-   list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
+menuitem[checked="true"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 
 /* ::::: radio menuitem ::::: */
@@ -208,24 +203,24 @@ menuitem[checked="true"][type="radio"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio.gif");
 }
 
-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="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
 }
 
-menuitem[checked="true"][type="radio"]:-moz-menuactive {
-  list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
+menuitem[checked="true"][type="radio"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
 }
 
 /* ::::: menuseparator ::::: */
 
 menuseparator {
-  border: 1px solid #9C9CFF; 
+  border: 1px solid #9C9CFF;
   margin: 2px 0px 2px 0px;
 }
 
 menulist > menupopup > menuseparator,
 .menulist-menupopup > menuseparator {
-  border: 1px solid #9C9CFF; 
+  border: 1px solid #9C9CFF;
   margin: 2px 0px 2px 0px;
 }