Bug 1470870 - Load "menu.css" as a document stylesheet. r=bgrins

The specificity of some Windows rules is reduced to match other platforms.

MozReview-Commit-ID: 28oUf7b6vCW

--HG--
extra : source : 3c131dac495ed46d524f4de2f92cfe79049aff8f
extra : intermediate-source : 7c1de225e4ab5dff9443c763ad59f5aecd72a593

browser/base/content/webext-panels.xul

@@ -5,6 +5,7 @@
 # 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/.
 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
 

toolkit/content/components.css

@@ -11,5 +11,4 @@
    ==
    ======================================================================= */
 
-@import url("chrome://global/skin/menu.css");
 

toolkit/content/widgets.css

@@ -12,6 +12,7 @@
 @import url("chrome://formautofill/skin/autocomplete-item.css");
 @import url("chrome://global/skin/dropmarker.css");
 @import url("chrome://global/skin/groupbox.css");
+@import url("chrome://global/skin/menu.css");
 @import url("chrome://global/skin/menulist.css");
 @import url("chrome://global/skin/notification.css");
 @import url("chrome://global/skin/richlistbox.css");

toolkit/themes/shared/in-content/common.inc.css

@@ -108,7 +108,7 @@ xul|groupbox > xul|caption {
   padding: 4px 0;
 }
 
-xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.menulist-label):not(.indent):not(.learnMore):not(.tail-with-learn-more),
+xul|groupbox xul|label:not(.menu-accel):not(.menu-iconic-accel):not(.menu-text):not(.menu-iconic-text):not(.menulist-label):not(.indent):not(.learnMore):not(.tail-with-learn-more),
 xul|groupbox xul|description {
   /* !important needed to override toolkit !important rule */
   margin-inline-start: 0 !important;

toolkit/themes/windows/global/menu.css

@@ -90,8 +90,8 @@ menucaption > .menu-iconic-text {
   height: 16px;
 }
 
-menu.menu-iconic > .menu-iconic-left,
-menuitem.menuitem-iconic > .menu-iconic-left {
+.menu-iconic > .menu-iconic-left,
+.menuitem-iconic > .menu-iconic-left {
   -moz-appearance: menuimage;
   padding-top: 2px;
 }