sync both themes with toolkit windows theme changes in Mozilla 39 cycle

[themes.git] / LCARStrek / global / global.css

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 97eccb7ac4c478411384fe960cb7dd3317301232..6b2a91245a89c7f776320be12ca28b8ebff3345e 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -21,15 +21,10 @@ radio {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#radio-with-spacing");
 }
 
-menulist > menupopup,
-.menulist-menupopup {
+menulist > menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
 
-.menulist-compact {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
-}
-
 /* LCARStrek special bindings */
 
 statusbar {
@@ -48,8 +43,8 @@ toolbaritem > menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
 
-@supports ( -moz-appearance: -moz-mac-unified-toolbar ) {
-  /* this is a usable workaround to detect we're on Mac OS */
+@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) {
+  /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */
   toolbar.chromeclass-menubar {
     -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
     border-bottom: none;
@@ -94,6 +89,7 @@ window.dialog {
   list-style-image: url("chrome://global/skin/icons/alert-message.gif");
 }
 
+.alert-dialog #info\.icon,
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
 }
@@ -326,6 +322,10 @@ description {
   outline: 1px dotted;
 }
 
+popupnotificationcontent {
+  margin-top: .5em;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {