From 7c60bb11f56d323ea1e9ee3662786931f4d8318b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 5 Feb 2018 00:08:42 -0500 Subject: Remove extra branding --- browser/branding/aurora/VisualElements_150.png | Bin 46222 -> 0 bytes browser/branding/aurora/VisualElements_70.png | Bin 14051 -> 0 bytes browser/branding/aurora/appname.bmp | Bin 198070 -> 0 bytes browser/branding/aurora/background.png | Bin 127432 -> 0 bytes browser/branding/aurora/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/aurora/branding.nsi | 49 - browser/branding/aurora/clock.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/configure.sh | 7 - .../branding/aurora/content/about-background.png | Bin 238888 -> 0 bytes browser/branding/aurora/content/about-logo.png | Bin 39622 -> 0 bytes browser/branding/aurora/content/about-logo@2x.png | Bin 108496 -> 0 bytes browser/branding/aurora/content/about-wordmark.svg | 61 - browser/branding/aurora/content/about.png | Bin 83543 -> 0 bytes browser/branding/aurora/content/aboutDialog.css | 34 - browser/branding/aurora/content/icon48.png | Bin 4391 -> 0 bytes browser/branding/aurora/content/icon64.png | Bin 6764 -> 0 bytes .../aurora/content/identity-icons-brand.svg | 7 - browser/branding/aurora/content/jar.mn | 19 - browser/branding/aurora/content/moz.build | 7 - browser/branding/aurora/content/silhouette-40.svg | 26 - browser/branding/aurora/default16.png | Bin 790 -> 0 bytes browser/branding/aurora/default32.png | Bin 2402 -> 0 bytes browser/branding/aurora/default48.png | Bin 4391 -> 0 bytes browser/branding/aurora/disk.icns | Bin 784888 -> 0 bytes browser/branding/aurora/document.icns | Bin 914217 -> 0 bytes browser/branding/aurora/document.ico | Bin 91633 -> 0 bytes browser/branding/aurora/dsstore | Bin 12292 -> 0 bytes .../aurora/firefox.VisualElementsManifest.xml | 8 - browser/branding/aurora/firefox.icns | Bin 880996 -> 0 bytes browser/branding/aurora/firefox.ico | Bin 96012 -> 0 bytes .../aurora/locales/browserconfig.properties | 6 - browser/branding/aurora/locales/en-US/brand.dtd | 9 - .../branding/aurora/locales/en-US/brand.properties | 10 - browser/branding/aurora/locales/jar.mn | 12 - browser/branding/aurora/locales/moz.build | 9 - browser/branding/aurora/moz.build | 13 - browser/branding/aurora/mozicon128.png | Bin 20881 -> 0 bytes browser/branding/aurora/newtab.ico | Bin 6518 -> 0 bytes browser/branding/aurora/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/aurora/particles.bmp | Bin 124216 -> 0 bytes browser/branding/aurora/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/aurora/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/pencil.bmp | Bin 124214 -> 0 bytes browser/branding/aurora/pref/firefox-branding.js | 36 - browser/branding/aurora/wizHeader.bmp | Bin 25820 -> 0 bytes browser/branding/aurora/wizHeaderRTL.bmp | Bin 25820 -> 0 bytes browser/branding/aurora/wizWatermark.bmp | Bin 154544 -> 0 bytes browser/branding/nightly/VisualElements_150.png | Bin 37693 -> 0 bytes browser/branding/nightly/VisualElements_70.png | Bin 11763 -> 0 bytes browser/branding/nightly/appname.bmp | Bin 176982 -> 0 bytes browser/branding/nightly/background.png | Bin 129900 -> 0 bytes browser/branding/nightly/bgintro.bmp | Bin 682144 -> 0 bytes browser/branding/nightly/branding.nsi | 45 - browser/branding/nightly/clock.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/configure.sh | 5 - .../branding/nightly/content/about-background.png | Bin 162094 -> 0 bytes browser/branding/nightly/content/about-logo.png | Bin 44476 -> 0 bytes browser/branding/nightly/content/about-logo@2x.png | Bin 130345 -> 0 bytes .../branding/nightly/content/about-wordmark.svg | 36 - browser/branding/nightly/content/about.png | Bin 85792 -> 0 bytes browser/branding/nightly/content/aboutDialog.css | 29 - browser/branding/nightly/content/icon48.png | Bin 3937 -> 0 bytes browser/branding/nightly/content/icon64.png | Bin 5981 -> 0 bytes .../nightly/content/identity-icons-brand.svg | 7 - browser/branding/nightly/content/jar.mn | 19 - browser/branding/nightly/content/moz.build | 7 - browser/branding/nightly/content/silhouette-40.svg | 1360 -------------------- browser/branding/nightly/default16.png | Bin 939 -> 0 bytes browser/branding/nightly/default32.png | Bin 2590 -> 0 bytes browser/branding/nightly/default48.png | Bin 3937 -> 0 bytes browser/branding/nightly/disk.icns | Bin 891873 -> 0 bytes browser/branding/nightly/document.icns | Bin 809555 -> 0 bytes browser/branding/nightly/document.ico | Bin 84749 -> 0 bytes browser/branding/nightly/dsstore | Bin 12292 -> 0 bytes .../nightly/firefox.VisualElementsManifest.xml | 8 - browser/branding/nightly/firefox.icns | Bin 866586 -> 0 bytes browser/branding/nightly/firefox.ico | Bin 86932 -> 0 bytes .../nightly/locales/browserconfig.properties | 6 - browser/branding/nightly/locales/en-US/brand.dtd | 9 - .../nightly/locales/en-US/brand.properties | 10 - browser/branding/nightly/locales/jar.mn | 12 - browser/branding/nightly/locales/moz.build | 9 - browser/branding/nightly/moz.build | 13 - browser/branding/nightly/mozicon128.png | Bin 17364 -> 0 bytes browser/branding/nightly/newtab.ico | Bin 6518 -> 0 bytes browser/branding/nightly/newwindow.ico | Bin 6518 -> 0 bytes browser/branding/nightly/particles.bmp | Bin 124216 -> 0 bytes browser/branding/nightly/pbmode.ico | Bin 6518 -> 0 bytes browser/branding/nightly/pencil-rtl.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/pencil.bmp | Bin 124214 -> 0 bytes browser/branding/nightly/pref/firefox-branding.js | 34 - browser/branding/nightly/wizHeader.bmp | Bin 25820 -> 0 bytes browser/branding/nightly/wizHeaderRTL.bmp | Bin 25820 -> 0 bytes browser/branding/nightly/wizWatermark.bmp | Bin 154544 -> 0 bytes 94 files changed, 1922 deletions(-) delete mode 100644 browser/branding/aurora/VisualElements_150.png delete mode 100644 browser/branding/aurora/VisualElements_70.png delete mode 100644 browser/branding/aurora/appname.bmp delete mode 100644 browser/branding/aurora/background.png delete mode 100644 browser/branding/aurora/bgintro.bmp delete mode 100644 browser/branding/aurora/branding.nsi delete mode 100644 browser/branding/aurora/clock.bmp delete mode 100644 browser/branding/aurora/configure.sh delete mode 100644 browser/branding/aurora/content/about-background.png delete mode 100644 browser/branding/aurora/content/about-logo.png delete mode 100644 browser/branding/aurora/content/about-logo@2x.png delete mode 100644 browser/branding/aurora/content/about-wordmark.svg delete mode 100644 browser/branding/aurora/content/about.png delete mode 100644 browser/branding/aurora/content/aboutDialog.css delete mode 100644 browser/branding/aurora/content/icon48.png delete mode 100644 browser/branding/aurora/content/icon64.png delete mode 100644 browser/branding/aurora/content/identity-icons-brand.svg delete mode 100644 browser/branding/aurora/content/jar.mn delete mode 100644 browser/branding/aurora/content/moz.build delete mode 100644 browser/branding/aurora/content/silhouette-40.svg delete mode 100644 browser/branding/aurora/default16.png delete mode 100644 browser/branding/aurora/default32.png delete mode 100644 browser/branding/aurora/default48.png delete mode 100644 browser/branding/aurora/disk.icns delete mode 100644 browser/branding/aurora/document.icns delete mode 100644 browser/branding/aurora/document.ico delete mode 100644 browser/branding/aurora/dsstore delete mode 100644 browser/branding/aurora/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/aurora/firefox.icns delete mode 100644 browser/branding/aurora/firefox.ico delete mode 100644 browser/branding/aurora/locales/browserconfig.properties delete mode 100644 browser/branding/aurora/locales/en-US/brand.dtd delete mode 100644 browser/branding/aurora/locales/en-US/brand.properties delete mode 100644 browser/branding/aurora/locales/jar.mn delete mode 100644 browser/branding/aurora/locales/moz.build delete mode 100644 browser/branding/aurora/moz.build delete mode 100644 browser/branding/aurora/mozicon128.png delete mode 100644 browser/branding/aurora/newtab.ico delete mode 100644 browser/branding/aurora/newwindow.ico delete mode 100644 browser/branding/aurora/particles.bmp delete mode 100644 browser/branding/aurora/pbmode.ico delete mode 100644 browser/branding/aurora/pencil-rtl.bmp delete mode 100644 browser/branding/aurora/pencil.bmp delete mode 100644 browser/branding/aurora/pref/firefox-branding.js delete mode 100644 browser/branding/aurora/wizHeader.bmp delete mode 100644 browser/branding/aurora/wizHeaderRTL.bmp delete mode 100644 browser/branding/aurora/wizWatermark.bmp delete mode 100644 browser/branding/nightly/VisualElements_150.png delete mode 100644 browser/branding/nightly/VisualElements_70.png delete mode 100644 browser/branding/nightly/appname.bmp delete mode 100644 browser/branding/nightly/background.png delete mode 100644 browser/branding/nightly/bgintro.bmp delete mode 100644 browser/branding/nightly/branding.nsi delete mode 100644 browser/branding/nightly/clock.bmp delete mode 100644 browser/branding/nightly/configure.sh delete mode 100644 browser/branding/nightly/content/about-background.png delete mode 100644 browser/branding/nightly/content/about-logo.png delete mode 100644 browser/branding/nightly/content/about-logo@2x.png delete mode 100644 browser/branding/nightly/content/about-wordmark.svg delete mode 100644 browser/branding/nightly/content/about.png delete mode 100644 browser/branding/nightly/content/aboutDialog.css delete mode 100644 browser/branding/nightly/content/icon48.png delete mode 100644 browser/branding/nightly/content/icon64.png delete mode 100644 browser/branding/nightly/content/identity-icons-brand.svg delete mode 100644 browser/branding/nightly/content/jar.mn delete mode 100644 browser/branding/nightly/content/moz.build delete mode 100644 browser/branding/nightly/content/silhouette-40.svg delete mode 100644 browser/branding/nightly/default16.png delete mode 100644 browser/branding/nightly/default32.png delete mode 100644 browser/branding/nightly/default48.png delete mode 100644 browser/branding/nightly/disk.icns delete mode 100644 browser/branding/nightly/document.icns delete mode 100644 browser/branding/nightly/document.ico delete mode 100644 browser/branding/nightly/dsstore delete mode 100644 browser/branding/nightly/firefox.VisualElementsManifest.xml delete mode 100644 browser/branding/nightly/firefox.icns delete mode 100644 browser/branding/nightly/firefox.ico delete mode 100644 browser/branding/nightly/locales/browserconfig.properties delete mode 100644 browser/branding/nightly/locales/en-US/brand.dtd delete mode 100644 browser/branding/nightly/locales/en-US/brand.properties delete mode 100644 browser/branding/nightly/locales/jar.mn delete mode 100644 browser/branding/nightly/locales/moz.build delete mode 100644 browser/branding/nightly/moz.build delete mode 100644 browser/branding/nightly/mozicon128.png delete mode 100644 browser/branding/nightly/newtab.ico delete mode 100644 browser/branding/nightly/newwindow.ico delete mode 100644 browser/branding/nightly/particles.bmp delete mode 100644 browser/branding/nightly/pbmode.ico delete mode 100644 browser/branding/nightly/pencil-rtl.bmp delete mode 100644 browser/branding/nightly/pencil.bmp delete mode 100644 browser/branding/nightly/pref/firefox-branding.js delete mode 100644 browser/branding/nightly/wizHeader.bmp delete mode 100644 browser/branding/nightly/wizHeaderRTL.bmp delete mode 100644 browser/branding/nightly/wizWatermark.bmp (limited to 'browser/branding') diff --git a/browser/branding/aurora/VisualElements_150.png b/browser/branding/aurora/VisualElements_150.png deleted file mode 100644 index 92370ee7a..000000000 Binary files a/browser/branding/aurora/VisualElements_150.png and /dev/null differ diff --git a/browser/branding/aurora/VisualElements_70.png b/browser/branding/aurora/VisualElements_70.png deleted file mode 100644 index aa206c51e..000000000 Binary files a/browser/branding/aurora/VisualElements_70.png and /dev/null differ diff --git a/browser/branding/aurora/appname.bmp b/browser/branding/aurora/appname.bmp deleted file mode 100644 index 904794ddb..000000000 Binary files a/browser/branding/aurora/appname.bmp and /dev/null differ diff --git a/browser/branding/aurora/background.png b/browser/branding/aurora/background.png deleted file mode 100644 index 704d1c2eb..000000000 Binary files a/browser/branding/aurora/background.png and /dev/null differ diff --git a/browser/branding/aurora/bgintro.bmp b/browser/branding/aurora/bgintro.bmp deleted file mode 100644 index 02ef9b336..000000000 Binary files a/browser/branding/aurora/bgintro.bmp and /dev/null differ diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi deleted file mode 100644 index bb42794d1..000000000 --- a/browser/branding/aurora/branding.nsi +++ /dev/null @@ -1,49 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# NSIS branding defines for Aurora builds. -# The official release build branding.nsi is located in other-license/branding/firefox/ -# The unofficial build branding.nsi is located in browser/branding/unofficial/ - -# BrandFullNameInternal is used for some registry and file system values -# instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Firefox Developer Edition" -!define BrandShortName "Firefox Developer Edition" -!define CompanyName "mozilla.org" -!define URLInfoAbout "https://www.mozilla.org" -!define HelpLink "https://support.mozilla.org" - -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-aurora-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=aurora&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" -!define Channel "aurora" - -# 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" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 108u -!define APPNAME_BMP_HEIGHT_DU 48u -!define INTRO_BLURB_WIDTH_DU "232u" -!define INTRO_BLURB_EDGE_DU "196u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 - -# Enable DeveloperEdition-specific behavior -!define DEV_EDITION diff --git a/browser/branding/aurora/clock.bmp b/browser/branding/aurora/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/aurora/clock.bmp and /dev/null differ diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh deleted file mode 100644 index 36feb0828..000000000 --- a/browser/branding/aurora/configure.sh +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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=FirefoxDeveloperEdition -MOZ_APP_REMOTINGNAME=firefox-dev -MOZ_DEV_EDITION=1 diff --git a/browser/branding/aurora/content/about-background.png b/browser/branding/aurora/content/about-background.png deleted file mode 100644 index 1fd5c9c88..000000000 Binary files a/browser/branding/aurora/content/about-background.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-logo.png b/browser/branding/aurora/content/about-logo.png deleted file mode 100644 index e3b7e1c8b..000000000 Binary files a/browser/branding/aurora/content/about-logo.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-logo@2x.png b/browser/branding/aurora/content/about-logo@2x.png deleted file mode 100644 index 08dd73dd6..000000000 Binary files a/browser/branding/aurora/content/about-logo@2x.png and /dev/null differ diff --git a/browser/branding/aurora/content/about-wordmark.svg b/browser/branding/aurora/content/about-wordmark.svg deleted file mode 100644 index b1b435b7a..000000000 --- a/browser/branding/aurora/content/about-wordmark.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/content/about.png b/browser/branding/aurora/content/about.png deleted file mode 100644 index c7d54ef1c..000000000 Binary files a/browser/branding/aurora/content/about.png and /dev/null differ diff --git a/browser/branding/aurora/content/aboutDialog.css b/browser/branding/aurora/content/aboutDialog.css deleted file mode 100644 index 209c53244..000000000 --- a/browser/branding/aurora/content/aboutDialog.css +++ /dev/null @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#aboutDialogContainer { - background-image: url("chrome://branding/content/about-background.png"); - background-repeat: no-repeat; - background-color: rgb(26,58,99); - color: #fff; -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -.text-link:-moz-focusring { - border-color: #fff; -} - -#rightBox { - /* this margin prevents text from overlapping the planet image */ - margin-left: 280px; - margin-right: 20px; -} - -#bottomBox { - padding: 15px 10px 15px; - background-color: rgba(0,0,0,.7); -} - -#version { - margin-top: 30px; -} diff --git a/browser/branding/aurora/content/icon48.png b/browser/branding/aurora/content/icon48.png deleted file mode 100644 index 85e3c0d4b..000000000 Binary files a/browser/branding/aurora/content/icon48.png and /dev/null differ diff --git a/browser/branding/aurora/content/icon64.png b/browser/branding/aurora/content/icon64.png deleted file mode 100644 index 4b90768d2..000000000 Binary files a/browser/branding/aurora/content/icon64.png and /dev/null differ diff --git a/browser/branding/aurora/content/identity-icons-brand.svg b/browser/branding/aurora/content/identity-icons-brand.svg deleted file mode 100644 index b284275bf..000000000 --- a/browser/branding/aurora/content/identity-icons-brand.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn deleted file mode 100644 index 140359a19..000000000 --- a/browser/branding/aurora/content/jar.mn +++ /dev/null @@ -1,19 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -browser.jar: -% content branding %content/branding/ contentaccessible=yes - content/branding/about.png - content/branding/about-background.png - content/branding/about-logo.png - content/branding/about-logo@2x.png - content/branding/about-wordmark.svg - content/branding/icon48.png - content/branding/icon64.png - content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) - content/branding/icon128.png (../mozicon128.png) - content/branding/identity-icons-brand.svg - content/branding/silhouette-40.svg - content/branding/aboutDialog.css diff --git a/browser/branding/aurora/content/moz.build b/browser/branding/aurora/content/moz.build deleted file mode 100644 index eb4454d28..000000000 --- a/browser/branding/aurora/content/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/aurora/content/silhouette-40.svg b/browser/branding/aurora/content/silhouette-40.svg deleted file mode 100644 index 5a41a1c3f..000000000 --- a/browser/branding/aurora/content/silhouette-40.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/browser/branding/aurora/default16.png b/browser/branding/aurora/default16.png deleted file mode 100644 index 3b2baaa8d..000000000 Binary files a/browser/branding/aurora/default16.png and /dev/null differ diff --git a/browser/branding/aurora/default32.png b/browser/branding/aurora/default32.png deleted file mode 100644 index 04cfba796..000000000 Binary files a/browser/branding/aurora/default32.png and /dev/null differ diff --git a/browser/branding/aurora/default48.png b/browser/branding/aurora/default48.png deleted file mode 100644 index 85e3c0d4b..000000000 Binary files a/browser/branding/aurora/default48.png and /dev/null differ diff --git a/browser/branding/aurora/disk.icns b/browser/branding/aurora/disk.icns deleted file mode 100644 index d9e0e6b61..000000000 Binary files a/browser/branding/aurora/disk.icns and /dev/null differ diff --git a/browser/branding/aurora/document.icns b/browser/branding/aurora/document.icns deleted file mode 100644 index 7eedd34ee..000000000 Binary files a/browser/branding/aurora/document.icns and /dev/null differ diff --git a/browser/branding/aurora/document.ico b/browser/branding/aurora/document.ico deleted file mode 100644 index 2402ac57f..000000000 Binary files a/browser/branding/aurora/document.ico and /dev/null differ diff --git a/browser/branding/aurora/dsstore b/browser/branding/aurora/dsstore deleted file mode 100644 index 4a5fa3f54..000000000 Binary files a/browser/branding/aurora/dsstore and /dev/null differ diff --git a/browser/branding/aurora/firefox.VisualElementsManifest.xml b/browser/branding/aurora/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/aurora/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/aurora/firefox.icns b/browser/branding/aurora/firefox.icns deleted file mode 100644 index 662165bb3..000000000 Binary files a/browser/branding/aurora/firefox.icns and /dev/null differ diff --git a/browser/branding/aurora/firefox.ico b/browser/branding/aurora/firefox.ico deleted file mode 100644 index 4f1856b99..000000000 Binary files a/browser/branding/aurora/firefox.ico and /dev/null differ diff --git a/browser/branding/aurora/locales/browserconfig.properties b/browser/branding/aurora/locales/browserconfig.properties deleted file mode 100644 index 06cefece3..000000000 --- a/browser/branding/aurora/locales/browserconfig.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Do NOT localize or otherwise change these values -browser.startup.homepage=about:home diff --git a/browser/branding/aurora/locales/en-US/brand.dtd b/browser/branding/aurora/locales/en-US/brand.dtd deleted file mode 100644 index 9598f79b0..000000000 --- a/browser/branding/aurora/locales/en-US/brand.dtd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/browser/branding/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties deleted file mode 100644 index e49d0ae86..000000000 --- a/browser/branding/aurora/locales/en-US/brand.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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 Developer Edition -brandFullName=Firefox Developer Edition -vendorShortName=Mozilla - -syncBrandShortName=Sync diff --git a/browser/branding/aurora/locales/jar.mn b/browser/branding/aurora/locales/jar.mn deleted file mode 100644 index 24880ad7d..000000000 --- a/browser/branding/aurora/locales/jar.mn +++ /dev/null @@ -1,12 +0,0 @@ -#filter substitution -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - - -@AB_CD@.jar: -% locale branding @AB_CD@ %locale/branding/ -# Aurora branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties diff --git a/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build deleted file mode 100644 index 8bad13124..000000000 --- a/browser/branding/aurora/locales/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/aurora/moz.build b/browser/branding/aurora/moz.build deleted file mode 100644 index 9045cee11..000000000 --- a/browser/branding/aurora/moz.build +++ /dev/null @@ -1,13 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -DIRS += ['content', 'locales'] - -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') - -include('../branding-common.mozbuild') -FirefoxBranding() diff --git a/browser/branding/aurora/mozicon128.png b/browser/branding/aurora/mozicon128.png deleted file mode 100644 index 2822bf449..000000000 Binary files a/browser/branding/aurora/mozicon128.png and /dev/null differ diff --git a/browser/branding/aurora/newtab.ico b/browser/branding/aurora/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/aurora/newtab.ico and /dev/null differ diff --git a/browser/branding/aurora/newwindow.ico b/browser/branding/aurora/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/aurora/newwindow.ico and /dev/null differ diff --git a/browser/branding/aurora/particles.bmp b/browser/branding/aurora/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/aurora/particles.bmp and /dev/null differ diff --git a/browser/branding/aurora/pbmode.ico b/browser/branding/aurora/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/aurora/pbmode.ico and /dev/null differ diff --git a/browser/branding/aurora/pencil-rtl.bmp b/browser/branding/aurora/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/aurora/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/aurora/pencil.bmp b/browser/branding/aurora/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/aurora/pencil.bmp and /dev/null differ diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js deleted file mode 100644 index 9f005b857..000000000 --- a/browser/branding/aurora/pref/firefox-branding.js +++ /dev/null @@ -1,36 +0,0 @@ - - -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 28800); // 8 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=192 hours -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/aurora/"); -// 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/firefox/aurora/"); - -// 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); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=4 days -pref("app.update.badgeWaitTime", 345600); - -// 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", 5); diff --git a/browser/branding/aurora/wizHeader.bmp b/browser/branding/aurora/wizHeader.bmp deleted file mode 100644 index 32aefb96e..000000000 Binary files a/browser/branding/aurora/wizHeader.bmp and /dev/null differ diff --git a/browser/branding/aurora/wizHeaderRTL.bmp b/browser/branding/aurora/wizHeaderRTL.bmp deleted file mode 100644 index 5f0ccb1c4..000000000 Binary files a/browser/branding/aurora/wizHeaderRTL.bmp and /dev/null differ diff --git a/browser/branding/aurora/wizWatermark.bmp b/browser/branding/aurora/wizWatermark.bmp deleted file mode 100644 index 56c6c3103..000000000 Binary files a/browser/branding/aurora/wizWatermark.bmp and /dev/null differ diff --git a/browser/branding/nightly/VisualElements_150.png b/browser/branding/nightly/VisualElements_150.png deleted file mode 100644 index 461961e8d..000000000 Binary files a/browser/branding/nightly/VisualElements_150.png and /dev/null differ diff --git a/browser/branding/nightly/VisualElements_70.png b/browser/branding/nightly/VisualElements_70.png deleted file mode 100644 index aad81f40d..000000000 Binary files a/browser/branding/nightly/VisualElements_70.png and /dev/null differ diff --git a/browser/branding/nightly/appname.bmp b/browser/branding/nightly/appname.bmp deleted file mode 100644 index fc1b6343c..000000000 Binary files a/browser/branding/nightly/appname.bmp and /dev/null differ diff --git a/browser/branding/nightly/background.png b/browser/branding/nightly/background.png deleted file mode 100644 index db5576a33..000000000 Binary files a/browser/branding/nightly/background.png and /dev/null differ diff --git a/browser/branding/nightly/bgintro.bmp b/browser/branding/nightly/bgintro.bmp deleted file mode 100644 index 777ab2e84..000000000 Binary files a/browser/branding/nightly/bgintro.bmp and /dev/null differ diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi deleted file mode 100644 index fa13b32c6..000000000 --- a/browser/branding/nightly/branding.nsi +++ /dev/null @@ -1,45 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# NSIS branding defines for nightly builds. -# The official release build branding.nsi is located in other-license/branding/firefox/ -# The unofficial build branding.nsi is located in browser/branding/unofficial/ - -# BrandFullNameInternal is used for some registry and file system values -# instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Nightly" -!define CompanyName "mozilla.org" -!define URLInfoAbout "https://www.mozilla.org" -!define HelpLink "https://support.mozilla.org" - -!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-nightly-latest" -!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=nightly&installer_lang=${AB_CD}" -!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" -!define Channel "nightly" - -# 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" - -# Dialog units are used so the UI displays correctly with the system's DPI -# settings. -# The dialog units for the bitmap's dimensions should match exactly with the -# bitmap's width and height in pixels. -!define APPNAME_BMP_WIDTH_DU 159u -!define APPNAME_BMP_HEIGHT_DU 28u -!define INTRO_BLURB_WIDTH_DU "230u" -!define INTRO_BLURB_EDGE_DU "198u" -!define INTRO_BLURB_LTR_TOP_DU "16u" -!define INTRO_BLURB_RTL_TOP_DU "11u" - -# UI Colors that can be customized for each channel -!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000 -!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999 -!define FOOTER_BKGRD_COLOR 0xFFFFFF -!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF -!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF -!define COMMON_TEXT_COLOR_FADED 0xA1AAB3 -!define COMMON_BKGRD_COLOR 0x0F1B26 diff --git a/browser/branding/nightly/clock.bmp b/browser/branding/nightly/clock.bmp deleted file mode 100644 index c74398edb..000000000 Binary files a/browser/branding/nightly/clock.bmp and /dev/null differ diff --git a/browser/branding/nightly/configure.sh b/browser/branding/nightly/configure.sh deleted file mode 100644 index edd3bd3e8..000000000 --- a/browser/branding/nightly/configure.sh +++ /dev/null @@ -1,5 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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 diff --git a/browser/branding/nightly/content/about-background.png b/browser/branding/nightly/content/about-background.png deleted file mode 100644 index b572ab237..000000000 Binary files a/browser/branding/nightly/content/about-background.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-logo.png b/browser/branding/nightly/content/about-logo.png deleted file mode 100644 index cd985a92f..000000000 Binary files a/browser/branding/nightly/content/about-logo.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-logo@2x.png b/browser/branding/nightly/content/about-logo@2x.png deleted file mode 100644 index fb12dfbd7..000000000 Binary files a/browser/branding/nightly/content/about-logo@2x.png and /dev/null differ diff --git a/browser/branding/nightly/content/about-wordmark.svg b/browser/branding/nightly/content/about-wordmark.svg deleted file mode 100644 index 6f71130b4..000000000 --- a/browser/branding/nightly/content/about-wordmark.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/content/about.png b/browser/branding/nightly/content/about.png deleted file mode 100644 index 5917b1e11..000000000 Binary files a/browser/branding/nightly/content/about.png and /dev/null differ diff --git a/browser/branding/nightly/content/aboutDialog.css b/browser/branding/nightly/content/aboutDialog.css deleted file mode 100644 index f0df8b1aa..000000000 --- a/browser/branding/nightly/content/aboutDialog.css +++ /dev/null @@ -1,29 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -#aboutDialogContainer { - background-image: url("chrome://branding/content/about-background.png"); - background-repeat: no-repeat; - background-color: rgb(10,17,37); - color: #fff; -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -.text-link:-moz-focusring { - border-color: #fff; -} - -#rightBox { - /* this margin prevents text from overlapping the planet image */ - margin-left: 280px; - margin-right: 20px; -} - -#bottomBox { - background-color: rgba(0,0,0,.7); -} diff --git a/browser/branding/nightly/content/icon48.png b/browser/branding/nightly/content/icon48.png deleted file mode 100644 index 88a307340..000000000 Binary files a/browser/branding/nightly/content/icon48.png and /dev/null differ diff --git a/browser/branding/nightly/content/icon64.png b/browser/branding/nightly/content/icon64.png deleted file mode 100644 index 2eab258cb..000000000 Binary files a/browser/branding/nightly/content/icon64.png and /dev/null differ diff --git a/browser/branding/nightly/content/identity-icons-brand.svg b/browser/branding/nightly/content/identity-icons-brand.svg deleted file mode 100644 index 6c33113e5..000000000 --- a/browser/branding/nightly/content/identity-icons-brand.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn deleted file mode 100644 index 140359a19..000000000 --- a/browser/branding/nightly/content/jar.mn +++ /dev/null @@ -1,19 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -browser.jar: -% content branding %content/branding/ contentaccessible=yes - content/branding/about.png - content/branding/about-background.png - content/branding/about-logo.png - content/branding/about-logo@2x.png - content/branding/about-wordmark.svg - content/branding/icon48.png - content/branding/icon64.png - content/branding/icon16.png (../default16.png) - content/branding/icon32.png (../default32.png) - content/branding/icon128.png (../mozicon128.png) - content/branding/identity-icons-brand.svg - content/branding/silhouette-40.svg - content/branding/aboutDialog.css diff --git a/browser/branding/nightly/content/moz.build b/browser/branding/nightly/content/moz.build deleted file mode 100644 index eb4454d28..000000000 --- a/browser/branding/nightly/content/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/nightly/content/silhouette-40.svg b/browser/branding/nightly/content/silhouette-40.svg deleted file mode 100644 index bef723b59..000000000 --- a/browser/branding/nightly/content/silhouette-40.svg +++ /dev/null @@ -1,1360 +0,0 @@ - - - - - diff --git a/browser/branding/nightly/default16.png b/browser/branding/nightly/default16.png deleted file mode 100644 index ace90e53c..000000000 Binary files a/browser/branding/nightly/default16.png and /dev/null differ diff --git a/browser/branding/nightly/default32.png b/browser/branding/nightly/default32.png deleted file mode 100644 index b62d0200f..000000000 Binary files a/browser/branding/nightly/default32.png and /dev/null differ diff --git a/browser/branding/nightly/default48.png b/browser/branding/nightly/default48.png deleted file mode 100644 index 88a307340..000000000 Binary files a/browser/branding/nightly/default48.png and /dev/null differ diff --git a/browser/branding/nightly/disk.icns b/browser/branding/nightly/disk.icns deleted file mode 100644 index c49b7b878..000000000 Binary files a/browser/branding/nightly/disk.icns and /dev/null differ diff --git a/browser/branding/nightly/document.icns b/browser/branding/nightly/document.icns deleted file mode 100644 index 98b461d75..000000000 Binary files a/browser/branding/nightly/document.icns and /dev/null differ diff --git a/browser/branding/nightly/document.ico b/browser/branding/nightly/document.ico deleted file mode 100644 index 796181004..000000000 Binary files a/browser/branding/nightly/document.ico and /dev/null differ diff --git a/browser/branding/nightly/dsstore b/browser/branding/nightly/dsstore deleted file mode 100644 index 657101d6e..000000000 Binary files a/browser/branding/nightly/dsstore and /dev/null differ diff --git a/browser/branding/nightly/firefox.VisualElementsManifest.xml b/browser/branding/nightly/firefox.VisualElementsManifest.xml deleted file mode 100644 index 7654e0ab7..000000000 --- a/browser/branding/nightly/firefox.VisualElementsManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns deleted file mode 100644 index 858cb2a19..000000000 Binary files a/browser/branding/nightly/firefox.icns and /dev/null differ diff --git a/browser/branding/nightly/firefox.ico b/browser/branding/nightly/firefox.ico deleted file mode 100644 index 12bebb1c2..000000000 Binary files a/browser/branding/nightly/firefox.ico and /dev/null differ diff --git a/browser/branding/nightly/locales/browserconfig.properties b/browser/branding/nightly/locales/browserconfig.properties deleted file mode 100644 index 06cefece3..000000000 --- a/browser/branding/nightly/locales/browserconfig.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -# Do NOT localize or otherwise change these values -browser.startup.homepage=about:home diff --git a/browser/branding/nightly/locales/en-US/brand.dtd b/browser/branding/nightly/locales/en-US/brand.dtd deleted file mode 100644 index cf4596ae0..000000000 --- a/browser/branding/nightly/locales/en-US/brand.dtd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties deleted file mode 100644 index 8cd2c2ec9..000000000 --- a/browser/branding/nightly/locales/en-US/brand.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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 - -syncBrandShortName=Sync diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn deleted file mode 100644 index 63af8f6f9..000000000 --- a/browser/branding/nightly/locales/jar.mn +++ /dev/null @@ -1,12 +0,0 @@ -#filter substitution -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - - -@AB_CD@.jar: -% locale branding @AB_CD@ %locale/branding/ -# Nightly branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) - locale/branding/brand.properties (en-US/brand.properties) - locale/branding/browserconfig.properties diff --git a/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build deleted file mode 100644 index 8bad13124..000000000 --- a/browser/branding/nightly/locales/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/nightly/moz.build b/browser/branding/nightly/moz.build deleted file mode 100644 index 9045cee11..000000000 --- a/browser/branding/nightly/moz.build +++ /dev/null @@ -1,13 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -DIRS += ['content', 'locales'] - -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') - -include('../branding-common.mozbuild') -FirefoxBranding() diff --git a/browser/branding/nightly/mozicon128.png b/browser/branding/nightly/mozicon128.png deleted file mode 100644 index 4222e6814..000000000 Binary files a/browser/branding/nightly/mozicon128.png and /dev/null differ diff --git a/browser/branding/nightly/newtab.ico b/browser/branding/nightly/newtab.ico deleted file mode 100644 index a9b37c08c..000000000 Binary files a/browser/branding/nightly/newtab.ico and /dev/null differ diff --git a/browser/branding/nightly/newwindow.ico b/browser/branding/nightly/newwindow.ico deleted file mode 100644 index 553720771..000000000 Binary files a/browser/branding/nightly/newwindow.ico and /dev/null differ diff --git a/browser/branding/nightly/particles.bmp b/browser/branding/nightly/particles.bmp deleted file mode 100644 index ab74ce047..000000000 Binary files a/browser/branding/nightly/particles.bmp and /dev/null differ diff --git a/browser/branding/nightly/pbmode.ico b/browser/branding/nightly/pbmode.ico deleted file mode 100644 index 47677c13f..000000000 Binary files a/browser/branding/nightly/pbmode.ico and /dev/null differ diff --git a/browser/branding/nightly/pencil-rtl.bmp b/browser/branding/nightly/pencil-rtl.bmp deleted file mode 100644 index e50d92db7..000000000 Binary files a/browser/branding/nightly/pencil-rtl.bmp and /dev/null differ diff --git a/browser/branding/nightly/pencil.bmp b/browser/branding/nightly/pencil.bmp deleted file mode 100644 index 252c10f41..000000000 Binary files a/browser/branding/nightly/pencil.bmp and /dev/null differ diff --git a/browser/branding/nightly/pref/firefox-branding.js b/browser/branding/nightly/pref/firefox-branding.js deleted file mode 100644 index 359d6bb6e..000000000 --- a/browser/branding/nightly/pref/firefox-branding.js +++ /dev/null @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); -pref("startup.homepage_welcome_url.additional", ""); -// The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours -// The time interval between the downloading of mar file chunks in the -// background (in seconds) -// 0 means "download everything at once" -pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=12 hours -pref("app.update.promptWaitTime", 43200); -// URL user can browse to manually if for some reason all update installation -// attempts fail. -pref("app.update.url.manual", "https://nightly.mozilla.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://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); - -// Give the user x seconds to reboot before showing a badge on the hamburger -// button. default=immediately -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", 5); diff --git a/browser/branding/nightly/wizHeader.bmp b/browser/branding/nightly/wizHeader.bmp deleted file mode 100644 index ac96070a8..000000000 Binary files a/browser/branding/nightly/wizHeader.bmp and /dev/null differ diff --git a/browser/branding/nightly/wizHeaderRTL.bmp b/browser/branding/nightly/wizHeaderRTL.bmp deleted file mode 100644 index 710af4a8e..000000000 Binary files a/browser/branding/nightly/wizHeaderRTL.bmp and /dev/null differ diff --git a/browser/branding/nightly/wizWatermark.bmp b/browser/branding/nightly/wizWatermark.bmp deleted file mode 100644 index 86d929cc1..000000000 Binary files a/browser/branding/nightly/wizWatermark.bmp and /dev/null differ -- cgit v1.2.3 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