From 867dc97d284d96937a8b709a0aae3b5adff211b2 Mon Sep 17 00:00:00 2001 From: Sam Foster Date: Mon, 21 Mar 2022 21:59:01 +0000 Subject: [PATCH] Bug 1760175 - Avoid loading contextmenu.css for MacOS. r=dao * Restore the exclusion of the context menu styling for MacOS in the manifest and the shared browser styles Differential Revision: https://phabricator.services.mozilla.com/D141523 --- browser/themes/linux/browser.css | 1 + browser/themes/linux/jar.mn | 5 +++-- browser/themes/shared/browser-shared.css | 1 - browser/themes/shared/jar.inc.mn | 3 +-- browser/themes/windows/browser.css | 1 + browser/themes/windows/jar.mn | 1 + 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 09400f0cf140..2416a24dcae6 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @import url("chrome://browser/skin/browser-shared.css"); +@import url("chrome://browser/skin/contextmenu.css"); @namespace html url("http://www.w3.org/1999/xhtml"); diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 4c05d37310f8..404a88b218c6 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -7,13 +7,14 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/browser.css + skin/classic/browser/contextmenu.css (../shared/contextmenu.css) skin/classic/browser/monitor-base.png skin/classic/browser/monitor-border.png skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png - skin/classic/browser/webRTC-legacy-indicator.css (../shared/webRTC-legacy-indicator.css) + skin/classic/browser/webRTC-legacy-indicator.css (../shared/webRTC-legacy-indicator.css) skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css) - skin/classic/browser/downloads/allDownloadsView.css (downloads/allDownloadsView.css) + skin/classic/browser/downloads/allDownloadsView.css (downloads/allDownloadsView.css) skin/classic/browser/downloads/downloads.css (downloads/downloads.css) skin/classic/browser/places/editBookmark.css (places/editBookmark.css) skin/classic/browser/places/organizer.css (places/organizer.css) diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css index 176c381f4da6..3c5f4c2d2a0a 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css @@ -22,7 +22,6 @@ @import url("chrome://browser/skin/ctrlTab.css"); @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); -@import url("chrome://browser/skin/contextmenu.css"); @namespace html url("http://www.w3.org/1999/xhtml"); diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 178c01cc4c25..0719d02d043e 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -17,9 +17,8 @@ skin/classic/browser/autocomplete.css (../shared/autocomplete.css) skin/classic/browser/blockedSite.css (../shared/blockedSite.css) skin/classic/browser/browser-shared.css (../shared/browser-shared.css) - skin/classic/browser/contextmenu.css (../shared/contextmenu.css) skin/classic/browser/ctrlTab.css (../shared/ctrlTab.css) - skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) + skin/classic/browser/light-dark-overrides.css (../shared/light-dark-overrides.css) skin/classic/browser/error-pages.css (../shared/error-pages.css) skin/classic/browser/menupanel.css (../shared/menupanel.css) skin/classic/browser/notification-icons.css (../shared/notification-icons.css) diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 18d1a8270674..ff8f502dfaa9 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @import url("chrome://browser/skin/browser-shared.css"); +@import url("chrome://browser/skin/contextmenu.css"); @import url("chrome://browser/skin/browser-custom-colors.css"); @import url("chrome://browser/skin/browser-aero.css"); diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 34e36ec50eb4..9133c04c3062 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -9,6 +9,7 @@ browser.jar: skin/classic/browser/browser.css skin/classic/browser/browser-custom-colors.css (../shared/browser-custom-colors.css) skin/classic/browser/browser-aero.css + skin/classic/browser/contextmenu.css (../shared/contextmenu.css) skin/classic/browser/monitor-base.png skin/classic/browser/monitor-border.png skin/classic/browser/pageInfo.css