sync both themes with toolkit wipstripe changes up to just before the new addons...

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

diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index 95de169196d8ad0bb7057ef4d96b314c61bfc8d4..8746165b4bf1d68a5dde1ea3d85849e118f97915 100644 (file)
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -35,13 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
-
 /* ===== menulist.css ===================================================
   == Styles used by the XUL menulist element.
   ======================================================================= */
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
 /* :::::::::: menulist :::::::::: */
 
 menulist {
@@ -49,18 +49,13 @@ menulist {
   border: 1px inset #CCD0DD;
   background-color: #CCCCCC;
   color: #000000;
+  text-shadow: none;
 }
 
 .menulist-label-box {
   -moz-box-align: center;
   -moz-box-pack: center;
 /*  margin: 1px; */
-}
-
-.menulist-label-box,
-menulist[open="true"]:focus > .menulist-label-box {
-/*  border: 1px inset #CCD0DD; */
-  background-color: transparent;
   color: inherit;
 }
 
@@ -71,7 +66,21 @@ menulist[open="true"]:focus > .menulist-label-box {
 .menulist-description {
   font-style: italic;
   color: #808080;
-  margin-left: 1ex !important;
+  -moz-margin-start: 1ex !important;
+}
+
+menulist:focus:not(.menulist-compact) > .menulist-label-box {
+  background-color: #336699;
+  color: #000000;
+}
+
+menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-label-box {
+/*  border: 1px dotted #808080; */
+}
+
+menulist[disabled="true"] {
+  background-color: #CCCCCC;
+  color: #999999;
 }
 
 /* ..... dropmarker ..... */
@@ -84,28 +93,21 @@ menulist[disabled="true"]:hover:active > .menulist-dropmarker {
   padding: 1px;
 }
 
-menulist:hover:active > .menulist-dropmarker {
+menulist:hover:active > .menulist-dropmarker,
+menulist[open="true"] > .menulist-dropmarker {
   border: 1px inset #CCD0DD;
-  padding: 2px 0px 0px 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
-/* ..... focused state ..... */
+/* ::::: editable menulists ::::: */
 
-menulist:focus > .menulist-label-box {
-/*  border: 1px dotted #999999; */
-  background-color: #336699;
+menulist[editable="true"] {
   color: #000000;
 }
 
-/* ..... disabled state ..... */
-
-menulist[disabled="true"] {
-  background-color: #CCCCCC;
-  color: #999999;
-}
-
-/* ::::: editable menulists ::::: */
-
 .menulist-editable-box {
   background-color: #FFFFFF;
   padding: 2px;
@@ -115,8 +117,6 @@ html|*.menulist-editable-input {
   margin: 0px !important;
   border: none !important;
   padding: 0px !important;
-  background-color: #FFFFFF;
-  color: #000000;
   font: inherit;
 }
 
@@ -127,36 +127,32 @@ html|*.menulist-editable-input {
   -moz-box-pack: center;
   margin: 0px;
   border: 1px outset #CCD0DD;
-/*  background-color: -moz-Dialog;
-  color: -moz-DialogText; */
+  color: #000000;
   list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
 .menulist-compact > .menulist-label-box {
   border: 1px solid transparent;
-  background-color: transparent;
-  color: inherit;
 }
 
 .menulist-compact > .menulist-label-box > .menulist-label {
   margin: 0 3px !important;
-  text-align: right;
+  text-align: end;
 }
 
 .menulist-compact > .menulist-label-box > .menulist-icon {
-  margin-left: 2px;
+  -moz-margin-start: 2px;
 }
 
 .menulist-compact[open="true"] {
   border: 1px inset #CCD0DD;
-/*  background-color: ThreeDShadow;
-  color: ThreeDHighlight; */
+  /* color: ThreeDHighlight; */
 }
 
 .menulist-compact[disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
 
-.menulist-compact:focus > .menulist-label-box {
-  border: 1px dotted #9999CC;
-}
+.menulist-compact:-moz-focusring:not([open="true"]) > .menulist-label-box {
+  border: 1px dotted #999999;
+}
\ No newline at end of file