Port bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. rs=bustage-fix
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 16 Apr 2020 15:39:31 +1200
changeset 29314 3b134efc8be7009835963eba6e9bb257bdfc8e47
parent 29313 cb41490f149136ead7de01baffb9473ab810298c
child 29315 5f3a6dc8b2305db6c581df532dac508978c71074
push id17306
push usergeoff@darktrojan.net
push dateThu, 16 Apr 2020 03:40:36 +0000
treeherdercomm-central@5f3a6dc8b230 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1630201
Port bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. rs=bustage-fix
mail/base/jar.mn
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -1,14 +1,14 @@
 #filter substitution
 
 messenger.jar:
 % content messagebody %content/messagebody/ contentaccessible=yes
 % content messenger %content/messenger/ contentaccessible=yes
-% override chrome://browser/skin/preferences/in-content/general.svg chrome://mozapps/skin/extensions/utilities.svg
+% override chrome://browser/skin/preferences/general.svg chrome://mozapps/skin/extensions/utilities.svg
 % override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
 #ifndef MOZILLA_OFFICIAL
 % override chrome://browser/content/browser-development-helpers.js chrome://messenger/content/browser-development-helpers.js
   content/messenger/browser-development-helpers.js (../../common/src/browser-development-helpers.js)
 #endif
     content/messenger/mailWindow.js                 (content/mailWindow.js)
     content/messenger/messageDisplay.js             (content/messageDisplay.js)
     content/messenger/folderDisplay.js              (content/folderDisplay.js)
@@ -139,11 +139,11 @@ comm.jar:
 
 browser.jar:
 # Needed for built_in_addons.json
 % content browser %content/
 # These files are referenced from various toolkit files.
 % skin browser classic/1.0 %skin/
     skin/illustrations/error-malformed-url.svg         (../../../browser/themes/shared/illustrations/error-malformed-url.svg)
     skin/controlcenter/trackers.svg                    (../../../browser/themes/shared/controlcenter/trackers.svg)
-    skin/preferences/in-content/no-search-results.svg  (../../../browser/themes/shared/incontentprefs/no-search-results.svg)
+    skin/preferences/no-search-results.svg             (../../../browser/themes/shared/preferences/no-search-results.svg)
     skin/private-browsing.svg                          (../../../browser/themes/shared/icons/private-browsing.svg)
     skin/warning.svg                                   (../../../browser/themes/shared/warning.svg)