X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fglobal%2Ftoolbarbutton.css;h=52926c70d6e912ddccfdaa1fedfa906f4b1b0752;hp=fe4642794afd31784dc4e6868e14521b61e65b17;hb=c0fb45ea7e0f2045575b3cdd750bbc6673b22f48;hpb=1d4ddf3044b84fc0b806064b1edcdbaa4c44677b

diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css
index fe464279..52926c70 100644
--- a/EarlyBlue/global/toolbarbutton.css
+++ b/EarlyBlue/global/toolbarbutton.css
@@ -1,17 +1,18 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 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/
+ * 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.org code.
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
  *
  * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
@@ -28,20 +29,20 @@
  * 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
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 /* ===== toolbarbutton.css =====================================================
   == Styles used by the XUL button element.
   ======================================================================= */
 
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
@@ -54,8 +55,9 @@ toolbarbutton {
   color: #000000;
 }
 
-.toolbarbutton-icon {
-  margin-right: 2px;
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
+  -moz-margin-end: 2px;
 }
 
 .toolbarbutton-text {
@@ -64,6 +66,15 @@ toolbarbutton {
   text-align: center;
 }
 
+toolbarbutton.tabbable {
+  -moz-user-focus: normal !important;
+}
+
+toolbarbutton:focus {
+  outline: 1px dotted #666699;
+  outline-offset: -1px;
+}
+
 /*
 toolbarbutton:hover,
 toolbarbutton.toolbarbutton-menubutton-button[open="true"] {
@@ -76,20 +87,33 @@ toolbarbutton:hover {
 
 toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
-  padding: 2px 0px 0px 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
   border: 1px inset #CCD0DD;
 }
 
-toolbarbutton[disabled="true"] {
-  border: 1px solid transparent !important;
-  padding: 1px !important;
-  color: #999999 !important;
+toolbarbutton[disabled="true"],
+toolbarbutton[disabled="true"]:hover,
+toolbarbutton[disabled="true"]:hover:active,
+toolbarbutton[disabled="true"][open="true"] {
+  border: 1px solid transparent;
+  padding: 1px;
+  color: #999999;
+}
+
+toolbarbutton:-moz-lwtheme {
+  text-shadow: none;
 }
 
 /* ..... checked state ..... */
 
 toolbarbutton[checked="true"] {
-  padding: 1px !important;
+  padding-top: 2px !important;
+  padding-bottom: 0px !important;
+  -moz-padding-start: 2px !important;
+  -moz-padding-end: 0px !important;
   border: 1px inset #CCD0DD !important;
   background-color: #DDDDDD !important;
 }
@@ -97,14 +121,13 @@ toolbarbutton[checked="true"] {
 /* ::::: toolbarbutton menu ::::: */
 
 .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
   padding: 0px;
   border: none !important;
   background-color: transparent !important;
 }
 
 .toolbarbutton-menu-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+  padding: 0 !important;
 }
 
 /* ::::: toolbarbutton menu-button ::::: */
@@ -120,13 +143,14 @@ toolbarbutton[type="menu-button"][open="true"],
 toolbarbutton[type="menu-button"][disabled="true"],
 toolbarbutton[type="menu-button"][disabled="true"]:hover,
 toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
-  border: none !important;
+  border-style: none;
   padding: 0px !important;
 }
 
 .toolbarbutton-menubutton-button {
   -moz-box-align: center;
   -moz-box-pack: center;
+  -moz-box-orient: vertical;
 }
 
 .toolbarbutton-menubutton-button,
@@ -153,7 +177,10 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
 
 toolbarbutton[type="menu-button"]:hover:active > toolbarbutton.toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"][open="true"] > toolbarbutton.toolbarbutton-menubutton-button {
-  padding: 2px 0px 0px 2px !important;
+  padding-top: 2px !important;
+  padding-bottom: 0px !important;
+  -moz-padding-start: 2px !important;
+  -moz-padding-end: 0px !important;
 }
 
 toolbarbutton[disabled="true"] > toolbarbutton.toolbarbutton-menubutton-button,
@@ -165,18 +192,18 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu
 
 .toolbarbutton-menubutton-dropmarker {
   -moz-box-align: start;
-  padding: 3px 1px 1px 1px;
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
-  border: none !important;
-  background-color: transparent !important;
+  padding: 3px 1px 1px;
+  background-color: transparent;
 }
 
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 4px 0px 0px 2px;
+  padding-top: 4px;
+  padding-bottom: 0px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 3px 1px 1px 1px !important;
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important;
+  padding: 3px 1px 1px !important;
 }