From 4e38ba8670623ed8e68aed5fd10fdb66eca66826 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 6 Apr 2018 21:40:39 +0200 Subject: Instate unofficial branding (`Serpent`) --- browser/LICENSE | 10 +- browser/branding/unofficial/VisualElements_150.png | Bin 37693 -> 16524 bytes browser/branding/unofficial/VisualElements_70.png | Bin 11763 -> 6827 bytes .../unofficial/basilisk.VisualElementsManifest.xml | 8 -- browser/branding/unofficial/branding.nsi | 18 ++-- browser/branding/unofficial/configure.sh | 2 +- .../unofficial/content/about-background.png | Bin 88500 -> 63599 bytes browser/branding/unofficial/content/about-logo.png | Bin 30469 -> 16835 bytes .../branding/unofficial/content/about-logo@2x.png | Bin 81662 -> 41517 bytes .../branding/unofficial/content/about-wordmark.svg | 101 +++++++++++++++++---- browser/branding/unofficial/content/about.png | Bin 54712 -> 22324 bytes browser/branding/unofficial/content/icon48.png | Bin 3442 -> 2909 bytes browser/branding/unofficial/content/icon64.png | Bin 5096 -> 3850 bytes browser/branding/unofficial/default16.png | Bin 901 -> 793 bytes browser/branding/unofficial/default32.png | Bin 2037 -> 1748 bytes browser/branding/unofficial/default48.png | Bin 3441 -> 2909 bytes browser/branding/unofficial/firefox.icns | Bin 648208 -> 69916 bytes browser/branding/unofficial/firefox.ico | Bin 74588 -> 45953 bytes .../branding/unofficial/locales/en-US/brand.dtd | 9 +- .../unofficial/locales/en-US/brand.properties | 9 +- browser/branding/unofficial/mozicon128.png | Bin 13817 -> 9246 bytes .../unofficial/serpent.VisualElementsManifest.xml | 8 ++ 22 files changed, 118 insertions(+), 47 deletions(-) delete mode 100644 browser/branding/unofficial/basilisk.VisualElementsManifest.xml create mode 100644 browser/branding/unofficial/serpent.VisualElementsManifest.xml (limited to 'browser') diff --git a/browser/LICENSE b/browser/LICENSE index 99d9d6bcd..f1b2067a7 100644 --- a/browser/LICENSE +++ b/browser/LICENSE @@ -2,6 +2,10 @@ Please see the file ../toolkit/content/license.html for the copyright licensing conditions attached to this codebase, including copies of the licenses concerned. -You are not granted rights or licenses to the trademarks of the -Mozilla Foundation or any party, including without limitation the -Firefox name or logo. +You are not granted rights or licenses to the trademarks of Moonchild +Productions or any other party, including without limitation the +Basilisk name or logo. + +The Serpent logo in branding/unofficial is derived from "Sea Serpent" +by Lorc, licensed under the Creative Commons license CC-BY 3.0 + diff --git a/browser/branding/unofficial/VisualElements_150.png b/browser/branding/unofficial/VisualElements_150.png index 461961e8d..eb74e4adc 100644 Binary files a/browser/branding/unofficial/VisualElements_150.png and b/browser/branding/unofficial/VisualElements_150.png differ diff --git a/browser/branding/unofficial/VisualElements_70.png b/browser/branding/unofficial/VisualElements_70.png index aad81f40d..571532a9b 100644 Binary files a/browser/branding/unofficial/VisualElements_70.png and b/browser/branding/unofficial/VisualElements_70.png differ diff --git a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/unofficial/basilisk.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/unofficial/branding.nsi b/browser/branding/unofficial/branding.nsi index 34214453f..77f08a4cb 100644 --- a/browser/branding/unofficial/branding.nsi +++ b/browser/branding/unofficial/branding.nsi @@ -8,19 +8,19 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Mozilla Developer Preview" -!define CompanyName "mozilla.org" -!define URLInfoAbout "https://www.mozilla.org" -!define HelpLink "https://support.mozilla.org" +!define BrandFullNameInternal "Serpent" +!define CompanyName "Moonchild Productions" +!define URLInfoAbout "http://www.basilisk-browser.org" +!define HelpLink "https://forum.palemoon.org" -!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 "unofficial" # 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/unofficial/configure.sh b/browser/branding/unofficial/configure.sh index edd3bd3e8..ea4e37e45 100644 --- a/browser/branding/unofficial/configure.sh +++ b/browser/branding/unofficial/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=Nightly +MOZ_APP_DISPLAYNAME=Serpent diff --git a/browser/branding/unofficial/content/about-background.png b/browser/branding/unofficial/content/about-background.png index 70eb8dafd..e36211b08 100644 Binary files a/browser/branding/unofficial/content/about-background.png and b/browser/branding/unofficial/content/about-background.png differ diff --git a/browser/branding/unofficial/content/about-logo.png b/browser/branding/unofficial/content/about-logo.png index 4c7214ba3..c5a838178 100644 Binary files a/browser/branding/unofficial/content/about-logo.png and b/browser/branding/unofficial/content/about-logo.png differ diff --git a/browser/branding/unofficial/content/about-logo@2x.png b/browser/branding/unofficial/content/about-logo@2x.png index 3526eda54..48c31564c 100644 Binary files a/browser/branding/unofficial/content/about-logo@2x.png and b/browser/branding/unofficial/content/about-logo@2x.png differ diff --git a/browser/branding/unofficial/content/about-wordmark.svg b/browser/branding/unofficial/content/about-wordmark.svg index 60b278d03..ce7a5c07b 100644 --- a/browser/branding/unofficial/content/about-wordmark.svg +++ b/browser/branding/unofficial/content/about-wordmark.svg @@ -1,22 +1,87 @@ - + - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/browser/branding/unofficial/content/about.png b/browser/branding/unofficial/content/about.png index 231449344..e323c8df5 100644 Binary files a/browser/branding/unofficial/content/about.png and b/browser/branding/unofficial/content/about.png differ diff --git a/browser/branding/unofficial/content/icon48.png b/browser/branding/unofficial/content/icon48.png index 5fc7861e5..16e022a64 100644 Binary files a/browser/branding/unofficial/content/icon48.png and b/browser/branding/unofficial/content/icon48.png differ diff --git a/browser/branding/unofficial/content/icon64.png b/browser/branding/unofficial/content/icon64.png index 83f7016bc..9860917e3 100644 Binary files a/browser/branding/unofficial/content/icon64.png and b/browser/branding/unofficial/content/icon64.png differ diff --git a/browser/branding/unofficial/default16.png b/browser/branding/unofficial/default16.png index d285a90b4..67ef39df8 100644 Binary files a/browser/branding/unofficial/default16.png and b/browser/branding/unofficial/default16.png differ diff --git a/browser/branding/unofficial/default32.png b/browser/branding/unofficial/default32.png index 95adf2497..2f709e6b2 100644 Binary files a/browser/branding/unofficial/default32.png and b/browser/branding/unofficial/default32.png differ diff --git a/browser/branding/unofficial/default48.png b/browser/branding/unofficial/default48.png index d38185f54..02a1e14c1 100644 Binary files a/browser/branding/unofficial/default48.png and b/browser/branding/unofficial/default48.png differ diff --git a/browser/branding/unofficial/firefox.icns b/browser/branding/unofficial/firefox.icns index 0c6941acf..2c613634b 100644 Binary files a/browser/branding/unofficial/firefox.icns and b/browser/branding/unofficial/firefox.icns differ diff --git a/browser/branding/unofficial/firefox.ico b/browser/branding/unofficial/firefox.ico index 5217a6c0b..0c7acb61b 100644 Binary files a/browser/branding/unofficial/firefox.ico and b/browser/branding/unofficial/firefox.ico differ diff --git a/browser/branding/unofficial/locales/en-US/brand.dtd b/browser/branding/unofficial/locales/en-US/brand.dtd index cf4596ae0..17c243606 100644 --- a/browser/branding/unofficial/locales/en-US/brand.dtd +++ b/browser/branding/unofficial/locales/en-US/brand.dtd @@ -2,8 +2,9 @@ - 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/unofficial/locales/en-US/brand.properties b/browser/branding/unofficial/locales/en-US/brand.properties index 8cd2c2ec9..80349f0e3 100644 --- a/browser/branding/unofficial/locales/en-US/brand.properties +++ b/browser/branding/unofficial/locales/en-US/brand.properties @@ -2,9 +2,10 @@ # 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=Nightly -brandShortName=Nightly -brandFullName=Nightly -vendorShortName=Mozilla +brandShorterName=Serpent +brandShortName=Serpent +brandFullName=Serpent +vendorShortName=Moonchild +vendorFullName=Moonchild Productions syncBrandShortName=Sync diff --git a/browser/branding/unofficial/mozicon128.png b/browser/branding/unofficial/mozicon128.png index 471cf4645..739b61084 100644 Binary files a/browser/branding/unofficial/mozicon128.png and b/browser/branding/unofficial/mozicon128.png differ diff --git a/browser/branding/unofficial/serpent.VisualElementsManifest.xml b/browser/branding/unofficial/serpent.VisualElementsManifest.xml new file mode 100644 index 000000000..5046ee7da --- /dev/null +++ b/browser/branding/unofficial/serpent.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + -- cgit v1.2.3