first steps of adopting both themes to toolkit winstripe changes between Mozilla...

[themes.git] / EarlyBlue / global / button.css

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 59c8b48eae13a4582e2295caf6daa555b9d16a1f..1178039efb17364e3e07986830768327f96ac22a 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -36,11 +36,9 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* ===== button.css =====================================================
-  == Styles used by the XUL button element.
+  == Styles used by the XUL (and XHTML in netError.xhtml) button element.
   ======================================================================= */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
 /* :::::::::: button :::::::::: */
 
 button {
@@ -49,15 +47,19 @@ button {
   border: 1px outset #CCD0DD;
   background-color: #CCD0DD;
   color: #000000;
+  text-shadow: none;
 }
 
 .button-box {
   border: 1px solid transparent;
-  padding: 0px 3px 1px 2px;
+  padding-top: 0;
+  padding-bottom: 1px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 3px;
 }
 
 .button-icon {
-  margin-right: 2px;
+  -moz-margin-end: 2px;
 }
 
 .button-text {
@@ -67,10 +69,7 @@ button {
 
 /* .......... focused state .......... */
 
-button:focus {
-}
-
-button:focus > .button-box {
+button:-moz-focusring > .button-box {
   border: 1px dotted #9999CC;
 }
 
@@ -83,8 +82,8 @@ button[default="true"] > .button-box {
 }
 
 button[default="true"] > .button-box > .button-icon {
-  margin-right: 0px;
-  margin-left: 2px;
+  -moz-margin-end: 0px;
+  -moz-margin-start: 2px;
 }
 
 button[default="true"][disabled="true"] > .button-box {
@@ -103,7 +102,10 @@ button[checked="true"] {
 button:hover:active > .button-box,
 button[open="true"] > .button-box,
 button[checked="true"] > .button-box {
-  padding: 1px 2px 0px 3px;
+  padding-top: 1px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 2px;
 }
 
 /* .......... disabled state .......... */
@@ -115,32 +117,47 @@ button[disabled="true"]:hover:active {
 }
 
 button[disabled="true"] > .button-box {
-  padding: 0px 3px 1px 2px !important;
+  padding-top: 0 !important;
+  padding-bottom: 1px !important;
+  -moz-padding-start: 2px !important;
+  -moz-padding-end: 3px !important;
 }
 
 /* ::::: menu/menu-button buttons ::::: */
 
-button[type="menu-button"] {
-  -moz-box-align: center;
-  -moz-box-pack: center;
+.button-menubutton-button,
+.button-menubutton-button:hover:active,
+.button-menubutton-button[open="true"],
+.button-menubutton-button[disabled="true"] {
   margin: 0px;
+  background-color: transparent;
   border: none;
 }
 
+button[type="menu-button"]:hover:active > .button-menubutton-button > .button-box,
+button[type="menu-button"][open="true"] > .button-menubutton-button > .button-box {
+  padding-top: 1px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 2px;
+}
+
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
   margin: 1px;
-  min-width: 11px;
-  min-height: 11px;
+  width: 11px;
+  height: 11px;
   background-color: transparent;
   border: none;
 }
 
 .button-menubutton-dropmarker[open="true"] {
-  margin: 2px 0px 0px 2px;
+  margin-top: 2px;
+  margin-bottom: 0;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 0;
 }
 
-
 /* ::::: plain buttons ::::: */
 
 button.plain {
@@ -161,3 +178,10 @@ button[type="disclosure"] {
 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;
+}