Bug 1420229 - Import menu.css in xul.css instead of global.css draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Wed, 10 Jan 2018 15:06:26 -0800
changeset 1393931 3388c02febac14e328a9fdb6f9df7015f7825c55
parent 1393930 b6c9a917f0d4a88608b94393d7d84a01e85aa15a
child 1393932 43dc981b70940d00f5a35533210e4895696a697c
push id245530
push userbgrinstead@mozilla.com
push dateWed, 10 Jan 2018 23:06:47 +0000
treeherdertry@43dc981b7094 [default view] [failures only]
bugs1420229
milestone59.0a1
Bug 1420229 - Import menu.css in xul.css instead of global.css This allows it to be loaded as a UA style instead of a document style to keep the priority closer to a XBL stylesheet MozReview-Commit-ID: 5dv7o3tZ9ik
toolkit/content/xul.css
toolkit/themes/linux/global/global.css
toolkit/themes/osx/global/global.css
toolkit/themes/windows/global/global.css
toolkit/themes/windows/global/menu.css
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -14,16 +14,18 @@
  * widgets of a particular application should be in that application's style
  * sheet.  For example, style definitions for navigator can be found in
  * navigator.css.
  *
  * THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST
  * HAVING YOUR CHANGES REVIEWED BY enndeakin@gmail.com
  */
 
+@import url("chrome://global/skin/menu.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 @namespace xbl url("http://www.mozilla.org/xbl"); /* namespace for XBL elements */
 
 :root {
   --animation-easing-function: cubic-bezier(.07, .95, 0, 1);
 }
 
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -3,17 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
-@import url("chrome://global/skin/menu.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 menulist > menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -1,15 +1,14 @@
 /* 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/. */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
-@import url("chrome://global/skin/menu.css");
 
 %include shared.inc
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 menulist > menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -3,17 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 /* all localizable skin settings shall live here */
 @import url("chrome://global/locale/intl.css");
-@import url("chrome://global/skin/menu.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: XBL bindings ::::: */
 
 menulist > menupopup {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -149,22 +149,16 @@ menubar > menu:-moz-lwtheme[_moz-menuact
   }
 
   menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
     color: inherit !important;
     text-shadow: inherit;
   }
 }
 
-%ifdef XP_WIN
-menubar > menu:-moz-window-inactive {
-  color: ThreeDShadow;
-}
-%endif
-
 /* ..... internal content .... */
 
 .menubar-left {
   color: inherit;
 }
 
 .menubar-text {
   margin: 1px 6px 2px 6px !important;