Bug 1481754 - Use inheritance for menu fonts. r=mstriemer

browser/base/content/browser.css

@@ -879,9 +879,6 @@ toolbarspring {
 menupopup[emptyplacesresult="true"] > .hide-if-empty-places-result {
   display: none;
 }
-menuitem.spell-suggestion {
-  font-weight: bold;
-}
 
 /* Hide extension toolbars that neglected to set the proper class */
 window[chromehidden~="location"][chromehidden~="toolbar"] toolbar:not(.chromeclass-menubar),

browser/themes/shared/customizableui/panelUI.inc.css

@@ -109,6 +109,11 @@
   stroke: transparent;
 }
 
+.cui-widget-panel,
+#widget-overflow {
+  font: menu;
+}
+
 panelview {
   -moz-box-orient: vertical;
   -moz-box-flex: 1;
@@ -908,7 +913,6 @@ panelview .toolbarbutton-1,
 }
 
 .panel-banner-item > .toolbarbutton-multiline-text {
-  font: menu;
   margin: 0;
   padding: 0;
   padding-inline-start: 8px; /* See '.subviewbutton-iconic > .toolbarbutton-text' rule above. */
@@ -948,15 +952,6 @@ panelview .toolbarbutton-1,
   margin-inline-end: 0 !important; /* to override menu.css on Windows */
 }
 
-#widget-overflow-fixed-list .toolbarbutton-1 > .toolbarbutton-text,
-#widget-overflow-list .toolbarbutton-1 > .toolbarbutton-text,
-.addon-banner-item,
-.subviewbutton,
-.subviewbutton-nav,
-.subview-subheader {
-  font: menu;
-}
-
 .subviewbutton[shortcut]::after {
   content: attr(shortcut);
   float: right;
@@ -1004,12 +999,6 @@ panelview .toolbarbutton-1,
   transform: translateY(2px) scaleX(.75);
 }
 
-/* This is a <label> but it should fit in with the menu font- and colorwise. */
-#PanelUI-characterEncodingView-autodetect-label {
-  font: menu;
-  color: inherit;
-}
-
 .subviewbutton[checked="true"] {
   list-style-image: url(chrome://browser/skin/check.svg);
   -moz-context-properties: fill;
@@ -1027,7 +1016,6 @@ panelview .toolbarbutton-1,
 
 panelmultiview .toolbaritem-combined-buttons > label {
   -moz-box-flex: 1;
-  font: menu;
   margin: 0;
   padding: 4px 0px;
 }
@@ -1086,7 +1074,6 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label {
 }
 
 .toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text {
-  font-size: 1em;
   padding-inline-start: 0;
 }
 

browser/themes/shared/tabs.inc.css

@@ -797,6 +797,7 @@
 }
 
 .all-tabs-item[selected] {
+  font-weight: bold;
   box-shadow: inset 4px 0 var(--blue-40);
 }
 
@@ -804,10 +805,6 @@
   box-shadow: inset -4px 0 var(--blue-40);
 }
 
-.all-tabs-item[selected] > .all-tabs-button {
-  font-weight: bold;
-}
-
 .all-tabs-button {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
 }

toolkit/themes/linux/global/menu.css

@@ -10,6 +10,11 @@
 
 /* ::::: menu/menuitem ::::: */
 
+menupopup,
+menubar {
+  font: menu;
+}
+
 menu,
 menuitem,
 menucaption {
@@ -17,15 +22,10 @@ menucaption {
   -moz-box-align: center;
   max-width: 42em;
   color: MenuText;
-  font: menu;
   list-style-image: none;
   -moz-image-region: auto;
 }
 
-menuitem[default="true"] {
-  font-weight: bold;
-}
-
 menu[_moz-menuactive="true"],
 menuitem[_moz-menuactive="true"] {
   color: -moz-menuhovertext;
@@ -71,18 +71,24 @@ menubar > menu[open] {
   color: -moz-menubarhovertext;
   background-color: -moz-menuhover;
 }
-menuitem.spell-suggestion {
-  font-weight:bold;
+
+menuitem[default="true"],
+menuitem.spell-suggestion,
+menucaption {
+  font-weight: bold;
 }
 
 /* ::::: menu/menuitems in menulist popups ::::: */
 
+menulist > menupopup {
+  font: message-box;
+}
+
 menulist > menupopup > menuitem,
 menulist > menupopup > menucaption,
 menulist > menupopup > menu {
   padding: 1px 5px;
   max-width: none;
-  font: message-box;
 }
 
 /* ..... internal content .... */
@@ -94,18 +100,15 @@ menulist > menupopup > menu {
   margin-bottom: 0px !important;
   margin-inline-start: 0px !important;
   margin-inline-end: 2px !important;
-  color: inherit;
 }
 
 .menu-text {
   /* This is (18 + the size of end-padding on .menu-iconic-left)px */
   margin-inline-start: 21px !important;
-  font-weight: inherit;
 }
 
 menucaption > .menu-iconic-text {
   margin-inline-start: 0 !important;
-  font-weight: bold;
 }
 
 .menu-accel,
@@ -113,7 +116,6 @@ menucaption > .menu-iconic-text {
   margin-top: 0px !important;
   margin-bottom: 0px !important;
   margin-inline-start: 7px !important;
-  color: inherit;
 }
 
 .menu-accel-container {
@@ -149,12 +151,10 @@ menucaption > .menu-iconic-text {
   margin-bottom: 0px;
   margin-inline-start: 0px;
   margin-inline-end: 2px;
-  color: inherit;
 }
 
 .menubar-text {
   margin: 0 1px !important;
-  color: inherit;
 }
 
 

toolkit/themes/osx/global/menu.css

@@ -11,7 +11,6 @@ menucaption {
   -moz-font-smoothing-background-color: -moz-mac-menuitem;
   -moz-box-align: center;
   color: MenuText;
-  font: -moz-pull-down-menu;
   list-style-image: none;
   -moz-image-region: auto;
   padding: 0 21px 2px;
@@ -24,6 +23,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   -moz-font-smoothing-background-color: -moz-mac-menuitem;
 }
 
+menuitem[default="true"],
+menuitem.spell-suggestion,
+menucaption {
+  font-weight: bold;
+}
+
 /* ..... internal content .... */
 
 .menu-text,
@@ -33,16 +38,6 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   margin: 0 !important;
 }
 
-.menu-text,
-.menu-iconic-text {
-  font-weight: inherit;
-  color: inherit;
-}
-
-menucaption > .menu-iconic-text {
-  font-weight: bold;
-}
-
 .menu-iconic-icon {
   height: 16px;
   margin-top: -2px;
@@ -109,16 +104,18 @@ menubar > menu[_moz-menuactive="true"][open="true"] {
 
 .menubar-left {
   margin: 0 2px;
-  color: inherit;
 }
 
 .menubar-text {
   margin: 0 1px !important;
-  color: inherit;
 }
 
 /* ::::: menu/menuitems in popups ::::: */
 
+menupopup {
+  font: -moz-pull-down-menu;
+}
+
 menupopup > menu,
 menupopup > menuitem,
 menupopup > menucaption {
@@ -144,7 +141,6 @@ menulist > menupopup > menuitem,
 menulist > menupopup > menucaption,
 menulist > menupopup > menu {
   max-width: none;
-  font: inherit;
   color: -moz-FieldText;
 }
 

toolkit/themes/windows/global/menu.css

@@ -10,21 +10,21 @@
 
 /* ::::: menu/menuitem ::::: */
 
+menupopup,
+menubar {
+  font: menu;
+}
+
 menu,
 menuitem,
 menucaption {
   -moz-appearance: menuitem;
   -moz-box-align: center;
   color: MenuText;
-  font: menu;
   list-style-image: none;
   -moz-image-region: auto;
 }
 
-menuitem[default="true"] {
-  font-weight: bold;
-}
-
 menu[disabled="true"],
 menuitem[disabled="true"],
 menu[_moz-menuactive="true"][disabled="true"],
@@ -42,7 +42,9 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   }
 }
 
-menuitem.spell-suggestion {
+menuitem[default="true"],
+menuitem.spell-suggestion,
+menucaption {
   font-weight: bold;
 }
 
@@ -54,7 +56,6 @@ menuitem.spell-suggestion {
 .menu-iconic-text {
   margin: 0px !important;
   padding: 1px 0px;
-  color: inherit;
 }
 
 .menu-text {
@@ -64,19 +65,16 @@ menuitem.spell-suggestion {
 
 .menu-text,
 .menu-iconic-text {
-  font-weight: inherit;
   margin-inline-start: 2px !important;
   padding-inline-end: 2px;
 }
 
 menucaption > .menu-iconic-text {
-  font-weight: bold;
   padding-inline-start: 0 !important;
 }
 
 .menu-accel,
 .menu-iconic-accel {
-  color: inherit;
   margin-inline-start: 0.74em !important;
   margin-inline-end: 1.35em !important;
 }
@@ -156,13 +154,8 @@ menubar > menu:-moz-window-inactive {
 
 /* ..... internal content .... */
 
-.menubar-left {
-  color: inherit;
-}
-
 .menubar-text {
   margin: 1px 6px 2px 6px !important;
-  color: inherit;
 }
 
 /* ::::: menu/menuitems in popups ::::: */
@@ -181,6 +174,10 @@ menuitem[_moz-menuactive="true"] {
 
 /* ::::: menu/menuitems in menulist popups ::::: */
 
+menulist > menupopup {
+  font: message-box;
+}
+
 menulist > menupopup > menuitem,
 menulist > menupopup > menucaption,
 menulist > menupopup > menu {
@@ -189,7 +186,6 @@ menulist > menupopup > menu {
   padding-inline-start: 5px;
   padding-inline-end: 5px;
   max-width: none;
-  font: message-box;
   color: -moz-FieldText;
 }