X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Ftoolbarbutton.css;h=32d41b2018a21465a4091848d626f11bb38b45e3;hp=ea05e9f7d915cba7c41d42337ab539d66eb8f2a2;hb=d471380e99d65fcd126e0f04b94c1d3a8004cf3d;hpb=dd676468138b64245f5026a8923f26307b8f3ebc

diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index ea05e9f7..32d41b20 100644
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -1,41 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 Communicator client code, released
- * March 31, 1998.
- *
- * 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):
- *   Joe Hewitt (hewitt@netscape.com)
- *   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 MPL, 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 MPL, 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/. */
 
 /* ===== toolbarbutton.css =====================================================
   == Styles used by the XUL button element.
@@ -46,24 +11,25 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0px;
-  margin-left: 2px;
+  -moz-margin-start: 2px;
   border: none;
   padding: 1px 2px;
   background-color: #000000;
   color: #FFCF00;
 }
 
-.toolbarbutton-icon {
-  -moz-margin-start: 1px;
-  -moz-margin-end: 2px;
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
+/*  -moz-margin-start: 1px;
+  -moz-margin-end: 2px;*/
 }
 
 .toolbarbutton-text {
-  margin: 0px !important;
+  margin: 0px !important; /* !important for overriding global.css */
   padding: 0px;
   text-align: center;
 }
@@ -72,14 +38,13 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbarbutton:focus {
+toolbarbutton:-moz-focusring {
   -moz-outline-radius: 3px;
   outline: 1px dotted #008484;
-  -moz-outline-offset: -1px;
+  outline-offset: -1px;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   background-color: #FFCF00;
   color: #000000;
 }
@@ -102,12 +67,18 @@ toolbarbutton[open="true"] {
 toolbarbutton[disabled="true"],
 toolbarbutton[disabled="true"]:hover,
 toolbarbutton[disabled="true"]:hover:active,
-toolbarbutton[disabled="true"][open="true"] {
-  padding: 1px;
+toolbarbutton[disabled="true"][open="true"],
+toolbarbutton[disabled="true"][checked="true"] {
+  padding: 1px 2px;
   background-color: #000000;
   color: #8050B0;
 }
 
+toolbarbutton:-moz-lwtheme {
+  text-shadow: none;
+}
+
+
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
@@ -133,10 +104,6 @@ toolbarbutton[checked="true"]:hover:active {
   background-color: transparent !important;
 }
 
-.toolbarbutton-menu-dropmarker[disabled="true"] {
-  padding: 0 !important;
-}
-
 /* ::::: toolbarbutton menu-button ::::: */
 
 toolbarbutton[type="menu-button"] {
@@ -165,6 +132,12 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   background-color: #000000;
 }
 
+toolbarbutton[type="menu-button"][checked="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"] > .toolbarbutton-menubutton-dropmarker {
+  background-color: #008484;
+  color: #FFCF00;
+}
+
 .toolbarbutton-menubutton-button[disabled="true"],
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   background-color: #000000 !important;
@@ -172,7 +145,9 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][checked="true"]:hover > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"]:hover > .toolbarbutton-menubutton-dropmarker {
   background-color: #FFCF00;
   color: #000000;
 }
@@ -180,7 +155,9 @@ toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker {
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][checked="true"]:hover:active > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"]:hover:active > .toolbarbutton-menubutton-dropmarker {
   background-color: #FF9F00;
   color: #000000;
 }
@@ -189,21 +166,46 @@ toolbarbutton[type="menu-button"]:hover:active > toolbarbutton.toolbarbutton-men
 toolbarbutton[type="menu-button"][open="true"] > toolbarbutton.toolbarbutton-menubutton-button {
   padding-top: 2px !important;
   padding-bottom: 0px !important;
-  -moz-padding-start: 2px !important;
-  -moz-padding-end: 0px !important;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 1px !important;
 }
 
 toolbarbutton[disabled="true"] > toolbarbutton.toolbarbutton-menubutton-button,
 toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubutton-button {
-  padding: 1px !important;
+  padding: 1px 2px !important;
+}
+
+/* ::::: toolbarbutton badged ::::: */
+
+.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) {
+  -moz-margin-end: 0;
+}
+
+.toolbarbutton-badge {
+  background-color: #000000;
+  font-size: 10px;
+  font-weight: bold;
+  padding: 0 2px 1px;
+  color: #FF9F00;
+  border-radius: 2px;
+  box-shadow: 0 1px 0 #9C9CFF inset,
+              0 -1px 0 #9C9CFF inset,
+              0 1px 0 #9C9CFF;
+  margin: -6px 0 0 !important;
+  -moz-margin-end: -8px !important;
+  min-width: 14px;
+  max-width: 28px;
+  line-height: 10px;
+  text-align: center;
+  -moz-stack-sizing: ignore;
 }
 
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: start;
-  padding: 3px 1px 1px 1px;
+  padding: 3px 1px 1px;
   border: none;
   background-color: transparent;
 }
@@ -219,15 +221,15 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 toolbarbutton[type="menu-button"]:not([disabled="true"]):hover > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"]:not([disabled="true"]):hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"]:not([disabled="true"]) > .toolbarbutton-menubutton-dropmarker,
-toolbarbutton[type="menu"]:not([disabled="true"]):hover > .toolbarbutton-menu-dropmarker,
-toolbarbutton[type="menu"]:not([disabled="true"]):hover:active > .toolbarbutton-menu-dropmarker,
-toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) > .toolbarbutton-menu-dropmarker {
+toolbarbutton[type="menu"]:not([disabled="true"]):hover .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"]:not([disabled="true"]):hover:active .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
  -moz-image-region: auto;
 }
 
 
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 3px 1px 1px 1px !important;
+  padding: 3px 1px 1px !important;
   border: none !important;
 }