From ac7d8a02b874485ec68d1b25e9ebd938f48e976e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 02:23:23 -0500 Subject: Update branding --- browser/branding/official/VisualElements_150.png | Bin 36640 -> 26980 bytes browser/branding/official/VisualElements_70.png | Bin 12083 -> 8871 bytes .../official/basilisk.VisualElementsManifest.xml | 8 ++ browser/branding/official/branding.nsi | 20 ++--- browser/branding/official/configure.sh | 2 +- browser/branding/official/content/about-logo.png | Bin 30788 -> 14030 bytes .../branding/official/content/about-logo@2x.png | Bin 78972 -> 34550 bytes .../branding/official/content/about-wordmark.png | Bin 5186 -> 2645 bytes browser/branding/official/content/about.png | Bin 33169 -> 21948 bytes browser/branding/official/content/aboutDialog.css | 6 ++ browser/branding/official/content/icon48.png | Bin 4096 -> 2809 bytes browser/branding/official/content/icon64.png | Bin 6081 -> 3900 bytes .../official/content/identity-icons-brand.svg | 76 ++++++++++++++++++- .../branding/official/content/silhouette-40.svg | 84 ++++++++++++++------- browser/branding/official/default16.png | Bin 829 -> 820 bytes browser/branding/official/default22.png | Bin 1319 -> 1202 bytes browser/branding/official/default24.png | Bin 1327 -> 1321 bytes browser/branding/official/default256.png | Bin 44148 -> 20203 bytes browser/branding/official/default32.png | Bin 2472 -> 1786 bytes browser/branding/official/default48.png | Bin 4096 -> 2809 bytes browser/branding/official/default64.png | Bin 0 -> 3900 bytes browser/branding/official/document.ico | Bin 72937 -> 39039 bytes .../official/firefox.VisualElementsManifest.xml | 8 -- browser/branding/official/firefox.ico | Bin 85989 -> 44539 bytes browser/branding/official/locales/en-US/brand.dtd | 10 +-- .../official/locales/en-US/brand.properties | 10 +-- browser/branding/official/moz.build | 52 ++++++++++++- browser/branding/official/mozicon128.png | Bin 17225 -> 8635 bytes browser/branding/official/pref/firefox-branding.js | 36 +++++++-- browser/branding/official/wizHeader.bmp | Bin 25820 -> 25818 bytes browser/branding/official/wizHeaderRTL.bmp | Bin 25820 -> 25818 bytes browser/branding/official/wizWatermark.bmp | Bin 154544 -> 154542 bytes 32 files changed, 244 insertions(+), 68 deletions(-) create mode 100644 browser/branding/official/basilisk.VisualElementsManifest.xml create mode 100644 browser/branding/official/default64.png delete mode 100644 browser/branding/official/firefox.VisualElementsManifest.xml (limited to 'browser/branding') diff --git a/browser/branding/official/VisualElements_150.png b/browser/branding/official/VisualElements_150.png index f46b957c2..70b256398 100644 Binary files a/browser/branding/official/VisualElements_150.png and b/browser/branding/official/VisualElements_150.png differ diff --git a/browser/branding/official/VisualElements_70.png b/browser/branding/official/VisualElements_70.png index b45a3400f..64ce3276d 100644 Binary files a/browser/branding/official/VisualElements_70.png and b/browser/branding/official/VisualElements_70.png differ diff --git a/browser/branding/official/basilisk.VisualElementsManifest.xml b/browser/branding/official/basilisk.VisualElementsManifest.xml new file mode 100644 index 000000000..d675d573f --- /dev/null +++ b/browser/branding/official/basilisk.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi index 5960f3107..24b0f4bba 100644 --- a/browser/branding/official/branding.nsi +++ b/browser/branding/official/branding.nsi @@ -8,24 +8,24 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Mozilla Firefox" -!define CompanyName "Mozilla Corporation" -!define URLInfoAbout "https://www.mozilla.org" -!define URLUpdateInfo "https://www.mozilla.org/firefox/${AppVersion}/releasenotes" -!define HelpLink "https://support.mozilla.org" +!define BrandFullNameInternal "Basilisk" +!define CompanyName "Moonchild Productions" +!define URLInfoAbout "https://www.basilisk-browser.org" +!define URLUpdateInfo "https://www.basilisk-browser.org/releasenotes.shtml" +!define HelpLink "https://www.basilisk-browser.org" ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that ; set the update channel to beta. !define OFFICIAL -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=release&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" +!define URLStubDownload "" +!define URLManualDownload "" +!define URLSystemRequirements "" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer -!define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" +!define CertNameDownload "" +!define CertIssuerDownload "" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh index 92ef14e03..49126c4aa 100644 --- a/browser/branding/official/configure.sh +++ b/browser/branding/official/configure.sh @@ -2,4 +2,4 @@ # 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/. -MOZ_APP_DISPLAYNAME=Firefox +MOZ_APP_DISPLAYNAME=Basilisk diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png index c7c5ac2b8..a6c89cf2c 100644 Binary files a/browser/branding/official/content/about-logo.png and b/browser/branding/official/content/about-logo.png differ diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png index 624ad150f..761e47f6e 100644 Binary files a/browser/branding/official/content/about-logo@2x.png and b/browser/branding/official/content/about-logo@2x.png differ diff --git a/browser/branding/official/content/about-wordmark.png b/browser/branding/official/content/about-wordmark.png index c9651b520..4ac8d3557 100644 Binary files a/browser/branding/official/content/about-wordmark.png and b/browser/branding/official/content/about-wordmark.png differ diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png index 7d78057dc..4fc6e5c36 100644 Binary files a/browser/branding/official/content/about.png and b/browser/branding/official/content/about.png differ diff --git a/browser/branding/official/content/aboutDialog.css b/browser/branding/official/content/aboutDialog.css index 46ba1b771..631f06a72 100644 --- a/browser/branding/official/content/aboutDialog.css +++ b/browser/branding/official/content/aboutDialog.css @@ -28,8 +28,14 @@ #rightBox { margin-left: 30px; margin-right: 30px; + background-image: url("chrome://branding/content/about-wordmark.png"); + background-repeat: no-repeat; + /* padding-top creates room for the wordmark */ + padding-top: 38px; + margin-top:20px; } + #updateDeck > hbox > label:not([class="text-link"]) { color: #909090; } diff --git a/browser/branding/official/content/icon48.png b/browser/branding/official/content/icon48.png index 10de89172..e7dcd8ae2 100644 Binary files a/browser/branding/official/content/icon48.png and b/browser/branding/official/content/icon48.png differ diff --git a/browser/branding/official/content/icon64.png b/browser/branding/official/content/icon64.png index ac94fb47d..7bad34f8b 100644 Binary files a/browser/branding/official/content/icon64.png and b/browser/branding/official/content/icon64.png differ diff --git a/browser/branding/official/content/identity-icons-brand.svg b/browser/branding/official/content/identity-icons-brand.svg index 380e4e597..80d2155c2 100644 --- a/browser/branding/official/content/identity-icons-brand.svg +++ b/browser/branding/official/content/identity-icons-brand.svg @@ -1,7 +1,77 @@ - + - - + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/browser/branding/official/content/silhouette-40.svg b/browser/branding/official/content/silhouette-40.svg index 5a41a1c3f..c00a38cb1 100644 --- a/browser/branding/official/content/silhouette-40.svg +++ b/browser/branding/official/content/silhouette-40.svg @@ -1,26 +1,58 @@ - - - - - + + + + + + + + image/svg+xml + + + + + + + + diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png index 33ebba13b..6618c0667 100644 Binary files a/browser/branding/official/default16.png and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png index 2390f0924..d53d5b503 100644 Binary files a/browser/branding/official/default22.png and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png index 737466b5a..1e86c0cdd 100644 Binary files a/browser/branding/official/default24.png and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png index eef767dab..96f72ae15 100644 Binary files a/browser/branding/official/default256.png and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png index e9d5bbb4b..ac39ccf0d 100644 Binary files a/browser/branding/official/default32.png and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png index 10de89172..e7dcd8ae2 100644 Binary files a/browser/branding/official/default48.png and b/browser/branding/official/default48.png differ diff --git a/browser/branding/official/default64.png b/browser/branding/official/default64.png new file mode 100644 index 000000000..7bad34f8b Binary files /dev/null and b/browser/branding/official/default64.png differ diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico index 0957f61e3..525b1a929 100644 Binary files a/browser/branding/official/document.ico and b/browser/branding/official/document.ico differ diff --git a/browser/branding/official/firefox.VisualElementsManifest.xml b/browser/branding/official/firefox.VisualElementsManifest.xml deleted file mode 100644 index d675d573f..000000000 --- a/browser/branding/official/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico index 85ffedfe6..320796dd2 100644 Binary files a/browser/branding/official/firefox.ico and b/browser/branding/official/firefox.ico differ diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd index bb912cf05..7bfa07f71 100644 --- a/browser/branding/official/locales/en-US/brand.dtd +++ b/browser/branding/official/locales/en-US/brand.dtd @@ -2,8 +2,8 @@ - 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/. --> - - - - - + + + + + diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties index b7b267fb3..9bdb66706 100644 --- a/browser/branding/official/locales/en-US/brand.properties +++ b/browser/branding/official/locales/en-US/brand.properties @@ -2,12 +2,12 @@ # 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/. -brandShorterName=Firefox -brandShortName=Firefox -brandFullName=Mozilla Firefox -vendorShortName=Mozilla +brandShorterName=Basilisk +brandShortName=Basilisk +brandFullName=Basilisk +vendorShortName=Moonchild -homePageSingleStartMain=Firefox Start, a fast home page with built-in search +homePageSingleStartMain=Internal home page with search. homePageImport=Import your home page from %S homePageMigrationPageTitle=Home Page Selection diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build index 9045cee11..f1a839c9d 100644 --- a/browser/branding/official/moz.build +++ b/browser/branding/official/moz.build @@ -9,5 +9,53 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -include('../branding-common.mozbuild') -FirefoxBranding() +JS_PREFERENCE_FILES += [ + 'pref/firefox-branding.js', +] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + FINAL_TARGET_FILES['..'] += [ + 'basilisk.VisualElementsManifest.xml', + ] + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', + ] + BRANDING_FILES += [ + 'appname.bmp', + 'bgintro.bmp', + 'branding.nsi', + 'clock.bmp', + 'document.ico', + 'firefox.ico', + 'newtab.ico', + 'newwindow.ico', + 'particles.bmp', + 'pbmode.ico', + 'pencil-rtl.bmp', + 'pencil.bmp', + 'wizHeader.bmp', + 'wizHeaderRTL.bmp', + 'wizWatermark.bmp', + ] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + BRANDING_FILES += [ + 'background.png', + 'disk.icns', + 'document.icns', + 'dsstore', + 'firefox.icns', + ] +elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + BRANDING_FILES += [ + 'default16.png', + 'default32.png', + 'default48.png', + 'mozicon128.png', + ] + FINAL_TARGET_FILES.icons += ['mozicon128.png'] + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default16.png', + 'default32.png', + 'default48.png', + ] diff --git a/browser/branding/official/mozicon128.png b/browser/branding/official/mozicon128.png index 946c31e68..0de78e0ce 100644 Binary files a/browser/branding/official/mozicon128.png and b/browser/branding/official/mozicon128.png differ diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index 35be87314..a3d6927bb 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -2,11 +2,13 @@ * 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/. */ -pref("startup.homepage_override_url", ""); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/"); +pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml"); +pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/"); pref("startup.homepage_welcome_url.additional", ""); + +pref("app.update.url", "https://aus.basilisk-browser.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%"); // Interval: Time between checks for a new version (in seconds) -pref("app.update.interval", 43200); // 12 hours +pref("app.update.interval", 86400); // 1 day // The time interval between the downloading of mar file chunks in the // background (in seconds) // 0 means "download everything at once" @@ -15,15 +17,23 @@ pref("app.update.download.backgroundInterval", 0); pref("app.update.promptWaitTime", 691200); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "https://www.mozilla.org/firefox/"); +pref("app.update.url.manual", "https://www.basilisk-browser.org/"); // 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://www.mozilla.org/%LOCALE%/firefox/notes"); +pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml"); + +// Switch Application Updates off for now +pref("app.update.enabled", false); + +// Version release notes +pref("app.releaseNotesURL", "http://www.basilisk-browser.org/releasenotes.shtml"); +// Vendor home page +pref("app.vendorURL", "http://www.basilisk-browser.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", 63); +pref("app.update.checkInstallTime.days", 14); // Give the user x seconds to reboot before showing a badge on the hamburger // button. default=immediately @@ -31,6 +41,16 @@ pref("app.update.badgeWaitTime", 0); // 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); +pref("devtools.selfxss.count", 100); + +// Disable Google Safebrowsing by default. Without an API key, this won't work. +pref("browser.safebrowsing.phishing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); +pref("browser.safebrowsing.downloads.enabled", false); +pref("browser.safebrowsing.downloads.remote.enabled", false); +// Disable the UI controls for it as well for Basilisk-official. +pref("browser.safebrowsing.UI.enabled", false); + +// FxA override +pref("general.useragent.override.accounts.firefox.com", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Goanna/4.0 Basilisk/55.0.0"); -pref("app.update.enabled", false); diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp index 51bec2211..8f1a0598b 100644 Binary files a/browser/branding/official/wizHeader.bmp and b/browser/branding/official/wizHeader.bmp differ diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp index 7610fbfd0..8f1a0598b 100644 Binary files a/browser/branding/official/wizHeaderRTL.bmp and b/browser/branding/official/wizHeaderRTL.bmp differ diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp index 5326bba93..491f27aa5 100644 Binary files a/browser/branding/official/wizWatermark.bmp and b/browser/branding/official/wizWatermark.bmp differ -- cgit v1.2.3