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

[themes.git] / LCARStrek / global / toolbarbutton.css

diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index 188cb26b3bfa839cc35ae4a28360a094132b942a..2b0d4598fd9bceadbf0e5d5ac8a4e85c31cf7cdc 100644 (file)
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -1,41 +1,6 @@
-/* ***** 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 Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *   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/. */
 
 /* ===== toolbarbutton.css =====================================================
   == Styles used by the XUL button element.
@@ -46,7 +11,7 @@
 /* ::::: toolbarbutton ::::: */
 
 toolbarbutton {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: center;
   -moz-box-pack: center;
   margin: 0px;
@@ -64,7 +29,7 @@ toolbarbutton {
 }
 
 .toolbarbutton-text {
-  margin: 0px !important;
+  margin: 0px !important; /* !important for overriding global.css */
   padding: 0px;
   text-align: center;
 }
@@ -73,10 +38,10 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbarbutton:focus {
+toolbarbutton:-moz-focusring {
   -moz-outline-radius: 3px;
   outline: 1px dotted #008484;
-  -moz-outline-offset: -1px;
+  outline-offset: -1px;
 }
 
 toolbarbutton:hover {
@@ -139,10 +104,6 @@ toolbarbutton[checked="true"]:hover:active {
   background-color: transparent !important;
 }
 
-.toolbarbutton-menu-dropmarker[disabled="true"] {
-  padding: 0 !important;
-}
-
 /* ::::: toolbarbutton menu-button ::::: */
 
 toolbarbutton[type="menu-button"] {
@@ -171,6 +132,12 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   background-color: #000000;
 }
 
+toolbarbutton[type="menu-button"][checked="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"] > .toolbarbutton-menubutton-dropmarker {
+  background-color: #008484;
+  color: #FFCF00;
+}
+
 .toolbarbutton-menubutton-button[disabled="true"],
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   background-color: #000000 !important;
@@ -178,7 +145,9 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 }
 
 toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][checked="true"]:hover > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"]:hover > .toolbarbutton-menubutton-dropmarker {
   background-color: #FFCF00;
   color: #000000;
 }
@@ -186,7 +155,9 @@ toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker {
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-button,
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button,
-toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][checked="true"]:hover:active > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][checked="true"]:hover:active > .toolbarbutton-menubutton-dropmarker {
   background-color: #FF9F00;
   color: #000000;
 }
@@ -207,7 +178,7 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
-  -moz-border-radius: 3px;
+  border-radius: 3px;
   -moz-box-align: start;
   padding: 3px 1px 1px;
   border: none;