X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;ds=sidebyside;f=LCARStrek%2Fglobal%2Fbutton.css;h=3e364c65b6b03c57d07a053af8e84c509cb7ea0c;hb=3d6dd546c97f902b849a45d2bf2fa7cc623cb2e9;hp=42a13cc28534a46050c87c251de59e7b661b4161;hpb=351107c90e7ee7a17d9bf63798f2861307118309;p=themes.git

diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css
index 42a13cc2..3e364c65 100644
--- a/LCARStrek/global/button.css
+++ b/LCARStrek/global/button.css
@@ -37,160 +37,137 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* NEW WIDGET ANDING: <button> */
+/* ===== button.css =====================================================
+  == Styles used by the XUL button element.
+  ======================================================================= */
 
-/** Default Button Styles (apply to usage of <button> without 
- *  any applied class).
- **/
+/* :::::::::: button :::::::::: */
 
 /* outer frame */
-  button
-    {
-      -moz-border-radius  : 3px;
-      border              : none;
-      margin              : 1px 5px 2px 5px;
-      min-width           : 6em;
-      background-color    : #000000;
-      color               : #FFCF00;
-      -moz-user-focus     : normal;
-    }
-  
-  .button-text {
-    margin: 0px !important;
-    text-align: center;
-  }
-
-  button[disabled="true"], 
-  button[disabled="true"][default],
-  button[disabled="true"]:hover,
-  button[disabled="true"]:hover:active
-    {
-      border              : none;
-      background-color    : #000000;
-      color               : #8050B0;
-    }
-
-  .button-box,
-  button[disabled="true"][default] > .button-box,
-  button[disabled="true"]:hover:active > .button-box
-    {
-      -moz-border-radius  : 3px;
-      border              : none;
-      -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,
-  button:hover:active,
-  button[open="true"],
-  button[checked="true"]
-    {
-      border              : none;
-      background-color    : #FFCF00;
-      color               : #000000;
-    }
-
-  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              : none;
-    }
-
-  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 {
+  -moz-border-radius: 3px;
+  margin: 1px 2px;
+  min-width: 6.3em;
+  border: none;
+  background-color: #000000;
+  color: #FFCF00;
+}
   
-  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;
-      margin              : 1px;
-    }
-
-/** 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]:hover > .button-box > .button-box-2 > .button-box-text
-    {
-      list-style-image    : url("chrome://global/skin/return-hover.gif");
-    }
-
-  button[default][disabled="true"] > .button-box > .button-box-2 > .button-box-text,
-  button[default][disabled="true"]:hover > .button-box > .button-box-2 > .button-box-text
-    {
-      list-style-image    : url("chrome://global/skin/return-disabled.gif");
-    }
-
-/* ::::: menu-button buttons ::::: */
+.button-box {
+  -moz-border-radius: 3px;
+  border: 1px solid transparent; 
+  padding: 1px 4px 2px 3px;
+}
 
-button[type="menu-button"] {
+.button-text {
+  -moz-border-radius: 3px;
   margin: 0px !important;
-  border: none !important;
+  text-align: center;
 }
 
-.menu-button-dropmarker {
-  list-style-image: url("chrome://global/skin/scroll-down.gif");
+/* .......... focused state .......... */
+
+button:focus {
 }
 
-.menu-button-dropmarker:hover {
-  list-style-image: url("chrome://global/skin/scroll-down-hover.gif");
+button:focus > .button-box {
+  border: 1px dotted #008484;
 }
 
-.menu-button-dropmarker[disabled="true"],
-.menu-button-dropmarker[disabled="true"]:hover {
-  list-style-image: url("chrome://global/skin/scroll-down-disabled.gif");
+/* .......... 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: 7px;
 }
 
-/* ::::: plain buttons ::::: */
+button[default="true"]:hover > .button-box,
+button[default="true"]:hover:active > .button-box {
+  list-style-image: url("chrome://global/skin/icons/return-hover.gif");
+}
+
+button[default="true"][disabled="true"] > .button-box {
+  font-weight: bold;
+  list-style-image: url("chrome://global/skin/icons/return-disabled.gif") !important;
+}
+
+/* .......... active/open/checked state .......... */
+
+button:hover,
+button:hover:active {
+  border : none;
+  background-color: #FFCF00;
+  color: #000000;
+}
+
+button[open="true"] {
+  border : none;
+  background-color: #FF9F00;
+  color: #000000;
+}
+
+button[checked="true"] {
+  border : none;
+  background-color: #008484;
+  color: #000000;
+}
+
+button:hover:active > .button-box,
+button[open="true"] > .button-box,
+button[checked="true"] > .button-box {
+  padding: 2px 3px 1px 4px; 
+}
 
-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;
+/* .......... disabled state .......... */
+
+button[disabled="true"] {
+  border: none;
+  background-color: #000000 !important;
+  color: #8050B0 !important;
+}
+
+button[disabled="true"] > .button-box {
+  padding: 1px 4px 2px 3px !important;
+}
+
+/* ::::: menu/menu-button buttons ::::: */
+
+button[type="menu-button"] {
+  -moz-box-align: center;
+  -moz-box-pack: center;
   margin: 0px;
-  padding: 0px;
+  border: none;
+}
+
+.button-menu-dropmarker,
+.button-menubutton-dropmarker {
+  -moz-border-radius: 3px;
+  margin: 1px;
+  background-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  min-width: 11px;
+  min-height: 11px;
+}
+
+.button-menu-dropmarker:hover,
+.button-menubutton-dropmarker:hover {
+  background-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+}
+
+.button-menu-dropmarker[disabled="true"],
+.button-menubutton-dropmarker[disabled="true"] {
+  background-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important;
+}
+
+.button-menubutton-dropmarker[open="true"] {
+  margin: 2px 0px 0px 2px;
+}
+
+/* ::::: plain buttons ::::: */
+
+button.plain {
+  border: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
 }