X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Fskin%2Fmenu.css;h=7a4fca8786ca60ccb3c28caa523a370e6c5be8e7;hp=60eb918ccda892538a6539bd9f3b34aefa35b6f2;hb=dac2c253e58db6e80621ec291aada3a2ee0ef4c8;hpb=c9990331a4456dc80a097ba6a23e9d2578637327

diff --git a/LCARStrek/global/skin/menu.css b/LCARStrek/global/skin/menu.css
index 60eb918c..7a4fca87 100755
--- a/LCARStrek/global/skin/menu.css
+++ b/LCARStrek/global/skin/menu.css
@@ -1,32 +1,3 @@
- 
-menubar 
-  {
-    border-bottom         : 3px solid #000000;
-  }
-
-menubar > .toolbar-holder
-  {
-    /* max-height is only important as long as we need to workaround bug 24998... */
-    max-height            : 17px;
-    padding-right         : 18px;
-    background-color      : #6000CF;
-    background-image      : url("chrome://global/skin/menubar-endcap.gif");
-    background-repeat     : no-repeat;
-    background-position   : right;
-
-/* THE FOLLOWING LINES ARE NOT WORKING THOUGH THEY SHOULD!  BUG 24998  */
-/*    -moz-border-radius    : 0px 10px 10px 0px;
-    background-image      : url("chrome://global/skin/toolbar-bg.gif");
-    background-repeat     : repeat-y;
-    background-position   : right;
-*/
-  }
-
-menubar > toolbargrippy 
-  {
-/*    display               : none; */
-  }
-
 menu, menuitem  
   {
     background-color      : #000000;
@@ -46,23 +17,14 @@ menuitem[menuactive="true"][disabled="true"]
 	  color                 : #8050B0;
   }
 
-/* XXX menupopups have to have a color explicitly specified. this is a bug */
-menupopup, popup 
+menupopup > menu,
+menupopup > menuitem,
+popup > menu,
+popup > menuitem
   {
-    background-color      : #000000;
-    color                 : #FF9F00;
-    border                : 1px solid #FF9F00;
-  }
-
-menupopup > menu, popup > menu,
-menupopup > menuitem, popup > menuitem
-  {
-    max-width             : 250px;
-    min-width             : 125px;
-    margin-left           : 0px;
-    margin-right          : 0px;
-    margin-top            : 0px;
-    margin-bottom         : 0px;
+    -moz-border-radius    : 0px;
+    max-width             : 42em; /* should move to content */
+    margin                : 0px;
   }
 
 menuseparator 
@@ -79,13 +41,6 @@ menubar > menu
     margin                : 0px 2px 0px 2px;
   }
 
-menupopup > menu, menupopup > menuitem,
-popup > menu, popup > menuitem
-  {
-    -moz-border-radius    : 0px;
-    padding               : 2px;
-  }
-
 menubar > menu[menuactive="true"] 
   {
     background-color      : #FFCF00;
@@ -109,6 +64,7 @@ popup > menuitem[menuactive="true"]
     color                 : #000000;
   }
 
+
 /** 
  * Atomic sub-parts of standard menus
  **/
@@ -139,8 +95,8 @@ popup > menuitem[menuactive="true"]
 .menu-iconic-left 
   {
     color                 : inherit;
-    margin                : 0px 2px 0px 0px;
-    width                 : 13px;
+    margin                : 0px 4px 0px 3px;
+    width                 : 16px;
     text-align            : center;
     list-style-image      : inherit;
   }
@@ -151,27 +107,29 @@ popup > menuitem[menuactive="true"]
     margin                : 0px 2px 0px 0px;
   }
 
-.menu-iconic-text, .menu-iconic-accel, .menu-text, .menu-accel 
+.menu-iconic-text, .menu-iconic-accel, .menu-text, .menu-accel
   {
     color                 : inherit;
-    margin                : 0px 2px 0px 0px;
+  }
+
+.menu-iconic-text
+  {
+    margin                : 2px 2px 2px 0px;
   }
 
 .menu-text 
   {
-    padding-left          : 15px;
-    font-weight           : inherit;
+    margin                : 2px 2px 2px 23px;
   }
 
 .menu-accel 
   {
-    margin-left           : 4px;
-    padding-right         : 14px;
+    margin                : 2px 14px 2px 6px;
   }
 
 .menu-iconic-accel 
   {
-    margin-left           : 4px;
+    margin                : 2px 14px 2px 4px;
   }
 
 .menubar-text 
@@ -185,53 +143,73 @@ menuitem[checked="true"]
     list-style-image      : url("chrome://global/skin/menu-check.gif");
   }
 
+menuitem[checked="true"][menuactive="true"]
+  {
+    list-style-image      : url("chrome://global/skin/menu-check-hover.gif");
+  }
+
 menuitem[checked="true"][disabled="true"] 
   {
     list-style-image      : url("chrome://global/skin/menu-check-disabled.gif");
   }
 
-menuitem[checked="true"][menuactive="true"] 
+menuitem[checked="true"][type="radio"] 
   {
-    list-style-image      : url("chrome://global/skin/menu-check-hover.gif");
+    list-style-image      : url("chrome://global/skin/menu-radio.gif");
   }
 
-/** Tooltips (tooltip <popup> element)
- *  class="tooltip"
- **/
-.tooltip
+menuitem[checked="true"][type="radio"][disabled="true"] 
   {
-    -moz-border-radius    : 3px;
-    background-color      : #9C9CFF;
-    border                : 1px solid #FFCF00;
-    color                 : #000000;
-    font                  : smaller;
-    padding               : 3px;
+    list-style-image      : url("chrome://global/skin/menu-radio-disabled.gif");
   }
 
-/* .tooltip html */
-html#TOOLTIP-tooltipText
+menuitem[checked="true"][type="radio"][menuactive="true"] 
   {
-    padding               : 0px;
-    margin                : 0px;
+    list-style-image      : url("chrome://global/skin/menu-radio-hover.gif");
+  }
+
+/* ::::: autocomplete menuitems ::::: */
+
+.autocomplete-history-popup > menuitem
+  {
+    max-width              : none !important;
+    font-size              : smaller;
   }
 
-/*
- * Autorepeatbutton
- */
-.autorepeatbutton-up {
-    list-style-image: url("chrome://global/skin/scroll-up.gif")
-}
+/* ::::: menu/menuitems in a menulist popup ::::: */
+
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu
+    {
+      padding             : 0px 4px !important; 
+      min-width           : 0px;  /* should be in content*/
+      max-width           : none; /* should be in content*/
+    }
+
+  menulist > menupopup > menuitem > .menu-iconic-accel,
+  menulist > menupopup > menuitem > .menu-accel,
+  menulist > menupopup > menuitem > .menu-text,
+  menulist > menupopup > menuitem > .menu-iconic-text,
+  menulist > menupopup > menu > .menu-text,
+  menulist > menupopup > menu > .menu-accel,
+  menulist > menupopup > menu > .menu-iconic-text,
+  menulist > menupopup > menu > .menu-iconic-accel
+    {
+      margin-top          : 0px;
+      margin-bottom       : 0px;
+    }
 
-.autorepeatbutton-down {
-    list-style-image: url("chrome://global/skin/scroll-down.gif")
-}
+  menulist > menupopup > menuitem[selected="true"]
+    {
+      border              : 1px dotted #F5DB95;
+    }
 
-autorepeatbutton {
-  text-align: center;
-  vertical-align: middle;
-}
+  menulist > menupopup > menuitem > .menu-iconic-left,
+  menulist > menupopup > menuitem > .menu-iconic-left[menuactive="true"]
+    {
+      list-style-image    : inherit;
+      width               : 0px;
+      border              : none;
+    }
 
-autorepeatbutton:hover {
-  background-color: #FFCF00;
-}