fourth and last part of syncing LCARStrek with Firefox 55 browser windows theme changes

[themes.git] / LCARStrek / global / menu.css

diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index 41988d1e5c548177aef00335e945595b6be97999..935b284cc0890cf2bab1bd8a37e306a44822a998 100644 (file)
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -12,13 +12,13 @@
 
 menu,
 menuitem,
-.splitmenu-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"] {
@@ -26,25 +26,22 @@ menuitem[default="true"] {
 }
 
 menu[_moz-menuactive="true"],
-menuitem[_moz-menuactive="true"],
-.splitmenu-menuitem[_moz-menuactive="true"] {
+menuitem[_moz-menuactive="true"] {
   background-color: #FFCF00;
   color: #000000;
 }
 
 menu[disabled="true"],
 menuitem[disabled="true"],
-.splitmenu-menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
-menuitem[_moz-menuactive="true"][disabled="true"],
-.splitmenu-menuitem[_moz-menuactive="true"][disabled="true"] {
+menuitem[_moz-menuactive="true"][disabled="true"] {
   color: #8050B0;
 }
 
 menubar > menu {
   padding: 2px;
   margin: 0px;
-  -moz-margin-start: 2px;
+  margin-inline-start: 2px;
   border: none;
 }
 
@@ -77,15 +74,15 @@ 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: 1px 5px;
   max-width: none;
@@ -98,41 +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 {
-  -moz-margin-end: 3px !important;
+  margin-inline-end: 3px !important;
 }
 
 .menu-text {
-  -moz-margin-start: 19px !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 {
@@ -142,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;
@@ -172,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;
 }
 
@@ -182,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;
 }
@@ -193,7 +193,6 @@ menulist > menupopup > menu > .menu-iconic-left {
 
 menuitem[checked="true"] { /* [type="checkbox"] */
   list-style-image: url("chrome://global/skin/menu/menu-check.gif");
-  -moz-image-region: auto;
 }
 
 menuitem[checked="true"][_moz-menuactive="true"] {
@@ -204,11 +203,15 @@ 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"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio.gif");
-  -moz-image-region: auto;
 }
 
 menuitem[checked="true"][type="radio"][_moz-menuactive="true"] {
@@ -226,8 +229,7 @@ menuseparator {
   margin: 2px 0px;
 }
 
-menulist > menupopup > menuseparator,
-.menulist-menupopup > menuseparator {
+menulist > menupopup > menuseparator {
   border: 1px solid #9C9CFF;
   margin: 2px 0px;
 }
@@ -237,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");
-}