diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-10 02:51:36 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-10 02:51:36 -0500 |
| commit | 37d5300335d81cecbecc99812747a657588c63eb (patch) | |
| tree | 765efa3b6a56bb715d9813a8697473e120436278 /toolkit/themes/shared/non-mac.jar.inc.mn | |
| parent | b2bdac20c02b12f2057b9ef70b0a946113a00e00 (diff) | |
| parent | 4fb11cd5966461bccc3ed1599b808237be6b0de9 (diff) | |
| download | UXP-37d5300335d81cecbecc99812747a657588c63eb.tar UXP-37d5300335d81cecbecc99812747a657588c63eb.tar.gz UXP-37d5300335d81cecbecc99812747a657588c63eb.tar.lz UXP-37d5300335d81cecbecc99812747a657588c63eb.tar.xz UXP-37d5300335d81cecbecc99812747a657588c63eb.zip | |
Merge branch 'ext-work'
Diffstat (limited to 'toolkit/themes/shared/non-mac.jar.inc.mn')
| -rw-r--r-- | toolkit/themes/shared/non-mac.jar.inc.mn | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 859f1ba4a..a783bbb3c 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -107,27 +107,32 @@ skin/classic/mozapps/downloads/downloadButtons.png (../../windows/mozapps/downloads/downloadButtons.png) skin/classic/mozapps/downloads/unknownContentType.css (../../windows/mozapps/downloads/unknownContentType.css) - skin/classic/mozapps/extensions/about.css (../../windows/mozapps/extensions/about.css) - skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/extensions/blocklist.css) - skin/classic/mozapps/extensions/update.css (../../windows/mozapps/extensions/update.css) - skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/extensions/discover-logo.png) - skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/extensions/experimentGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/extensions/cancel.png) - skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/extensions/eula.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/about.css (../../windows/mozapps/webextensions/about.css) + skin/classic/mozapps/extensions/blocklist.css (../../windows/mozapps/webextensions/blocklist.css) + skin/classic/mozapps/extensions/update.css (../../windows/mozapps/webextensions/update.css) + skin/classic/mozapps/extensions/discover-logo.png (../../windows/mozapps/webextensions/discover-logo.png) + skin/classic/mozapps/extensions/experimentGeneric.png (../../windows/mozapps/webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (../../windows/mozapps/webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (../../windows/mozapps/webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (../../windows/mozapps/webextensions/cancel.png) + skin/classic/mozapps/extensions/eula.css (../../windows/mozapps/webextensions/eula.css) +#endif skin/classic/mozapps/handling/handling.css (../../windows/mozapps/handling/handling.css) skin/classic/mozapps/plugins/pluginBlocked-64.png (../../windows/mozapps/plugins/pluginBlocked-64.png) skin/classic/mozapps/plugins/pluginHelp-16.png (../../windows/mozapps/plugins/pluginHelp-16.png) skin/classic/mozapps/profile/profileSelection.css (../../windows/mozapps/profile/profileSelection.css) skin/classic/mozapps/update/downloadButtons.png (../../windows/mozapps/update/downloadButtons.png) -* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/extensions/xpinstallConfirm.css) +#ifdef MOZ_WEBEXTENSIONS +* skin/classic/mozapps/xpinstall/xpinstallConfirm.css (../../windows/mozapps/webextensions/xpinstallConfirm.css) +#endif #ifdef MOZ_PHOENIX [browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif % override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif % override chrome://mozapps/skin/extensions/category-dictionaries.png chrome://mozapps/skin/extensions/dictionaryGeneric.png @@ -138,4 +143,4 @@ % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/plugins/notifyPluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-16.png % override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.png - +#endif |