X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Fbutton.css;h=f8cd97f1fd89bbe9714d4eb3b85471f6663405de;hp=b149d3aa2042016a8b832e48b414b279f6a080d1;hb=e4cecae1e1b620724b4035f73858c9c9b8f9a08e;hpb=b1eaa41997928ca662ce1158215dc02e5b203eb0

diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css
index b149d3aa..f8cd97f1 100644
--- a/LCARStrek/global/button.css
+++ b/LCARStrek/global/button.css
@@ -35,43 +35,45 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 /* ===== button.css =====================================================
-  == Styles used by the XUL button element.
+  == Styles used by the XUL (and XHTML in netError.xhtml) button element.
   ======================================================================= */
 
 /* :::::::::: button :::::::::: */
 
-/* outer frame */
 button {
-  -moz-border-radius: 3px;
-  margin: 0px 4px 1px 4px;
+  border-radius: 3px;
+  margin: 1px 2px;
   min-width: 6.3em;
   border: none;
   background-color: #000000;
   color: #FFCF00;
+  text-shadow: none;
 }
-  
+
 .button-box {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   border: 1px solid transparent;
-  padding: 1px 4px 2px 3px;
+  padding-top: 1px;
+  padding-bottom: 2px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 4px;
+}
+
+.button-icon {
+  -moz-margin-end: 2px;
 }
 
 .button-text {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   margin: 0px !important;
   text-align: center;
 }
 
 /* .......... focused state .......... */
 
-button:focus {
-}
-
-button:focus > .button-box {
-  border: 1px dotted #FF9F00;
+button:-moz-focusring > .button-box {
+  border: 1px dotted #008484;
 }
 
 /* .......... default state .......... */
@@ -80,7 +82,11 @@ 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;
+}
+
+button[default="true"] > .button-box > .button-icon {
+  -moz-margin-end: 0px;
+  -moz-margin-start: 2px;
 }
 
 button[default="true"]:hover > .button-box,
@@ -97,19 +103,19 @@ button[default="true"][disabled="true"] > .button-box {
 
 button:hover,
 button:hover:active {
-  border : none;
+  border: none;
   background-color: #FFCF00;
   color: #000000;
 }
 
 button[open="true"] {
-  border : none;
+  border: none;
   background-color: #FF9F00;
   color: #000000;
 }
 
-button[checked="true"] {
-  border : none;
+button[checked="true"]:not(:hover) {
+  border: none;
   background-color: #008484;
   color: #000000;
 }
@@ -117,49 +123,66 @@ button[checked="true"] {
 button:hover:active > .button-box,
 button[open="true"] > .button-box,
 button[checked="true"] > .button-box {
-  padding: 2px 3px 1px 4px; 
+  padding-top: 2px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 3px;
 }
 
 /* .......... disabled state .......... */
 
-button[disabled="true"] {
+button[disabled="true"],
+button[disabled="true"]:hover:active {
   border: none;
   background-color: #000000 !important;
   color: #8050B0 !important;
 }
 
 button[disabled="true"] > .button-box {
-  padding: 1px 4px 2px 3px !important;
+  padding-top: 1px !important;
+  padding-bottom: 2px !important;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 4px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
 
-button[type="menu-button"] {
-  -moz-box-align: center;
-  -moz-box-pack: center;
+.button-menubutton-button,
+.button-menubutton-button:hover,
+.button-menubutton-button:hover:active,
+.button-menubutton-button[open="true"],
+.button-menubutton-button[disabled="true"] {
   margin: 0px;
-  border: none;
+  background-color: transparent;
 }
 
-.button-menu-dropmarker,
-.button-menubutton-dropmarker {
-  -moz-border-radius: 3px;
-  margin: 1px;
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+button[type="menu-button"]:hover:active > .button-menubutton-button > .button-box,
+button[type="menu-button"][open="true"] > .button-menubutton-button > .button-box {
+  padding-top: 2px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 3px;
 }
 
-.button-menu-dropmarker:hover,
-.button-menubutton-dropmarker:hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+button[type="menu-button"]:hover > .button-menubutton-button,
+button[type="menu-button"]:hover:active > .button-menubutton-button,
+button[type="menu-button"][open="true"] > .button-menubutton-button {
+  color: #000000;
 }
 
-.button-menu-dropmarker[disabled="true"],
-.button-menubutton-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important;
+.button-menu-dropmarker,
+.button-menubutton-dropmarker {
+  margin: 2px;
+  width: 11px;
+  height: 11px;
+  background-color: transparent;
+  border: none;
 }
 
-.button-menubutton-dropmarker[open="true"] {
-  margin: 2px 0px 0px 2px;
+button[type="menu-button"]:hover > .button-menubutton-dropmarker,
+button[type="menu-button"]:hover:active > .button-menubutton-dropmarker,
+button[type="menu-button"][open="true"] > .button-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
 }
 
 /* ::::: plain buttons ::::: */
@@ -169,3 +192,23 @@ button.plain {
   margin: 0px !important;
   padding: 0px !important;
 }
+
+button[type="disclosure"] {
+  border: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
+  list-style-image: url("chrome://global/skin/tree/twisty-closed.gif");
+  min-width: 0px !important;
+  background-color: transparent;
+}
+
+button[type="disclosure"][open="true"] {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
+}
+
+/* ::::: xhtml buttons ::::: */
+
+button::-moz-focus-inner {
+  padding: 0px;
+  border: 0px none;
+}