From 170b82c2e254d3aa9b4e5f31f26dc89283a472a6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 17 Feb 2018 10:56:35 -0500 Subject: Reduce redundencies in Basilisk branding --- .../unofficial/basilisk.VisualElementsManifest.xml | 8 ++++ browser/branding/unofficial/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/unofficial/clock.bmp | Bin 124214 -> 0 bytes .../unofficial/firefox.VisualElementsManifest.xml | 8 ---- browser/branding/unofficial/moz.build | 4 +- browser/branding/unofficial/newtab.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/particles.bmp | Bin 124216 -> 0 bytes browser/branding/unofficial/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/unofficial/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/unofficial/pencil.bmp | Bin 124214 -> 0 bytes .../branding/unofficial/pref/firefox-branding.js | 47 ++++++++++++--------- 12 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 browser/branding/unofficial/basilisk.VisualElementsManifest.xml delete mode 100644 browser/branding/unofficial/bgintro.bmp delete mode 100644 browser/branding/unofficial/clock.bmp delete mode 100644 browser/branding/unofficial/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/unofficial/newtab.ico delete mode 100644 browser/branding/unofficial/newwindow.ico delete mode 100644 browser/branding/unofficial/particles.bmp delete mode 100644 browser/branding/unofficial/pbmode.ico delete mode 100644 browser/branding/unofficial/pencil-rtl.bmp delete mode 100644 browser/branding/unofficial/pencil.bmp (limited to 'browser/branding/unofficial') diff --git a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml new file mode 100644 index 000000000..7654e0ab7 --- /dev/null +++ b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/browser/branding/unofficial/bgintro.bmp b/browser/branding/unofficial/bgintro.bmp deleted file mode 100644 index 9f2a0a6e0..000000000 Binary files a/browser/branding/unofficial/bgintro.bmp and /dev/null differ diff --git a/browser/branding/unofficial/clock.bmp b/browser/branding/unofficial/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/unofficial/clock.bmp and /dev/null differ diff --git a/browser/branding/unofficial/firefox.VisualElementsManifest.xml b/browser/branding/unofficial/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/unofficial/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/unofficial/moz.build b/browser/branding/unofficial/moz.build index 9045cee11..0d829fa5e 100644 --- a/browser/branding/unofficial/moz.build +++ b/browser/branding/unofficial/moz.build @@ -9,5 +9,5 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -include('../branding-common.mozbuild') -FirefoxBranding() +include('../shared/branding.mozbuild') +ApplicationBranding() diff --git a/browser/branding/unofficial/newtab.ico b/browser/branding/unofficial/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/unofficial/newtab.ico and /dev/null differ diff --git a/browser/branding/unofficial/newwindow.ico b/browser/branding/unofficial/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/unofficial/newwindow.ico and /dev/null differ diff --git a/browser/branding/unofficial/particles.bmp b/browser/branding/unofficial/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/unofficial/particles.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pbmode.ico b/browser/branding/unofficial/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/unofficial/pbmode.ico and /dev/null differ diff --git a/browser/branding/unofficial/pencil-rtl.bmp b/browser/branding/unofficial/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/unofficial/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pencil.bmp b/browser/branding/unofficial/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/unofficial/pencil.bmp and /dev/null differ diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/firefox-branding.js index b20a3a309..a5b617a53 100644 --- a/browser/branding/unofficial/pref/firefox-branding.js +++ b/browser/branding/unofficial/pref/firefox-branding.js @@ -2,32 +2,39 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#filter substitution +#filter emptyLines + +// Set defines to construct URLs +#define BRANDING_BASEURL basilisk-browser.org +#define BRANDING_SITEURL www.@BRANDING_BASEURL@ + +// Shared Branding Preferences +// XXX: These should REALLY go back to application preferences +#include ../../shared/preferences.inc + +// Branding Specific Preferences pref("startup.homepage_override_url", ""); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 86400); // 24 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -pref("app.update.download.backgroundInterval", 60); -// Give the user x seconds to react before showing the big UI. default=24 hours -pref("app.update.promptWaitTime", 86400); + +// Version release notes +pref("app.releaseNotesURL", "about:blank"); + +// Vendor home page +pref("app.vendorURL", "about:"); + +pref("app.update.url", ""); + // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://nightly.mozilla.org"); +pref("app.update.url.manual", "about:"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "https://nightly.mozilla.org"); - -// The number of days a binary is permitted to be old -// without checking for an update. This assumes that -// app.update.checkInstallTime is true. -pref("app.update.checkInstallTime.days", 2); +pref("app.update.url.details", "about:"); -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -pref("app.update.badgeWaitTime", 0); +// Switch Application Updates off for unofficial branding +pref("app.update.enabled", false); -// Number of usages of the web console or scratchpad. -// If this is less than 5, then pasting code into the web console or scratchpad is disabled -pref("devtools.selfxss.count", 0); +// Shared User Agent Overrides +#include ../../shared/uaoverrides.inc -- cgit v1.2.3