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 5dd43311ee8bb2637ab8a16b02160cc00cf92b35..6b2a91245a89c7f776320be12ca28b8ebff3345e 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -8,7 +8,6 @@
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
-@import url("chrome://global/content/global-platform.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -22,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,11 +42,14 @@ menubar {
 toolbaritem > menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
-/*
-progressmeter[mode="undetermined"] {
-  -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");
+
+@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;
+  }
 }
-*/
 
 /* ::::: root elements ::::: */
 
@@ -92,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");
 }
@@ -312,15 +310,22 @@ description {
 
 .text-link {
   color: #3333FF;
-  text-decoration: underline;
   cursor: pointer;
 }
 
+.text-link:hover {
+  text-decoration: underline;
+}
+
 .text-link:-moz-focusring {
   /* Don't specify the outline-color, we should always use initial value. */
   outline: 1px dotted;
 }
 
+popupnotificationcontent {
+  margin-top: .5em;
+}
+
 /* :::::: autoscroll popup ::::: */
 
 .autoscroller {