X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Ftoolbar.css;h=61905f47143257dda0a3288ac85d7690ac16198e;hp=13655f9e15c8c218a33c60a85cd6799d64901c02;hb=25fe52645ef988436b57074ab129945504adf926;hpb=798ffac16c7198c444be9bd8a277e92c170985ab

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index 13655f9e..61905f47 100644
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/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.
@@ -62,10 +29,11 @@ menubar {
 .toolbar-holder {
   background-color: #9C9CFF;
   color: #000000;
+  -moz-padding-end: 2px;
 }
 
 menubar > .toolbar-box > .toolbar-holder,
-toolbar#toolbar-menubar > .toolbar-box > .toolbar-holder {
+toolbar[type="menubar"] > .toolbar-box > .toolbar-holder {
   background-color: #6000CF;
   color: #FF9F00;
 }
@@ -75,7 +43,7 @@ toolbar#toolbar-menubar > .toolbar-box > .toolbar-holder {
 toolbargrippy,
 .toolbar-startcap,
 .menubar-startcap {
-  -moz-border-radius: 8px 0px 0px 8px;
+  border-radius: 8px 0px 0px 8px;
   -moz-box-orient: vertical;
   -moz-box-align: center;
   background-color: #FF9F00;
@@ -93,7 +61,7 @@ toolbargrippy:hover {
 
 .toolbar-endcap,
 .menubar-endcap {
-  -moz-border-radius: 0px 8px 8px 0px;
+  border-radius: 0px 8px 8px 0px;
   background-color: #FF9F00;
   border: none;
   border-left: 3px solid black;
@@ -105,7 +73,7 @@ toolbargrippy:hover {
 
 toolbargrippy[tbgrippy-collapsed="true"] {
   -moz-box-orient: horizontal;
-  -moz-border-radius: 4px 0px 0px 4px;
+  border-radius: 4px 0px 0px 4px;
   margin-bottom: 3px;
   width: 30px;
   /* height gets set to the width of the uncollapsed grippy by default
@@ -118,17 +86,28 @@ toolbargrippy[tbgrippy-collapsed="true"] {
   border-bottom: none;
 }
 
-
-/* in browser.xul, the menubar is inside a toolbar... */
-toolbaritem > menubar {
+/* in some cases, the menubar is inside a toolbar... */
+toolbaritem > menubar,
+toolbar > menubar {
   border-bottom-style: none;
   background-color: transparent;
 }
 
+/* ::::: lightweight theme ::::: */
+
+menubar:-moz-lwtheme,
+toolbox:-moz-lwtheme,
+toolbar:-moz-lwtheme {
+  -moz-appearance: none;
+  background: none;
+  border-color: transparent;
+}
+
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {
-  margin: 2px 0px 2px 2px;
+  margin: 2px;
+  -moz-margin-end: 0;
   border-right: 1px solid #000000;
   width: 1px;
 }
@@ -158,18 +137,11 @@ toolbarpaletteitem {
 
 .toolbarpaletteitem-box[type="spacer"],
 .toolbarpaletteitem-box[type="spring"] {
-  -moz-border-radius: 5px;
+  border-radius: 5px;
   border: 1px solid #9C9CFF;
   background-color: #000000 !important;
 }
 
-toolbarpaletteitem[place="toolbar"] {
-  margin-left: -2px;
-  margin-right: -2px;
-  border-left: 2px solid transparent;
-  border-right: 2px solid transparent;
-}
-
 toolbarpaletteitem[place="toolbar"] > toolbarspacer {
   width: 11px;
 }
@@ -200,6 +172,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: #008484;
 }