X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fglobal%2Fmenu.css;h=935b284cc0890cf2bab1bd8a37e306a44822a998;hp=4eab83237685d79f0ecf4f952a854048a869e153;hb=9a225e4b44ec04c62ddff63f06c913d67e705711;hpb=a8df931f2848af7136c07c96b55349bac60b1eb4

diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index 4eab8323..935b284c 100644
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.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/. */
 
 /* ===== menu.css =======================================================
   == Styles used by XUL menu-related elements.
@@ -44,13 +11,14 @@
 /* ::::: menu/menuitem ::::: */
 
 menu,
-menuitem {
+menuitem,
+menucaption {
   -moz-box-align: center;
   max-width: 42em;
-  color: #000000;
   background-color: #000000;
   color: #FF9F00;
   list-style-image: none;
+  -moz-image-region: auto;
 }
 
 menuitem[default="true"] {
@@ -73,7 +41,7 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 menubar > menu {
   padding: 2px;
   margin: 0px;
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
   border: none;
 }
 
@@ -106,20 +74,17 @@ menuitem.spell-suggestion {
 menupopup > menu,
 popup > menu,
 menupopup > menuitem,
-popup > menuitem {
+popup > menuitem,
+menupopup > menucaption {
   padding: 2px;
 }
 
 /* ::::: menu/menuitems in menulist popups ::::: */
 
-.menulist-menupopup > menuitem,
 menulist > menupopup > menuitem,
-.menulist-menupopup > menu,
+menulist > menupopup > menucaption,
 menulist > menupopup > menu {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  -moz-padding-start: 1px;
-  -moz-padding-end: 22px;
+  padding: 1px 5px;
   max-width: none;
 }
 
@@ -130,37 +95,45 @@ menulist > menupopup > menu {
 .menu-iconic-text {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
-  -moz-margin-start: 0px !important;
-  -moz-margin-end: 2px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
   color: inherit;
 }
 
+.menu-iconic-left {
+  margin-inline-end: 3px !important;
+}
+
 .menu-text {
-  -moz-margin-start: 18px !important;
+  margin-inline-start: 19px !important;
   font-weight: inherit;
 }
 
+menucaption > .menu-text,
+menucaption > .menu-iconic-text {
+  font-weight: bold;
+  padding-inline-start: 0 !important;
+}
+
 .menu-description {
   font-style: italic;
   color: #9C9CFF;
-  -moz-margin-start: 1ex !important;
+  margin-inline-start: 1ex !important;
 }
 
 .menu-accel,
 .menu-iconic-accel {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
-  -moz-margin-start: 7px !important;
-  -moz-margin-end: 2px !important;
-  -moz-padding-end: 14px;
-  color: inherit;
+  margin-inline-start: 7px !important;
+  margin-inline-end: 2px !important;
+  padding-inline-end: 14px;
+  color: #A09090;
 }
 
 .menu-iconic-icon {
-/*
   width: 16px;
   height: 16px;
-*/
 }
 
 .menu-iconic-left {
@@ -170,8 +143,8 @@ menulist > menupopup > menu {
 .menu-right {
   margin-top: 0px;
   margin-bottom: 0px;
-  -moz-margin-start: 3px;
-  -moz-margin-end: 0px;
+  margin-inline-start: 3px;
+  margin-inline-end: 0px;
   width: 8px;
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
   -moz-image-region: auto;
@@ -200,8 +173,8 @@ menulist > menupopup > menu {
 .menubar-left {
   margin-top: 0px;
   margin-bottom: 0px;
-  -moz-margin-start: 0px;
-  -moz-margin-end: 2px;
+  margin-inline-start: 0px;
+  margin-inline-end: 2px;
   color: inherit;
 }
 
@@ -210,9 +183,8 @@ menulist > menupopup > menu {
   color: inherit;
 }
 
-.menulist-menupopup > menuitem > .menu-iconic-left,
 menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
+menulist > menupopup > menucaption > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
   display: none;
 }
@@ -231,6 +203,11 @@ menuitem[checked="true"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 
+menuitem[checked="true"] .menu-iconic-icon {
+  width: auto;
+  height: auto;
+}
+
 /* ::::: radio menuitem ::::: */
 
 menuitem[checked="true"][type="radio"] {
@@ -252,8 +229,7 @@ menuseparator {
   margin: 2px 0px;
 }
 
-menulist > menupopup > menuseparator,
-.menulist-menupopup > menuseparator {
+menulist > menupopup > menuseparator {
   border: 1px solid #9C9CFF;
   margin: 2px 0px;
 }
@@ -263,10 +239,3 @@ menulist > menupopup > menuseparator,
 .autocomplete-history-popup > menuitem {
   max-width: none !important;
 }
-
-/* ::::: tree column picker ::::: */
-
-.treecell-popupcell-menu {
-  -moz-margin-start: -2px;
-  list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
-}