X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=EarlyBlue%2Fglobal%2Fmenu.css;h=5f55b3e3ca54cf5ae7fd407b31cfd820d4340f35;hp=b92c5a142ba7ef269059cbbf95b0bc1ca7deaff9;hb=708381dda4ddae3127c953bfcc3ca36ccaa014ed;hpb=8caa872d050772c572257f23011c668f70dcaef7

diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index b92c5a14..5f55b3e3 100644
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/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,11 +11,14 @@
 /* ::::: menu/menuitem ::::: */
 
 menu,
-menuitem {
+menuitem,
+menucaption,
+.splitmenu-menuitem {
   -moz-box-align: center;
   max-width: 42em;
   color: #000000;
   list-style-image: none;
+  -moz-image-region: auto;
 }
 
 menuitem[default="true"] {
@@ -56,21 +26,26 @@ menuitem[default="true"] {
 }
 
 menu[_moz-menuactive="true"],
-menuitem[_moz-menuactive="true"] {
+menuitem[_moz-menuactive="true"],
+.splitmenu-menuitem[_moz-menuactive="true"] {
   background-color: #336699;
   color: #FFFFFF;
 }
 
 menu[disabled="true"],
 menuitem[disabled="true"],
+.splitmenu-menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
-menuitem[_moz-menuactive="true"][disabled="true"] {
+menuitem[_moz-menuactive="true"][disabled="true"],
+.splitmenu-menuitem[_moz-menuactive="true"][disabled="true"] {
   color: #999999;
 }
 
 menubar > menu {
-  padding: 2px 0px 2px 3px;
-  margin: 0px 2px 0px 0px;
+  padding: 2px 1px;
+  padding-inline-start: 2px;
+  margin: 0px 2px;
+  margin-inline-start: 0px;
   border: 1px solid #CCD0DD;
 }
 
@@ -86,6 +61,14 @@ menubar > menu[open] {
   border: 1px inset #CCD0DD;
 }
 
+menubar > menu:-moz-lwtheme {
+  -moz-appearance: none;
+}
+
+menubar > menu:-moz-window-inactive {
+  color: #808080;
+}
+
 menuitem.spell-suggestion {
   font-weight: bold;
 }
@@ -95,20 +78,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;
 }
 
@@ -119,29 +99,39 @@ 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: #808080;
-  -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;
+  margin-inline-start: 7px !important;
+  margin-inline-end: 2px !important;
+  padding-inline-end: 14px;
   color: inherit;
 }
 
@@ -159,8 +149,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;
@@ -174,23 +164,23 @@ menulist > menupopup > menu {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif");
 }
 
-.menu-right[chromedir="rtl"] {
+.menu-right:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-rtl.gif");
 }
 
-.menu-right[chromedir="rtl"][_moz-menuactive="true"] {
+.menu-right:-moz-locale-dir(rtl)[_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-hover-rtl.gif");
 }
 
-.menu-right[chromedir="rtl"][disabled="true"] {
+.menu-right:-moz-locale-dir(rtl)[disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled-rtl.gif");
 }
 
 .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;
 }
 
@@ -199,9 +189,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;
 }
@@ -241,8 +230,7 @@ menuseparator {
   margin: 2px 0px;
 }
 
-menulist > menupopup > menuseparator,
-.menulist-menupopup > menuseparator {
+menulist > menupopup > menuseparator {
   border: 1px inset #CCD0DD;
   margin: 2px 0px;
 }
@@ -256,6 +244,6 @@ menulist > menupopup > menuseparator,
 /* ::::: tree column picker ::::: */
 
 .treecell-popupcell-menu {
-  -moz-margin-start: -2px;
+  margin-inline-start: -2px;
   list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
\ No newline at end of file