dont put overrides in chrome.manifestfirefox-42-beta

rename the images instead

18 files changed, 24 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 780235a..1fe7cb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,7 @@ if ENABLE_LIGHT
 
 	cp $(lighttempdir)/chrome/browser/sass/browser-light.css $(lighttempdir)/chrome/browser/browser.css
 	rm -rf $(lighttempdir)/chrome/browser/sass
+	rm $(lighttempdir)/chrome/overrides.sh
 
 	cd $(lighttempdir) && \
 		zip -FS -r ../arc-firefox-theme-$(VERSION).xpi *
@@ -37,6 +38,7 @@ if ENABLE_DARKER
 
 	cp $(darkertempdir)/chrome/browser/sass/browser-darker.css $(darkertempdir)/chrome/browser/browser.css
 	rm -rf $(darkertempdir)/chrome/browser/sass
+	rm $(darkertempdir)/chrome/overrides.sh
 
 	sed -i 's/arc-theme/arc-darker-theme/' $(darkertempdir)/chrome.manifest
 	sed -i 's/arc-theme/arc-darker-theme/' $(darkertempdir)/install.rdf
@@ -55,6 +57,7 @@ if ENABLE_DARK
 
 	cp $(darktempdir)/chrome/browser/sass/browser-dark.css $(darktempdir)/chrome/browser/browser.css
 	rm -rf $(darktempdir)/chrome/browser/sass
+	rm $(darktempdir)/chrome/overrides.sh
 
 	sed -i 's/arc-theme/arc-dark-theme/' $(darktempdir)/chrome.manifest
 	sed -i 's/arc-theme/arc-dark-theme/' $(darktempdir)/install.rdf
diff --git a/arc-firefox-theme/chrome.manifest b/arc-firefox-theme/chrome.manifest
index 9ff6fa0..4bb97cb 100644
--- a/arc-firefox-theme/chrome.manifest
+++ b/arc-firefox-theme/chrome.manifest
@@ -2,19 +2,3 @@ skin    browser         arc-theme   chrome/browser/
 skin    communicator    arc-theme   chrome/communicator/
 skin    global          arc-theme   chrome/global/
 skin    mozapps         arc-theme   chrome/mozapps/
-
-override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
-override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-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
-override chrome://mozapps/skin/extensions/category-experiments.png chrome://mozapps/skin/extensions/experimentGeneric.png
-override chrome://mozapps/skin/extensions/category-extensions.png chrome://mozapps/skin/extensions/extensionGeneric.png
-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/passwordmgr/key.png chrome://mozapps/skin/passwordmgr/key-16.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
diff --git a/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon.png b/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon.png
new file mode 100644
index 0000000..a788fff
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon.png
diff --git a/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon16.png b/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon16.png
new file mode 100644
index 0000000..f8536a4
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/feeds/audioFeedIcon16.png
diff --git a/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon.png b/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon.png
new file mode 100644
index 0000000..a788fff
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon.png
diff --git a/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon16.png b/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon16.png
new file mode 100644
index 0000000..f8536a4
--- /dev/null
+++ b/arc-firefox-theme/chrome/browser/feeds/videoFeedIcon16.png
diff --git a/arc-firefox-theme/chrome/global/arrow/arrow-lft-hov.gif b/arc-firefox-theme/chrome/global/arrow/arrow-lft-hov.gif
new file mode 100644
index 0000000..f209383
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/arrow/arrow-lft-hov.gif
diff --git a/arc-firefox-theme/chrome/global/arrow/arrow-rit-hov.gif b/arc-firefox-theme/chrome/global/arrow/arrow-rit-hov.gif
new file mode 100644
index 0000000..3abf3ad
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/arrow/arrow-rit-hov.gif
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-dictionaries.png b/arc-firefox-theme/chrome/mozapps/extensions/category-dictionaries.png
new file mode 100644
index 0000000..a1e0d53
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/extensions/category-dictionaries.png
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-experiments.png b/arc-firefox-theme/chrome/mozapps/extensions/category-experiments.png
new file mode 100644
index 0000000..a9d0054
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/extensions/category-experiments.png
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png b/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png
new file mode 100644
index 0000000..2ae95a5
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-languages.png b/arc-firefox-theme/chrome/mozapps/extensions/category-languages.png
new file mode 100644
index 0000000..c721159
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/extensions/category-languages.png
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-themes.png b/arc-firefox-theme/chrome/mozapps/extensions/category-themes.png
new file mode 100644
index 0000000..cde1c78
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/extensions/category-themes.png
diff --git a/arc-firefox-theme/chrome/mozapps/passwordmgr/key.png b/arc-firefox-theme/chrome/mozapps/passwordmgr/key.png
index b5e8afe..9472be0 100644
--- a/arc-firefox-theme/chrome/mozapps/passwordmgr/key.png
+++ b/arc-firefox-theme/chrome/mozapps/passwordmgr/key.png
diff --git a/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginCrashed.png b/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginCrashed.png
new file mode 100644
index 0000000..34cabf8
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginCrashed.png
diff --git a/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginGeneric.png b/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginGeneric.png
new file mode 100644
index 0000000..34cabf8
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/plugins/notifyPluginGeneric.png
diff --git a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png
new file mode 100644
index 0000000..2ae95a5
--- /dev/null
+++ b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png
diff --git a/arc-firefox-theme/chrome/overrides.sh b/arc-firefox-theme/chrome/overrides.sh
new file mode 100755
index 0000000..5bb4160
--- /dev/null
+++ b/arc-firefox-theme/chrome/overrides.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cp browser/feeds/feedIcon.png browser/feeds/audioFeedIcon.png
+cp browser/feeds/feedIcon16.png browser/feeds/audioFeedIcon16.png
+cp browser/feeds/feedIcon.png browser/feeds/videoFeedIcon.png
+cp browser/feeds/feedIcon16.png browser/feeds/videoFeedIcon16.png
+
+cp global/arrow/arrow-lft.gif global/arrow/arrow-lft-hov.gif
+cp global/arrow/arrow-rit.gif global/arrow/arrow-rit-hov.gif
+
+cp mozapps/extensions/dictionaryGeneric.png mozapps/extensions/category-dictionaries.png
+cp mozapps/extensions/experimentGeneric.png mozapps/extensions/category-experiments.png
+cp mozapps/extensions/extensionGeneric.png mozapps/extensions/category-extensions.png
+cp mozapps/extensions/localeGeneric.png mozapps/extensions/category-languages.png
+cp mozapps/extensions/themeGeneric.png mozapps/extensions/category-themes.png
+cp mozapps/extensions/extensionGeneric.png mozapps/xpinstall/xpinstallItemGeneric.png
+
+cp mozapps/passwordmgr/key-16.png mozapps/passwordmgr/key.png
+
+cp mozapps/plugins/pluginGeneric-16.png mozapps/plugins/notifyPluginCrashed.png
+cp mozapps/plugins/pluginGeneric-16.png mozapps/plugins/notifyPluginGeneric.png