X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fglobal%2Ftoolbarbutton.css;h=3ba4e74223a139e8a79a169fa35f105b42483b63;hp=649148a210c48afb0a9d3a541b16443edd490857;hb=58a9dcb5c89bcfa5ba2689238e626f0e571bd05c;hpb=b87c9562a4c728734927c455c6201d13d11c8a9e

diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css
index 649148a2..3ba4e742 100644
--- a/EarlyBlue/global/toolbarbutton.css
+++ b/EarlyBlue/global/toolbarbutton.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998-1999
  * the Initial Developer. All Rights Reserved.
@@ -23,7 +23,7 @@
  *   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 
+ * 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
@@ -42,17 +42,16 @@
   == Styles used by the XUL button element.
   ======================================================================= */
 
-toolbarbutton {
-  margin              : 0px;
-  background-color    : transparent;
-  color               : #000000;
-}
+/* ::::: toolbarbutton ::::: */
 
-.toolbarbutton-box {
-  -moz-box-align      : center;
-  -moz-box-pack       : center;
-  border              : 1px solid transparent;
-  padding             : 2px;
+toolbarbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0px;
+  border: 1px solid transparent;
+  padding: 1px;
+  background-color: transparent;
+  color: #000000;
 }
 
 .toolbarbutton-icon {
@@ -61,124 +60,118 @@ toolbarbutton {
 
 .toolbarbutton-text {
   margin: 0px !important;
+  padding: 0px;
+  text-align: center;
 }
 
-toolbarbutton[value] > .toolbarbutton-box > .toolbarbutton-text {
-  padding-left        : 4px;
-}    
-
+/*
 toolbarbutton:hover,
-toolbarbutton[buttonover="true"],
-toolbarbutton[open="true"] {
-} 
-    
-toolbarbutton:hover > .toolbarbutton-box {
-  border              : 1px outset #CCD0DD;
+toolbarbutton.toolbarbutton-menubutton-button[open="true"] {
 }
+*/
 
-toolbarbutton:hover:active {
+toolbarbutton:hover {
+  border: 1px outset #CCD0DD;
 }
 
-toolbarbutton:hover:active > .toolbarbutton-box,
-toolbarbutton[open="true"] > .toolbarbutton-box {
-  padding             : 3px 1px 1px 3px;
-  border              : 1px inset #CCD0DD;
-}
-    
-toolbarbutton[disabled="true"],
-toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active {
-  color               : #999999;
+toolbarbutton:hover:active,
+toolbarbutton[open="true"] {
+  padding: 2px 0px 0px 2px;
+  border: 1px inset #CCD0DD;
 }
 
-toolbarbutton[disabled="true"] > .toolbarbutton-box,
-toolbarbutton[disabled="true"]:hover > .toolbarbutton-box,
-toolbarbutton[disabled="true"]:hover:active > .toolbarbutton-box,
-toolbarbutton[disabled="true"][buttonover="true"] > .toolbarbutton-box,
-toolbarbutton[disabled="true"][buttondown="true"] > .toolbarbutton-box {
-  border              : 1px solid transparent;
-  padding             : 2px;
+toolbarbutton[disabled="true"] {
+  border: 1px solid transparent !important;
+  padding: 1px !important;
+  color: #999999 !important;
 }
 
 /* ..... checked state ..... */
 
-toolbarbutton[checked="true"] > .toolbarbutton-box {
-  border              : 1px inset #CCD0DD;
-  background-color    : #DDDDDD;
-}
-    
-toolbarbutton[checked="true"]:hover > .toolbarbutton-box {
-  border              : 1px inset #CCD0DD;
-  background-color    : #CCD0DD;
-  background-image    : none;
+toolbarbutton[checked="true"] {
+  padding: 1px !important;
+  border: 1px inset #CCD0DD !important;
+  background-color: #DDDDDD !important;
 }
 
 /* ::::: toolbarbutton menu ::::: */
 
-.toolbarbutton-dropmarker {
-  list-style-image      : url("chrome://global/skin/scroll-down.gif");
+.toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
-.toolbarbutton-dropmarker[disabled="true"] {
-  list-style-image      : url("chrome://global/skin/scroll-down-disabled.gif");
+.toolbarbutton-menu-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
 
 /* ::::: toolbarbutton menu-button ::::: */
 
-.toolbarbutton-menubutton-dropmarker-box {
-  -moz-box-align: start;
-  -moz-box-pack: center;
+toolbarbutton[type="menu-button"] {
+  -moz-box-align: stretch;
 }
 
-toolbarbutton[type="menu-button"]:hover:active {
+toolbarbutton[type="menu-button"],
+toolbarbutton[type="menu-button"]:hover,
+toolbarbutton[type="menu-button"]:hover:active,
+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;
+  padding: 0px !important;
 }
 
 .toolbarbutton-menubutton-button {
-  border: none !important;
-  color: inherit;
+  -moz-box-align: center;
+  -moz-box-pack: center;
 }
 
+.toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://global/skin/scroll-down.gif");
-} 
+  border: 1px solid transparent;
+}
 
+.toolbarbutton-menubutton-button[disabled="true"],
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/scroll-down-disabled.gif");
-} 
+  border: 1px solid transparent !important;
+}
 
-.toolbarbutton-menubutton-dropmarker-box {
-  border                : 1px solid transparent;
-  padding               : 1px 0px 1px 0px;
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker {
+  border: 1px outset #CCD0DD;
 }
 
-toolbarbutton[disabled="true"]:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-button  > .toolbarbutton-box
-{
-  border                : 1px solid transparent;
+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 {
+  border: 1px inset #CCD0DD;
 }
 
-toolbarbutton:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-button  > .toolbarbutton-box,
-toolbarbutton:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[buttonover="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box
-{
-  border                : 1px outset #CCD0DD;
+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;
 }
 
-toolbarbutton[buttondown="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[open="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[open="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-button > .toolbarbutton-box
-{
-  border                : 1px inset #CCD0DD;
-  padding               : 2px 0px 0px 0px;
+toolbarbutton[disabled="true"] > toolbarbutton.toolbarbutton-menubutton-button,
+toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubutton-button {
+  padding: 1px !important;
 }
 
-.toolbarbutton-menubutton-dropmarker-box[disabled="true"] {
-  border: 1px solid transparent !important;
-  padding: 0px !important;
+/* .......... dropmarker .......... */
+
+.toolbarbutton-menubutton-dropmarker {
+  -moz-box-align: start;
+  padding: 3px 1px 1px 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 4px 0px 0px 2px;
+}
+
+.toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding: 3px 1px 1px 1px !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important;
 }