From 7555809ad6a1bf6398075e4e4bd14747bf4cce68 Mon Sep 17 00:00:00 2001 From: Paolo Amadini Date: Fri, 13 Jul 2018 10:20:21 +0100 Subject: [PATCH] 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 | 1 + toolkit/content/components.css | 1 - toolkit/content/widgets.css | 1 + toolkit/themes/shared/in-content/common.inc.css | 2 +- toolkit/themes/windows/global/menu.css | 4 ++-- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/browser/base/content/webext-panels.xul b/browser/base/content/webext-panels.xul index 97bcd7c5d914..b821c6ce6510 100644 --- a/browser/base/content/webext-panels.xul +++ b/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/. + diff --git a/toolkit/content/components.css b/toolkit/content/components.css index a6e7dfb98220..355d5738d514 100644 --- a/toolkit/content/components.css +++ b/toolkit/content/components.css @@ -11,5 +11,4 @@ == ======================================================================= */ -@import url("chrome://global/skin/menu.css"); diff --git a/toolkit/content/widgets.css b/toolkit/content/widgets.css index fb9b0eff7ae7..e6a567063a46 100644 --- a/toolkit/content/widgets.css +++ b/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"); diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index 37fe2ca6b09b..0d068d2823ed 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/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; diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css index 9315d2ca24e9..319893f12cfc 100644 --- a/toolkit/themes/windows/global/menu.css +++ b/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; }