Merge branch 'master' into firefox-42-beta

3 files changed, 31 insertions, 3 deletions

diff --git a/README.md b/README.md
index 5a8b267..2accf7a 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Offical [Arc](https://github.com/horst3180/Arc-theme) Firefox theme.
 
 
 ### Requirements
-This theme is compatible with Firefox 40+.
+This theme is compatible with Firefox 40+ and Firefox 38 ESR
 
 **Note**: This theme is meant to be used in conjunction with the [Arc GTK theme](https://github.com/horst3180/Arc-theme), don't use it with other GTK themes or it will look broken.
 
@@ -32,12 +32,16 @@ These instructions are for testers and package maintainers. They also allow to i
 
 You will need `autoconf` and `automake` for the following.
 
-Generate the .xpi files
+Clone the repository
+
+    git clone https://github.com/horst3180/arc-firefox-theme && cd arc-firefox-theme
+
+Generate the .xpi files (drag and drop these into your Firefox window)
 
     ./autogen.sh --prefix=/usr
     make mkxpi
 
-The theme can be installed globally with
+Alternatively the theme can be installed globally without using the .xpi files
 
     ./autogen.sh --prefix=/usr
     sudo make install
@@ -51,3 +55,11 @@ Other build options to append to `autogen.sh` are
 Uninstall the theme with
 
     sudo make uninstall
+
+#### Firefox 38 ESR (Debian Stable users see here)
+There is a separate Firefox 38 ESR compatible branch. The installation process is mostly identical to the manual installation above
+
+    git clone https://github.com/horst3180/arc-firefox-theme && cd arc-firefox-theme
+    git checkout firefox-38-esr
+    ./autogen.sh --prefix=/usr
+    make mkxpi
diff --git a/arc-firefox-theme/chrome.manifest b/arc-firefox-theme/chrome.manifest
index 4bb97cb..9ff6fa0 100644
--- a/arc-firefox-theme/chrome.manifest
+++ b/arc-firefox-theme/chrome.manifest
@@ -2,3 +2,19 @@ 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/tabbrowser/loading.png b/arc-firefox-theme/chrome/browser/tabbrowser/loading.png
index a2f9b79..55f25e5 100644
--- a/arc-firefox-theme/chrome/browser/tabbrowser/loading.png
+++ b/arc-firefox-theme/chrome/browser/tabbrowser/loading.png