X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fglobal%2Fbutton.css;h=b74c7a825b69e33dd780c539b9da72e637c2898a;hp=309d98436372dda99a9560233f5dba9ab30d5080;hb=d686d388f4990d02ac0103d09b3414b49b03920d;hpb=b87c9562a4c728734927c455c6201d13d11c8a9e

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 309d9843..b74c7a82 100644
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -37,152 +37,109 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/** Default Button Styles (apply to usage of <button> without 
- *  any applied class).
- **/
+/* ===== button.css =====================================================
+  == Styles used by the XUL button element.
+  ======================================================================= */
+
+/* :::::::::: button :::::::::: */
 
 /* outer frame */
-  button
-    {
-      border              : none;
-      margin              : 1px 5px 2px 5px;
-      min-width           : 6.3em;
-      background-color    : #CCD0DD;
-      color               : #000000;
-      -moz-user-focus     : normal;
-    }
-  
-  .button-text {
-    margin: 0px !important;
-    text-align: center;
-  }
-
-  button, 
-  button[disabled="true"][default],
-  button[disabled="true"]:hover:active
-    {
-      border              : none;
-    }
-
-  .button-box,
-  button[disabled="true"][default] > .button-box,
-  button[disabled="true"]:hover:active > .button-box
-    {
-      border              : 1px outset #CCD0DD;
-      -moz-user-focus     : none;
-    }
-
-  .button-box-2,
-  button[disabled="true"][default] > .button-box > .button-box-2,
-  button[disabled="true"]:hover:active > .button-box > .button-box-2
-    {
-			border              : none;	
-    }
-  
-  button:hover:active,
-  button[open="true"],
-  button[checked="true"]
-    {
-      border              : none;
-    }
-
-  button:hover:active > .button-box,
-  button[checked="true"] > .button-box,
-  button[checked="true"]:focus > .button-box,
-  button[open="true"] > .button-box,
-  button[open="true"]:focus > .button-box
-    {
-      border              : 1px inset #CCD0DD;
-    }
-
-  button:hover:active > .button-box > .button-box-2,
-  button[checked="true"] > .button-box > .button-box-2,
-  button[checked="true"]:focus> .button-box > .button-box-2,
-  button[open="true"] > .button-box > .button-box-2,
-  button[open="true"]:focus > .button-box > .button-box-2
-    {
-      border              : none;
-    }
-
-  button:hover:active > .button-box > .button-box-2 > .button-box-text,
-  button[open="true"] > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 1px 2px 0px 3px; 
-    }
+
+button {
+  margin: 1px 5px 2px 5px;
+  min-width: 6.3em;
+  border: 1px outset #CCD0DD;
+  background-color: #CCD0DD;
+  color: #000000;
+}
+
+.button-box {
+  border: 1px solid transparent;
+  padding: 0px 3px 1px 2px;
+}
   
-  button[disabled="true"],
-  button[disabled="true"]:hover:active 
-    {
-      color               : #999999;
-    }
-        
-  button[disabled="true"] > .button-box > .button-box-2 > .button-box-text,
-  button[disabled="true"]:hover:active > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 0px 3px 1px 2px;
-    }
-
-/* text wrapping frame (hack because <text> does not support alignment) */
-  .button-box-text,
-  button[disabled]:focus > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 0px 3px 1px 2px;
-      border              : 1px solid transparent;
-      margin              : 1px;
-    }
-
-  button:focus > .button-box > .button-box-2 > .button-box-text
-    {
-      border              : 1px dotted #9999CC;
-    }    
-    
-/** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. 
- *  To activate, set 'default' attribute on button.
- **/
- 
-/* outer frame */  
-  button[default], button:focus
-    {
-      border              : none;
-    }
-
-  button[default] > .button-box > .button-box-2 > .button-box-text
-    {
-      font-weight         : bold;
-      list-style-image    : url("chrome://global/skin/return.gif");
-      -moz-box-direction  : reverse;
-    }
-
-  button[default][disabled="true"] > .button-box > .button-box-2 > .button-box-text
-    {
-      font-weight         : bold;
-      list-style-image    : url("chrome://global/skin/return-disabled.gif");
-    }
-
-/* ::::: menu-button buttons ::::: */
+.button-text {
+  margin: 0px !important;
+  text-align: center;
+}
+
+/* .......... focused state .......... */
+
+button:focus {
+}
+
+button:focus > .button-box {
+  border: 1px dotted #9999CC;
+}
+
+/* .......... default state .......... */
+
+button[default="true"] > .button-box {
+  font-weight: bold;
+  list-style-image: url("chrome://global/skin/icons/return.gif");
+  -moz-box-direction: reverse;
+  padding-right: 6px;
+}
+
+button[default="true"][disabled="true"] > .button-box {
+  font-weight: bold;
+  list-style-image: url("chrome://global/skin/icons/return-disabled.gif");
+}
+
+/* .......... active/open/checked state .......... */
+
+button:hover:active,
+button[open="true"],
+button[checked="true"] {
+  border: 1px inset #CCD0DD;
+}
+
+button:hover:active > .button-box,
+button[open="true"] > .button-box,
+button[checked="true"] > .button-box {
+  padding: 1px 2px 0px 3px; 
+}
+
+/* .......... disabled state .......... */
+
+button[disabled="true"] {
+  border: 1px outset #CCD0DD;
+  color: #999999;
+}
+
+button[disabled="true"] > .button-box {
+  padding: 0px 3px 1px 2px !important;
+}
+
+/* ::::: menu/menu-button buttons ::::: */
 
 button[type="menu-button"] {
-  margin: 0px !important;
-  border: none !important;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0px;
+  border: none;
 }
 
-.menu-button-dropmarker {
-  list-style-image: url("chrome://global/skin/scroll-down.gif");
+.button-menu-dropmarker,
+.button-menubutton-dropmarker {
+  margin: 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
-  
-.menu-button-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/scroll-down-disabled.gif");
+
+.button-menu-dropmarker[disabled="true"],
+.button-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
 
+.button-menubutton-dropmarker[open="true"] {
+  margin: 2px 0px 0px 2px;
+}
+
+
 /* ::::: plain buttons ::::: */
 
-button.plain, 
-button.plain:hover,
-button.plain:hover:active,
-button.plain > .button-box, 
-button.plain:hover > .button-box, 
-button.plain:hover:active > .button-box {
-  border: 0px ! important;
-  margin: 0px;
-  padding: 0px;
+button.plain {
+  border: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
 }