update both themes for toolkit windows theme changes in Mozilla 24 cycle

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

diff --git a/EarlyBlue/global/toolbar.css b/EarlyBlue/global/toolbar.css
index 53a0103e1a5ec23166c116c987c03256ed543021..dbea9595c3504385634a56105b16b904567ba331 100644 (file)
--- a/EarlyBlue/global/toolbar.css
+++ b/EarlyBlue/global/toolbar.css
@@ -1,39 +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 "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/. */
 
 /* ===== toolbar.css ====================================================
   == Styles used by XUL toolbar-related elements.
@@ -64,6 +31,7 @@ toolbaritem > menubar {
 
 /* ::::: lightweight theme ::::: */
 
+menubar:-moz-lwtheme,
 toolbox:-moz-lwtheme,
 toolbar:-moz-lwtheme {
   -moz-appearance: none;
@@ -108,13 +76,6 @@ toolbarpaletteitem {
   background-color: #FFFFFF !important;
 }
 
-toolbarpaletteitem[place="toolbar"] {
-  -moz-margin-start: -2px;
-  -moz-margin-end: -2px;
-  border-left: 2px solid transparent;
-  border-right: 2px solid transparent;
-}
-
 toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   width: 11px;
 }
@@ -145,6 +106,13 @@ toolbarpaletteitem[place="toolbar"] > toolbarspacer {
 
 /* ..... drag and drop feedback ..... */
 
+toolbarpaletteitem[place="toolbar"] {
+  -moz-margin-start: -2px;
+  -moz-margin-end: -2px;
+  border-left: 2px solid transparent;
+  border-right: 2px solid transparent;
+}
+
 toolbarpaletteitem[dragover="left"] {
   border-left-color: #000000;
 }