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/osx/mozapps/jar.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/osx/mozapps/jar.mn')
| -rw-r--r-- | toolkit/themes/osx/mozapps/jar.mn | 64 |
1 files changed, 35 insertions, 29 deletions
diff --git a/toolkit/themes/osx/mozapps/jar.mn b/toolkit/themes/osx/mozapps/jar.mn index 3f5717073..8da83da16 100644 --- a/toolkit/themes/osx/mozapps/jar.mn +++ b/toolkit/themes/osx/mozapps/jar.mn @@ -8,34 +8,36 @@ toolkit.jar: skin/classic/mozapps/downloads/downloadIcon.png (downloads/downloadIcon.png) * skin/classic/mozapps/downloads/downloads.css (downloads/downloads.css) skin/classic/mozapps/downloads/unknownContentType.css (downloads/unknownContentType.css) - skin/classic/mozapps/extensions/category-search.png (extensions/category-search.png) - skin/classic/mozapps/extensions/category-discover.png (extensions/category-discover.png) - skin/classic/mozapps/extensions/category-plugins.png (extensions/category-plugins.png) - skin/classic/mozapps/extensions/category-service.png (extensions/category-service.png) - skin/classic/mozapps/extensions/category-dictionaries.png (extensions/category-dictionaries.png) - skin/classic/mozapps/extensions/category-experiments.png (extensions/category-experiments.png) - skin/classic/mozapps/extensions/category-recent.png (extensions/category-recent.png) - skin/classic/mozapps/extensions/category-available.png (extensions/category-available.png) - skin/classic/mozapps/extensions/discover-logo.png (extensions/discover-logo.png) - skin/classic/mozapps/extensions/extensionGeneric-16.png (extensions/extensionGeneric-16.png) - skin/classic/mozapps/extensions/themeGeneric.png (extensions/themeGeneric.png) - skin/classic/mozapps/extensions/themeGeneric-16.png (extensions/themeGeneric-16.png) - skin/classic/mozapps/extensions/dictionaryGeneric.png (extensions/dictionaryGeneric.png) - skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png) - skin/classic/mozapps/extensions/experimentGeneric.png (extensions/experimentGeneric.png) - skin/classic/mozapps/extensions/localeGeneric.png (extensions/localeGeneric.png) - skin/classic/mozapps/extensions/rating-won.png (extensions/rating-won.png) - skin/classic/mozapps/extensions/rating-not-won.png (extensions/rating-not-won.png) - skin/classic/mozapps/extensions/cancel.png (extensions/cancel.png) - skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (extensions/toolbarbutton-dropmarker.png) - skin/classic/mozapps/extensions/heart.png (extensions/heart.png) - skin/classic/mozapps/extensions/search.png (extensions/search.png) - skin/classic/mozapps/extensions/about.css (extensions/about.css) -* skin/classic/mozapps/extensions/extensions.css (extensions/extensions.css) - skin/classic/mozapps/extensions/update.css (extensions/update.css) - skin/classic/mozapps/extensions/eula.css (extensions/eula.css) - skin/classic/mozapps/extensions/blocklist.css (extensions/blocklist.css) -* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/extensions/category-search.png (webextensions/category-search.png) + skin/classic/mozapps/extensions/category-discover.png (webextensions/category-discover.png) + skin/classic/mozapps/extensions/category-plugins.png (webextensions/category-plugins.png) + skin/classic/mozapps/extensions/category-service.png (webextensions/category-service.png) + skin/classic/mozapps/extensions/category-dictionaries.png (webextensions/category-dictionaries.png) + skin/classic/mozapps/extensions/category-experiments.png (webextensions/category-experiments.png) + skin/classic/mozapps/extensions/category-recent.png (webextensions/category-recent.png) + skin/classic/mozapps/extensions/category-available.png (webextensions/category-available.png) + skin/classic/mozapps/extensions/discover-logo.png (webextensions/discover-logo.png) + skin/classic/mozapps/extensions/extensionGeneric-16.png (webextensions/extensionGeneric-16.png) + skin/classic/mozapps/extensions/themeGeneric.png (webextensions/themeGeneric.png) + skin/classic/mozapps/extensions/themeGeneric-16.png (webextensions/themeGeneric-16.png) + skin/classic/mozapps/extensions/dictionaryGeneric.png (webextensions/dictionaryGeneric.png) + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (webextensions/dictionaryGeneric-16.png) + skin/classic/mozapps/extensions/experimentGeneric.png (webextensions/experimentGeneric.png) + skin/classic/mozapps/extensions/localeGeneric.png (webextensions/localeGeneric.png) + skin/classic/mozapps/extensions/rating-won.png (webextensions/rating-won.png) + skin/classic/mozapps/extensions/rating-not-won.png (webextensions/rating-not-won.png) + skin/classic/mozapps/extensions/cancel.png (webextensions/cancel.png) + skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png (webextensions/toolbarbutton-dropmarker.png) + skin/classic/mozapps/extensions/heart.png (webextensions/heart.png) + skin/classic/mozapps/extensions/search.png (webextensions/search.png) + skin/classic/mozapps/extensions/about.css (webextensions/about.css) +* skin/classic/mozapps/extensions/extensions.css (webextensions/extensions.css) + skin/classic/mozapps/extensions/update.css (webextensions/update.css) + skin/classic/mozapps/extensions/eula.css (webextensions/eula.css) + skin/classic/mozapps/extensions/blocklist.css (webextensions/blocklist.css) +* skin/classic/mozapps/extensions/newaddon.css (webextensions/newaddon.css) +#endif skin/classic/mozapps/plugins/notifyPluginGeneric.png (plugins/notifyPluginGeneric.png) skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png) skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png) @@ -48,7 +50,9 @@ toolkit.jar: skin/classic/mozapps/update/buttons.png (update/buttons.png) * skin/classic/mozapps/update/updates.css (update/updates.css) skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css) - skin/classic/mozapps/xpinstall/xpinstallConfirm.css (extensions/xpinstallConfirm.css) +#ifdef MOZ_WEBEXTENSIONS + skin/classic/mozapps/xpinstall/xpinstallConfirm.css (webextensions/xpinstallConfirm.css) +#endif skin/classic/mozapps/handling/handling.css (handling/handling.css) #ifdef MOZ_PHOENIX @@ -56,7 +60,9 @@ toolkit.jar: #elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: #endif +#ifdef MOZ_WEBEXTENSIONS % override chrome://mozapps/skin/extensions/category-extensions.svg chrome://mozapps/skin/extensions/extensionGeneric.svg % override chrome://mozapps/skin/extensions/category-languages.png chrome://mozapps/skin/extensions/localeGeneric.png % override chrome://mozapps/skin/extensions/category-themes.png chrome://mozapps/skin/extensions/themeGeneric.png +#endif % override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/notifyPluginGeneric.png |