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 472a7a0bf8c562526cdf048422e40470483e4dad..6b2a91245a89c7f776320be12ca28b8ebff3345e 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -1,39 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
@@ -54,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 {
@@ -78,14 +40,16 @@ menubar {
 }
 
 toolbaritem > menubar {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#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 ::::: */
 
@@ -97,7 +61,7 @@ prefwindow {
   background-color: #000000;
   color: #FF9F00;
 /*  font: 3mm "Final Frontier",tahoma,arial,helvetica,sans-serif; */
-  font: 11px helvetica,arial,tahoma,sans-serif;
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
   padding: 3px;
 }
 
@@ -125,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");
 }
@@ -163,14 +128,14 @@ statusbar {
 }
 
 .statusbar-left {
-  -moz-border-radius: 9px 0px 0px 9px;
+  border-radius: 9px 0px 0px 9px;
   background-color: #6000CF;
   width: 13px;
   -moz-margin-end: 3px;
 }
 
 .statusbar-right {
-  -moz-border-radius: 0px 9px 9px 0px;
+  border-radius: 0px 9px 9px 0px;
   background-color: #6000CF;
   width: 13px;
   -moz-margin-start: 3px;
@@ -179,9 +144,14 @@ statusbar {
 statusbarpanel {
   -moz-box-align: center;
   -moz-box-pack: center;
+  border-left: 3px solid black;
   padding: 0px 2px;
 }
 
+statusbarpanel:first-child {
+  border-left: none;
+}
+
 statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
   -moz-appearance: none;
   border-top-style: none;
@@ -198,11 +168,11 @@ statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
 .statusbarpanel-iconic,
 .statusbarpanel-iconic-text,
 .statusbarpanel-menu-iconic {
-  padding: 0px 2px;
 }
 
 .statusbarpanel-progress {
   -moz-box-orient: vertical;
+  padding: 0px;
 }
 
 .toolbar-focustarget {
@@ -222,7 +192,7 @@ toolbar[mode="text"] .toolbarbutton-text {
 }
 
 :root:-moz-lwtheme-darktext {
-  text-shadow: 1px 1px 2px #FFCF00;
+  text-shadow: 0 -0.5px 1.5px #FFCF00;
 }
 
 :root:-moz-lwtheme-brighttext {
@@ -298,7 +268,7 @@ separator[orient="vertical"].groove-thin {
 
 description, label  {
   cursor: default;
-  margin: 1px 3px;
+  margin: 1px 2px;
 }
 
 label[disabled="true"] {
@@ -318,7 +288,7 @@ description {
 }
 
 .monospace {
-  font-family: monospace;
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
 }
 
 .indent {
@@ -339,16 +309,23 @@ description {
 }
 
 .text-link {
-  color: blue;
-  text-decoration: underline;
+  color: #3333FF;
   cursor: pointer;
 }
 
-.text-link:focus {
+.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 {