sync both themes with toolkit windows theme changes in Mozilla 35 cycle

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

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 3940645007863d47147b08aa0261d7defe9ae644..a49f0bee6c70191f77f2717214e198bb05adaed2 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -1,46 +1,11 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   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
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== 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 {
@@ -127,13 +92,23 @@ button[disabled="true"] > .button-box {
 
 /* ::::: 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;
@@ -150,7 +125,6 @@ button[type="menu-button"] {
   -moz-margin-end: 0;
 }
 
-
 /* ::::: plain buttons ::::: */
 
 button.plain {
@@ -171,3 +145,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;
+}