summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-31 09:41:11 +0200
committerGitHub <noreply@github.com>2018-05-31 09:41:11 +0200
commit14eb8dc7bee8670e39d1199591d335579601f2ad (patch)
tree9a18757a499d03a710d4798e1dd57689f8a20f32
parentbf1454c8ee3d78751852c6098da92c70c715b814 (diff)
parentfa245e46dc127bc4595eefe5f1bcca4c3cd54eec (diff)
downloadUXP-14eb8dc7bee8670e39d1199591d335579601f2ad.tar
UXP-14eb8dc7bee8670e39d1199591d335579601f2ad.tar.gz
UXP-14eb8dc7bee8670e39d1199591d335579601f2ad.tar.lz
UXP-14eb8dc7bee8670e39d1199591d335579601f2ad.tar.xz
UXP-14eb8dc7bee8670e39d1199591d335579601f2ad.zip
Merge pull request #415 from JustOff/PR_default_theme
Fix default theme issues from #414
-rw-r--r--application/palemoon/installer/package-manifest.in2
-rw-r--r--toolkit/themes/shared/non-mac.jar.inc.mn2
2 files changed, 1 insertions, 3 deletions
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index 97a98b7a4..fb5441832 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -199,9 +199,7 @@
@RESPATH@/browser/chrome.manifest
@RESPATH@/browser/chrome/browser@JAREXT@
@RESPATH@/browser/chrome/browser.manifest
-#ifdef XP_WIN
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-#endif
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@RESPATH@/chrome/toolkit@JAREXT@
diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn
index 637537d9d..23f9da519 100644
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -142,7 +142,7 @@
% 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
-% 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
+% override chrome://mozapps/skin/plugins/notifyPluginCrashed.png chrome://mozapps/skin/plugins/pluginGeneric-16.png