X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fcommunicator%2Fbutton.css;h=30829bffa4d2d4db4c0f2b3b2b418a35f0513a36;hp=68e1fc3bbf5d4148bf70a20f7dee16e274d8d778;hb=e90cc3a49fa88fba5e9ac6171f427e18f7f8e60b;hpb=dd676468138b64245f5026a8923f26307b8f3ebc

diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css
index 68e1fc3b..30829bff 100644
--- a/LCARStrek/communicator/button.css
+++ b/LCARStrek/communicator/button.css
@@ -1,39 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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
- * Netscape Communications Corporation.
- * 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/. */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -50,6 +17,13 @@
   -moz-box-orient: vertical;
 }
 
+statusbarpanel > .toolbarbutton-1,
+statusbarpanel > .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  min-width: 16px;
+  min-height: 16px;
+  -moz-box-orient: vertical;
+}
+
 .toolbarbutton-1[type="menu-button"] {
   -moz-box-orient: horizontal;
 }
@@ -78,10 +52,10 @@
 
 toolbar[mode="text"] .toolbarbutton-1,
 toolbar[mode="icons"] .toolbarbutton-1,
-.toolbarbutton-1[toolbarmode="small"],
+toolbar[iconsize="small"] .toolbarbutton-1,
 toolbar[mode="text"] .toolbarbutton-menubutton-button,
 toolbar[mode="icons"] .toolbarbutton-menubutton-button,
-.toolbarbutton-menubutton-button[toolbarmode="small"] {
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
   min-width: 0px;
   min-height: 0px;
 }
@@ -94,7 +68,7 @@ toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
 }
 
 toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker {
+toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker {
   padding-top: 0px;
   padding-bottom: 13px;
   -moz-padding-start: 1px;
@@ -105,18 +79,18 @@ toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolba
 toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   padding-top: 5px;
   padding-bottom: 7px;
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
   padding-top: 1px;
   padding-bottom: 12px;
-  -moz-padding-start: 0px;
-  -moz-padding-end: 2px;
+  -moz-padding-start: 2px;
+  -moz-padding-end: 0px;
 }
 
 toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
@@ -127,7 +101,7 @@ toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
 }
 
 toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   padding-top: 0px !important;
   padding-bottom: 13px !important;
   -moz-padding-start: 1px !important;
@@ -143,6 +117,17 @@ toolbar[mode="text"] .toolbarbutton-text {
   padding: 4px 0;
 }
 
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+toolbar[labelalign="end"] .toolbarbutton-1,
+toolbar[labelalign="end"] .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+toolbar[labelalign="end"] .toolbarbutton-1 > hbox > vbox {
+  -moz-box-orient: horizontal;
+}
+
 /* ::::: standard toolbar buttons ::::: */
 
 .button-toolbar {
@@ -169,8 +154,9 @@ toolbar[mode="text"] .toolbarbutton-text {
   background-color: #FFCF00;
 }
 
-/* override winstripe */
+/* override windows */
 
-.toolbarbutton-icon {
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
   -moz-margin-end: 2px;
 }