diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-27 15:57:18 +0200 |
| commit | d990d8ab2cade6c928e8bbe56ae038d020cef599 (patch) | |
| tree | c7561ae0f303cb0d4a7a7507178531b4852e4dea /browser/branding | |
| parent | 0c36b27511c1fbca594f0426c493ef601fda3e4c (diff) | |
| parent | 8d5ec757ece850fb7ad5c712868f305636e41177 (diff) | |
| download | UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.gz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.lz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.tar.xz UXP-d990d8ab2cade6c928e8bbe56ae038d020cef599.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_array_values_1
Diffstat (limited to 'browser/branding')
| -rw-r--r-- | browser/branding/official/pref/firefox-branding.js | 4 | ||||
| -rw-r--r-- | browser/branding/shared/branding.mozbuild | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index eb2bf489b..190b84e78 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -37,6 +37,10 @@ pref("app.update.url.manual", "https://@BRANDING_SITEURL@/"); // supplied in the "An update is available" page of the update wizard. pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@"); +// Provide UA Gecko and Firefox slices for web compatibility +pref("general.useragent.compatMode.firefox",true); +pref("general.useragent.compatMode.gecko",true); + // Switch Application Updates off for now pref("app.update.enabled", false); diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild index 29d25094f..e6fee3f4e 100644 --- a/browser/branding/shared/branding.mozbuild +++ b/browser/branding/shared/branding.mozbuild @@ -33,9 +33,9 @@ def ApplicationBranding(): elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': BRANDING_FILES += [ '../shared/dsstore', + 'background.png', 'disk.icns', 'document.icns', - 'background.png', 'firefox.icns', ] elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: @@ -53,4 +53,4 @@ def ApplicationBranding(): ] DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] - DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
\ No newline at end of file + DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] |