diff --git a/README.md b/README.md index a658e7c84f4fe..8c9b77ad07b00 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +![Logo](browser/branding/foxhound/content/about-logo.png) + # Project "Foxhound" This is the repository for project "Foxhound", a Firefox fork capable of tracking taint flows through the browser. @@ -154,6 +156,6 @@ Additionally, if you get a paper accepted using project Foxhound, we are happy t ## Contributors -We want to thank everybody wo contributed to the development of Foxhound! +We want to thank everybody who contributed to the development of Foxhound! In no particular order: [tmbrbr](https://github.com/tmbrbr), [leeN](https://github.com/leeN), [saelo](https://github.com/saelo), [soumboussaha](https://github.com/soumboussaha) [LukasHock](https://github.com/LukasHock), [0drai](https://github.com/0drai), [alexbara2000](https://github.com/alexbara2000), [moorts](https://github.com/moorts), [unqrf](https://github.com/unqrf), .. diff --git a/browser/branding/foxhound-old/VisualElements_150.png b/browser/branding/foxhound-old/VisualElements_150.png new file mode 100644 index 0000000000000..18ff6fa99942f Binary files /dev/null and b/browser/branding/foxhound-old/VisualElements_150.png differ diff --git a/browser/branding/foxhound-old/VisualElements_70.png b/browser/branding/foxhound-old/VisualElements_70.png new file mode 100644 index 0000000000000..697d2e10fd26a Binary files /dev/null and b/browser/branding/foxhound-old/VisualElements_70.png differ diff --git a/browser/branding/foxhound-old/background.png b/browser/branding/foxhound-old/background.png new file mode 100644 index 0000000000000..56da1a27345c2 Binary files /dev/null and b/browser/branding/foxhound-old/background.png differ diff --git a/browser/branding/foxhound-old/branding.nsi b/browser/branding/foxhound-old/branding.nsi new file mode 100644 index 0000000000000..1bd650fa49b8b --- /dev/null +++ b/browser/branding/foxhound-old/branding.nsi @@ -0,0 +1,51 @@ +# 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +# NSIS branding defines for unofficial builds. +# The official release build branding.nsi is located in other-license/branding/firefox/ +# The nightly build branding.nsi is located in browser/installer/windows/nsis/ + +# BrandFullNameInternal is used for some registry and file system values +# instead of BrandFullName and typically should not be modified. +!define BrandFullNameInternal "Foxhound" +!define BrandFullName "Foxhound" +!define CompanyName "SAP Security Research" +!define URLInfoAbout "https://github.com/SAP/project-foxhound" +!define HelpLink "https://github.com/SAP/project-foxhound" + +#!define URLStubDownloadX86 "https://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest" +#!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-latest" +#!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&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 Channel "Foxhound" + +# 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 50u +!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/foxhound-old/configure.sh b/browser/branding/foxhound-old/configure.sh new file mode 100644 index 0000000000000..323d32ba818ee --- /dev/null +++ b/browser/branding/foxhound-old/configure.sh @@ -0,0 +1,11 @@ +# 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +MOZ_APP_NAME=foxhound +MOZ_APP_DISPLAYNAME=Foxhound +MOZ_APP_REMOTINGNAME=foxhound +MOZ_DEV_EDITION=1 \ No newline at end of file diff --git a/browser/branding/foxhound/content/about-background.png b/browser/branding/foxhound-old/content/about-background.png similarity index 100% rename from browser/branding/foxhound/content/about-background.png rename to browser/branding/foxhound-old/content/about-background.png diff --git a/browser/branding/foxhound-old/content/about-logo.png b/browser/branding/foxhound-old/content/about-logo.png new file mode 100644 index 0000000000000..f411fedbdc728 Binary files /dev/null and b/browser/branding/foxhound-old/content/about-logo.png differ diff --git a/browser/branding/foxhound-old/content/about-logo@2x.png b/browser/branding/foxhound-old/content/about-logo@2x.png new file mode 100644 index 0000000000000..f411fedbdc728 Binary files /dev/null and b/browser/branding/foxhound-old/content/about-logo@2x.png differ diff --git a/browser/branding/foxhound-old/content/about-wordmark.svg b/browser/branding/foxhound-old/content/about-wordmark.svg new file mode 100644 index 0000000000000..2e65ad4fa74b5 --- /dev/null +++ b/browser/branding/foxhound-old/content/about-wordmark.svg @@ -0,0 +1,143 @@ + + + + diff --git a/browser/branding/foxhound-old/content/about.png b/browser/branding/foxhound-old/content/about.png new file mode 100644 index 0000000000000..586629b3ea641 Binary files /dev/null and b/browser/branding/foxhound-old/content/about.png differ diff --git a/browser/branding/foxhound-old/content/aboutDialog.css b/browser/branding/foxhound-old/content/aboutDialog.css new file mode 100644 index 0000000000000..be7fdcab6b42d --- /dev/null +++ b/browser/branding/foxhound-old/content/aboutDialog.css @@ -0,0 +1,25 @@ +/* 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; +} + +#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/foxhound-old/content/firefox-wordmark.svg b/browser/branding/foxhound-old/content/firefox-wordmark.svg new file mode 100644 index 0000000000000..1479ecb8af1b3 --- /dev/null +++ b/browser/branding/foxhound-old/content/firefox-wordmark.svg @@ -0,0 +1,68 @@ + + + + diff --git a/browser/branding/foxhound/content/identity-icons-brand.svg b/browser/branding/foxhound-old/content/identity-icons-brand.svg similarity index 100% rename from browser/branding/foxhound/content/identity-icons-brand.svg rename to browser/branding/foxhound-old/content/identity-icons-brand.svg diff --git a/browser/branding/foxhound-old/content/jar.mn b/browser/branding/foxhound-old/content/jar.mn new file mode 100644 index 0000000000000..7bec91290a20f --- /dev/null +++ b/browser/branding/foxhound-old/content/jar.mn @@ -0,0 +1,20 @@ +# 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +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-wordmark.svg + content/branding/icon16.png (../default16.png) + content/branding/icon32.png (../default32.png) + content/branding/icon48.png (../default48.png) + content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) + content/branding/identity-icons-brand.svg + content/branding/aboutDialog.css diff --git a/browser/branding/foxhound-old/content/moz.build b/browser/branding/foxhound-old/content/moz.build new file mode 100644 index 0000000000000..8aa35ecf9cbd6 --- /dev/null +++ b/browser/branding/foxhound-old/content/moz.build @@ -0,0 +1,10 @@ +# -*- 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/foxhound-old/default128.png b/browser/branding/foxhound-old/default128.png new file mode 100644 index 0000000000000..2993725db383a Binary files /dev/null and b/browser/branding/foxhound-old/default128.png differ diff --git a/browser/branding/foxhound-old/default16.png b/browser/branding/foxhound-old/default16.png new file mode 100644 index 0000000000000..a99c63b817bfd Binary files /dev/null and b/browser/branding/foxhound-old/default16.png differ diff --git a/browser/branding/foxhound-old/default22.png b/browser/branding/foxhound-old/default22.png new file mode 100644 index 0000000000000..100a5d2ef9ca3 Binary files /dev/null and b/browser/branding/foxhound-old/default22.png differ diff --git a/browser/branding/foxhound-old/default24.png b/browser/branding/foxhound-old/default24.png new file mode 100644 index 0000000000000..59056d94f24c4 Binary files /dev/null and b/browser/branding/foxhound-old/default24.png differ diff --git a/browser/branding/foxhound-old/default256.png b/browser/branding/foxhound-old/default256.png new file mode 100644 index 0000000000000..ed9a15ad22f19 Binary files /dev/null and b/browser/branding/foxhound-old/default256.png differ diff --git a/browser/branding/foxhound-old/default32.png b/browser/branding/foxhound-old/default32.png new file mode 100644 index 0000000000000..95b9a93304e84 Binary files /dev/null and b/browser/branding/foxhound-old/default32.png differ diff --git a/browser/branding/foxhound-old/default48.png b/browser/branding/foxhound-old/default48.png new file mode 100644 index 0000000000000..b7cffcdd44d2f Binary files /dev/null and b/browser/branding/foxhound-old/default48.png differ diff --git a/browser/branding/foxhound-old/default64.png b/browser/branding/foxhound-old/default64.png new file mode 100644 index 0000000000000..057bd9c981b1a Binary files /dev/null and b/browser/branding/foxhound-old/default64.png differ diff --git a/browser/branding/foxhound-old/disk.icns b/browser/branding/foxhound-old/disk.icns new file mode 100644 index 0000000000000..718f1a3d3c6a8 Binary files /dev/null and b/browser/branding/foxhound-old/disk.icns differ diff --git a/browser/branding/foxhound-old/document.icns b/browser/branding/foxhound-old/document.icns new file mode 100644 index 0000000000000..ff419f2f7b073 Binary files /dev/null and b/browser/branding/foxhound-old/document.icns differ diff --git a/browser/branding/foxhound-old/document.ico b/browser/branding/foxhound-old/document.ico new file mode 100644 index 0000000000000..584a0a1bf0acb Binary files /dev/null and b/browser/branding/foxhound-old/document.ico differ diff --git a/browser/branding/foxhound-old/dsstore b/browser/branding/foxhound-old/dsstore new file mode 100644 index 0000000000000..2d11482a75046 Binary files /dev/null and b/browser/branding/foxhound-old/dsstore differ diff --git a/browser/branding/foxhound-old/firefox.icns b/browser/branding/foxhound-old/firefox.icns new file mode 100644 index 0000000000000..e633f9fc4d3db Binary files /dev/null and b/browser/branding/foxhound-old/firefox.icns differ diff --git a/browser/branding/foxhound-old/firefox.ico b/browser/branding/foxhound-old/firefox.ico new file mode 100644 index 0000000000000..d1c1ba24dbdd8 Binary files /dev/null and b/browser/branding/foxhound-old/firefox.ico differ diff --git a/browser/branding/foxhound-old/firefox64.ico b/browser/branding/foxhound-old/firefox64.ico new file mode 100644 index 0000000000000..9eedfaf65ac6f Binary files /dev/null and b/browser/branding/foxhound-old/firefox64.ico differ diff --git a/browser/branding/foxhound/foxhound.VisualElementsManifest.xml b/browser/branding/foxhound-old/foxhound.VisualElementsManifest.xml similarity index 100% rename from browser/branding/foxhound/foxhound.VisualElementsManifest.xml rename to browser/branding/foxhound-old/foxhound.VisualElementsManifest.xml diff --git a/browser/branding/foxhound/locales/en-US/brand.dtd b/browser/branding/foxhound-old/locales/en-US/brand.dtd similarity index 100% rename from browser/branding/foxhound/locales/en-US/brand.dtd rename to browser/branding/foxhound-old/locales/en-US/brand.dtd diff --git a/browser/branding/foxhound-old/locales/en-US/brand.ftl b/browser/branding/foxhound-old/locales/en-US/brand.ftl new file mode 100644 index 0000000000000..9f05bb01b7abf --- /dev/null +++ b/browser/branding/foxhound-old/locales/en-US/brand.ftl @@ -0,0 +1,25 @@ +# 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +## Firefox Brand +## +## Firefox must be treated as a brand, and kept in English. +## It cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. +## +## Reference: https://www.mozilla.org/styleguide/communications/translation/ + +-brand-shorter-name = Foxhound +-brand-short-name = Foxhound +-brand-full-name = Project Foxhound +# This brand name can be used in messages where the product name needs to +# remain unchanged across different versions (Nightly, Beta, etc.). +-brand-product-name = Foxhound +-vendor-short-name = SAP +trademarkInfo = Project Foxhound is an experimental taint-aware web browser based on Firefox. diff --git a/browser/branding/foxhound-old/locales/en-US/brand.properties b/browser/branding/foxhound-old/locales/en-US/brand.properties new file mode 100644 index 0000000000000..9b4c752af61bc --- /dev/null +++ b/browser/branding/foxhound-old/locales/en-US/brand.properties @@ -0,0 +1,17 @@ +# 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +brandShorterName=Foxhound +brandShortName=Foxhound +brandFullName=Project Taintfox +# LOCALIZATION NOTE(brandProductName): +# This brand name can be used in messages where the product name needs to +# remain unchanged across different versions (Nightly, Beta, etc.). +brandProductName=Foxhound +vendorShortName=SAP + +syncBrandShortName=Sync diff --git a/browser/branding/foxhound-old/locales/jar.mn b/browser/branding/foxhound-old/locales/jar.mn new file mode 100644 index 0000000000000..16df31cead1dc --- /dev/null +++ b/browser/branding/foxhound-old/locales/jar.mn @@ -0,0 +1,16 @@ +#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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +[localization] @AB_CD@.jar: + branding (en-US/**/*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ +# Unofficial branding only exists in en-US + locale/branding/brand.dtd (en-US/brand.dtd) + locale/branding/brand.properties (en-US/brand.properties) diff --git a/browser/branding/foxhound-old/locales/moz.build b/browser/branding/foxhound-old/locales/moz.build new file mode 100644 index 0000000000000..5d725a158bd0b --- /dev/null +++ b/browser/branding/foxhound-old/locales/moz.build @@ -0,0 +1,12 @@ +# -*- 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] + +JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/browser/branding/foxhound-old/moz.build b/browser/branding/foxhound-old/moz.build new file mode 100644 index 0000000000000..7303ab0e52941 --- /dev/null +++ b/browser/branding/foxhound-old/moz.build @@ -0,0 +1,16 @@ +# -*- 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/. +# +# Modifications Copyright SAP SE. 2019-2021. All rights reserved. +# + +DIRS += ['content', 'locales'] + +DIST_SUBDIR = 'browser' +export('DIST_SUBDIR') + +include('../branding-common.mozbuild') +FirefoxBranding() diff --git a/browser/branding/foxhound-old/newtab.ico b/browser/branding/foxhound-old/newtab.ico new file mode 100644 index 0000000000000..a9b37c08c6e18 Binary files /dev/null and b/browser/branding/foxhound-old/newtab.ico differ diff --git a/browser/branding/foxhound-old/newwindow.ico b/browser/branding/foxhound-old/newwindow.ico new file mode 100644 index 0000000000000..55372077102c4 Binary files /dev/null and b/browser/branding/foxhound-old/newwindow.ico differ diff --git a/browser/branding/foxhound-old/pbmode.ico b/browser/branding/foxhound-old/pbmode.ico new file mode 100644 index 0000000000000..47677c13fba68 Binary files /dev/null and b/browser/branding/foxhound-old/pbmode.ico differ diff --git a/browser/branding/foxhound-old/pref/firefox-branding.js b/browser/branding/foxhound-old/pref/firefox-branding.js new file mode 100644 index 0000000000000..5ae5255550ae2 --- /dev/null +++ b/browser/branding/foxhound-old/pref/firefox-branding.js @@ -0,0 +1,33 @@ +/* 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/. */ +/* + * Modifications Copyright SAP SE. 2019-2021. All rights reserved. + */ + +pref("startup.homepage_override_url", ""); +pref("startup.homepage_welcome_url", ""); +pref("startup.homepage_welcome_url.additional", ""); +// The time interval between checks for a new version (in seconds) +pref("app.update.interval", 86400); // 24 hours +// Give the user x seconds to react before showing the big UI. default=24 hours +pref("app.update.promptWaitTime", 86400); +// 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/foxhound-old/stubinstaller/bgstub.jpg b/browser/branding/foxhound-old/stubinstaller/bgstub.jpg new file mode 100644 index 0000000000000..289da91c35fb8 Binary files /dev/null and b/browser/branding/foxhound-old/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/foxhound-old/stubinstaller/installing_page.css b/browser/branding/foxhound-old/stubinstaller/installing_page.css new file mode 100644 index 0000000000000..a15a4a76ec9c8 --- /dev/null +++ b/browser/branding/foxhound-old/stubinstaller/installing_page.css @@ -0,0 +1,61 @@ +/* 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/. */ + +body { + color: white; +} + +#label, +#progress_background, +#blurb { + text-align: center; + margin: 20px 30px; +} + +#label { + font-size: 40px; + margin-top: 100px; + margin-bottom: 20px; +} + +#progress_background { + margin: 0 auto; + width: 60%; + height: 24px; + background-color: white; +} + +body.high-contrast #progress_background { + outline: solid; +} + +#progress_bar { + margin: 0; + width: 0%; + height: 100%; + background-color: #00AAFF; +} + +/* In high contrast mode, fill the entire progress bar with its border. */ +body.high-contrast #progress_bar { + /* This border should be the height of progress_background. */ + border-top: 24px solid; + box-sizing: border-box; +} + +/* This layout doesn't want the header or content text. */ +#header, #content { + display: none; +} + +#blurb { + font-size: 20px; +} + +/* The footer goes in the bottom right corner. */ +#footer { + position: fixed; + right: 50px; + bottom: 60px; +} diff --git a/browser/branding/foxhound-old/stubinstaller/profile_cleanup_page.css b/browser/branding/foxhound-old/stubinstaller/profile_cleanup_page.css new file mode 100644 index 0000000000000..2d9c3ad1891e0 --- /dev/null +++ b/browser/branding/foxhound-old/stubinstaller/profile_cleanup_page.css @@ -0,0 +1,42 @@ +/* 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/. */ + +body { + color: white; +} + +#header, +#refreshCheckboxContainer, +#refreshButtonContainer { + text-align: center; + margin-left: 40px; + margin-right: 40px; + margin-bottom: 30px; +} + +#header { + font-size: 35px; + font-weight: normal; + margin-top: 45px; +} + +#refreshCheckbox { + vertical-align: middle; +} + +#checkboxLabel { + font-size: 13px; +} + +#refreshButton { + padding: 8px 40px; + font-size: 15px; +} + +/* The footer goes in the bottom right corner. */ +#footer { + position: fixed; + right: 50px; + bottom: 59px; +} diff --git a/browser/branding/foxhound-old/wizHeader.bmp b/browser/branding/foxhound-old/wizHeader.bmp new file mode 100644 index 0000000000000..9a258d6c7c857 Binary files /dev/null and b/browser/branding/foxhound-old/wizHeader.bmp differ diff --git a/browser/branding/foxhound-old/wizHeaderRTL.bmp b/browser/branding/foxhound-old/wizHeaderRTL.bmp new file mode 100644 index 0000000000000..7c6abe34ded6e Binary files /dev/null and b/browser/branding/foxhound-old/wizHeaderRTL.bmp differ diff --git a/browser/branding/foxhound-old/wizWatermark.bmp b/browser/branding/foxhound-old/wizWatermark.bmp new file mode 100644 index 0000000000000..0b194f018de51 Binary files /dev/null and b/browser/branding/foxhound-old/wizWatermark.bmp differ diff --git a/browser/branding/foxhound/PrivateBrowsing_150.png b/browser/branding/foxhound/PrivateBrowsing_150.png new file mode 100644 index 0000000000000..71531a838faa2 Binary files /dev/null and b/browser/branding/foxhound/PrivateBrowsing_150.png differ diff --git a/browser/branding/foxhound/PrivateBrowsing_70.png b/browser/branding/foxhound/PrivateBrowsing_70.png new file mode 100644 index 0000000000000..c66181253e41e Binary files /dev/null and b/browser/branding/foxhound/PrivateBrowsing_70.png differ diff --git a/browser/branding/foxhound/VisualElements_150.png b/browser/branding/foxhound/VisualElements_150.png index 18ff6fa99942f..bf64f6a5b8dc6 100644 Binary files a/browser/branding/foxhound/VisualElements_150.png and b/browser/branding/foxhound/VisualElements_150.png differ diff --git a/browser/branding/foxhound/VisualElements_70.png b/browser/branding/foxhound/VisualElements_70.png index 697d2e10fd26a..daad041ddcda6 100644 Binary files a/browser/branding/foxhound/VisualElements_70.png and b/browser/branding/foxhound/VisualElements_70.png differ diff --git a/browser/branding/foxhound/background.png b/browser/branding/foxhound/background.png index 56da1a27345c2..24ce536103ae3 100644 Binary files a/browser/branding/foxhound/background.png and b/browser/branding/foxhound/background.png differ diff --git a/browser/branding/foxhound/branding-common.mozbuild b/browser/branding/foxhound/branding-common.mozbuild new file mode 100644 index 0000000000000..a38663a3dc1eb --- /dev/null +++ b/browser/branding/foxhound/branding-common.mozbuild @@ -0,0 +1,37 @@ +# -*- 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/. + + +@template +def FirefoxBranding(): + if CONFIG["MOZ_BRANDING_DIRECTORY"] == "browser/branding/official": + JS_PREFERENCE_PP_FILES += [ + "pref/firefox-branding.js", + ] + else: + JS_PREFERENCE_FILES += [ + "pref/firefox-branding.js", + ] + + if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": + FINAL_TARGET_FILES[".."] += [ + "firefox.VisualElementsManifest.xml", + "private_browsing.VisualElementsManifest.xml", + ] + FINAL_TARGET_FILES.VisualElements += [ + "PrivateBrowsing_150.png", + "PrivateBrowsing_70.png", + "VisualElements_150.png", + "VisualElements_70.png", + ] + elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + FINAL_TARGET_FILES.chrome.icons.default += [ + "default128.png", + "default16.png", + "default32.png", + "default48.png", + "default64.png", + ] diff --git a/browser/branding/foxhound/branding.nsi b/browser/branding/foxhound/branding.nsi index 1bd650fa49b8b..1fc5c12d2af9d 100644 --- a/browser/branding/foxhound/branding.nsi +++ b/browser/branding/foxhound/branding.nsi @@ -1,9 +1,6 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# # NSIS branding defines for unofficial builds. # The official release build branding.nsi is located in other-license/branding/firefox/ @@ -11,18 +8,18 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "Foxhound" -!define BrandFullName "Foxhound" -!define CompanyName "SAP Security Research" -!define URLInfoAbout "https://github.com/SAP/project-foxhound" -!define HelpLink "https://github.com/SAP/project-foxhound" - -#!define URLStubDownloadX86 "https://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest" -#!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-latest" -#!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&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 Channel "Foxhound" +!define BrandFullNameInternal "Mozilla Developer Preview" +!define BrandFullName "Mozilla Developer Preview" +!define CompanyName "mozilla.org" +!define URLInfoAbout "https://www.mozilla.org" +!define HelpLink "https://support.mozilla.org" + +!define URLStubDownloadX86 "https://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest" +!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-latest" +!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&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 Channel "unofficial" # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" @@ -30,22 +27,38 @@ # 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 50u -!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" +!define PROFILE_CLEANUP_LABEL_TOP "35u" +!define PROFILE_CLEANUP_LABEL_LEFT "0" +!define PROFILE_CLEANUP_LABEL_WIDTH "100%" +!define PROFILE_CLEANUP_LABEL_HEIGHT "80u" +!define PROFILE_CLEANUP_LABEL_ALIGN "center" +!define PROFILE_CLEANUP_CHECKBOX_LEFT "center" +!define PROFILE_CLEANUP_CHECKBOX_WIDTH "100%" +!define PROFILE_CLEANUP_BUTTON_LEFT "center" +!define INSTALL_BLURB_TOP "137u" +!define INSTALL_BLURB_WIDTH "60u" +!define INSTALL_FOOTER_TOP "-48u" +!define INSTALL_FOOTER_WIDTH "250u" +!define INSTALL_INSTALLING_TOP "70u" +!define INSTALL_INSTALLING_LEFT "0" +!define INSTALL_INSTALLING_WIDTH "100%" +!define INSTALL_PROGRESS_BAR_TOP "112u" +!define INSTALL_PROGRESS_BAR_LEFT "20%" +!define INSTALL_PROGRESS_BAR_WIDTH "60%" +!define INSTALL_PROGRESS_BAR_HEIGHT "12u" + +!define PROFILE_CLEANUP_CHECKBOX_TOP_MARGIN "20u" +!define PROFILE_CLEANUP_BUTTON_TOP_MARGIN "20u" +!define PROFILE_CLEANUP_BUTTON_X_PADDING "40u" +!define PROFILE_CLEANUP_BUTTON_Y_PADDING "4u" + +# Font settings that can be customized for each channel +!define INSTALL_HEADER_FONT_SIZE 28 +!define INSTALL_HEADER_FONT_WEIGHT 400 +!define INSTALL_INSTALLING_FONT_SIZE 28 +!define INSTALL_INSTALLING_FONT_WEIGHT 400 # 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 +!define COMMON_TEXT_COLOR 0xFFFFFF +!define COMMON_BACKGROUND_COLOR 0x000000 +!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF diff --git a/browser/branding/foxhound/configure.sh b/browser/branding/foxhound/configure.sh index 323d32ba818ee..3eef2b62b35bd 100644 --- a/browser/branding/foxhound/configure.sh +++ b/browser/branding/foxhound/configure.sh @@ -1,11 +1,5 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# -MOZ_APP_NAME=foxhound MOZ_APP_DISPLAYNAME=Foxhound -MOZ_APP_REMOTINGNAME=foxhound -MOZ_DEV_EDITION=1 \ No newline at end of file diff --git a/browser/branding/foxhound/content/about-logo-private.png b/browser/branding/foxhound/content/about-logo-private.png new file mode 100644 index 0000000000000..05441456001d9 Binary files /dev/null and b/browser/branding/foxhound/content/about-logo-private.png differ diff --git a/browser/branding/foxhound/content/about-logo-private@2x.png b/browser/branding/foxhound/content/about-logo-private@2x.png new file mode 100644 index 0000000000000..696b784218a86 Binary files /dev/null and b/browser/branding/foxhound/content/about-logo-private@2x.png differ diff --git a/browser/branding/foxhound/content/about-logo.png b/browser/branding/foxhound/content/about-logo.png index f411fedbdc728..3b29cd9caee1a 100644 Binary files a/browser/branding/foxhound/content/about-logo.png and b/browser/branding/foxhound/content/about-logo.png differ diff --git a/browser/branding/foxhound/content/about-logo.svg b/browser/branding/foxhound/content/about-logo.svg new file mode 100644 index 0000000000000..5ad53036c1769 --- /dev/null +++ b/browser/branding/foxhound/content/about-logo.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/browser/branding/foxhound/content/about-logo@2x.png b/browser/branding/foxhound/content/about-logo@2x.png index f411fedbdc728..3a173a374a050 100644 Binary files a/browser/branding/foxhound/content/about-logo@2x.png and b/browser/branding/foxhound/content/about-logo@2x.png differ diff --git a/browser/branding/foxhound/content/about-wordmark.svg b/browser/branding/foxhound/content/about-wordmark.svg index 2e65ad4fa74b5..e3a9bee9e615e 100644 --- a/browser/branding/foxhound/content/about-wordmark.svg +++ b/browser/branding/foxhound/content/about-wordmark.svg @@ -1,143 +1,44 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/browser/branding/foxhound/content/about.png b/browser/branding/foxhound/content/about.png index 586629b3ea641..e98e31c7ad79d 100644 Binary files a/browser/branding/foxhound/content/about.png and b/browser/branding/foxhound/content/about.png differ diff --git a/browser/branding/foxhound/content/about.svg b/browser/branding/foxhound/content/about.svg new file mode 100644 index 0000000000000..5ad53036c1769 --- /dev/null +++ b/browser/branding/foxhound/content/about.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/browser/branding/foxhound/content/aboutDialog.css b/browser/branding/foxhound/content/aboutDialog.css index be7fdcab6b42d..efd812629d2a8 100644 --- a/browser/branding/foxhound/content/aboutDialog.css +++ b/browser/branding/foxhound/content/aboutDialog.css @@ -3,23 +3,18 @@ * 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); + background-color: #130829; color: #fff; -} - -.text-link { - color: #fff !important; - text-decoration: underline; + color-scheme: dark; } #rightBox { - /* this margin prevents text from overlapping the planet image */ - margin-left: 280px; - margin-right: 20px; + background-size: auto 64px; + margin-inline: 30px; + padding-top: 64px; } #bottomBox { - background-color: rgba(0,0,0,.7); + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; } diff --git a/browser/branding/foxhound/content/firefox-wordmark.svg b/browser/branding/foxhound/content/firefox-wordmark.svg index 1479ecb8af1b3..e3a9bee9e615e 100644 --- a/browser/branding/foxhound/content/firefox-wordmark.svg +++ b/browser/branding/foxhound/content/firefox-wordmark.svg @@ -1,68 +1,44 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/browser/branding/foxhound/content/jar.mn b/browser/branding/foxhound/content/jar.mn index 7bec91290a20f..a5e6f551aa5fd 100644 --- a/browser/branding/foxhound/content/jar.mn +++ b/browser/branding/foxhound/content/jar.mn @@ -1,20 +1,21 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# 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.svg + content/branding/about-logo@2x.png content/branding/about-wordmark.svg + content/branding/about-logo-private.png + content/branding/about-logo-private@2x.png + content/branding/document.ico (../document.ico) + content/branding/firefox-wordmark.svg content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css diff --git a/browser/branding/foxhound/content/moz.build b/browser/branding/foxhound/content/moz.build index 8aa35ecf9cbd6..d988c0ff9b162 100644 --- a/browser/branding/foxhound/content/moz.build +++ b/browser/branding/foxhound/content/moz.build @@ -3,8 +3,5 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file +JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/branding/foxhound/default128.png b/browser/branding/foxhound/default128.png index 2993725db383a..93a49326ddbef 100644 Binary files a/browser/branding/foxhound/default128.png and b/browser/branding/foxhound/default128.png differ diff --git a/browser/branding/foxhound/default16.png b/browser/branding/foxhound/default16.png index a99c63b817bfd..7d830dcc00300 100644 Binary files a/browser/branding/foxhound/default16.png and b/browser/branding/foxhound/default16.png differ diff --git a/browser/branding/foxhound/default22.png b/browser/branding/foxhound/default22.png index 100a5d2ef9ca3..a301ed523ed84 100644 Binary files a/browser/branding/foxhound/default22.png and b/browser/branding/foxhound/default22.png differ diff --git a/browser/branding/foxhound/default24.png b/browser/branding/foxhound/default24.png index 59056d94f24c4..72f9777748b6e 100644 Binary files a/browser/branding/foxhound/default24.png and b/browser/branding/foxhound/default24.png differ diff --git a/browser/branding/foxhound/default256.png b/browser/branding/foxhound/default256.png index ed9a15ad22f19..d838e20479c70 100644 Binary files a/browser/branding/foxhound/default256.png and b/browser/branding/foxhound/default256.png differ diff --git a/browser/branding/foxhound/default32.png b/browser/branding/foxhound/default32.png index 95b9a93304e84..098477f8c65a8 100644 Binary files a/browser/branding/foxhound/default32.png and b/browser/branding/foxhound/default32.png differ diff --git a/browser/branding/foxhound/default48.png b/browser/branding/foxhound/default48.png index b7cffcdd44d2f..1505cfa468a6a 100644 Binary files a/browser/branding/foxhound/default48.png and b/browser/branding/foxhound/default48.png differ diff --git a/browser/branding/foxhound/default64.png b/browser/branding/foxhound/default64.png index 057bd9c981b1a..9202953a7fec4 100644 Binary files a/browser/branding/foxhound/default64.png and b/browser/branding/foxhound/default64.png differ diff --git a/browser/branding/foxhound/disk.icns b/browser/branding/foxhound/disk.icns index 718f1a3d3c6a8..ca9a9313ae6ee 100644 Binary files a/browser/branding/foxhound/disk.icns and b/browser/branding/foxhound/disk.icns differ diff --git a/browser/branding/foxhound/document.icns b/browser/branding/foxhound/document.icns index ff419f2f7b073..6733b9ff3e946 100644 Binary files a/browser/branding/foxhound/document.icns and b/browser/branding/foxhound/document.icns differ diff --git a/browser/branding/foxhound/document.ico b/browser/branding/foxhound/document.ico index 584a0a1bf0acb..2f4cdd6a070a5 100644 Binary files a/browser/branding/foxhound/document.ico and b/browser/branding/foxhound/document.ico differ diff --git a/browser/branding/foxhound/document_pdf.ico b/browser/branding/foxhound/document_pdf.ico new file mode 100644 index 0000000000000..d6fe7c5bded97 Binary files /dev/null and b/browser/branding/foxhound/document_pdf.ico differ diff --git a/browser/branding/foxhound/firefox.VisualElementsManifest.xml b/browser/branding/foxhound/firefox.VisualElementsManifest.xml new file mode 100644 index 0000000000000..6e89c2d438773 --- /dev/null +++ b/browser/branding/foxhound/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/foxhound/firefox.icns b/browser/branding/foxhound/firefox.icns index e633f9fc4d3db..8fd93095c9cf7 100644 Binary files a/browser/branding/foxhound/firefox.icns and b/browser/branding/foxhound/firefox.icns differ diff --git a/browser/branding/foxhound/firefox.ico b/browser/branding/foxhound/firefox.ico index d1c1ba24dbdd8..6dd5a31d65f9d 100644 Binary files a/browser/branding/foxhound/firefox.ico and b/browser/branding/foxhound/firefox.ico differ diff --git a/browser/branding/foxhound/firefox64.ico b/browser/branding/foxhound/firefox64.ico index 9eedfaf65ac6f..4a6da8e6e4455 100644 Binary files a/browser/branding/foxhound/firefox64.ico and b/browser/branding/foxhound/firefox64.ico differ diff --git a/browser/branding/foxhound/locales/en-US/brand.ftl b/browser/branding/foxhound/locales/en-US/brand.ftl index 9f05bb01b7abf..f5d608ee35cd8 100644 --- a/browser/branding/foxhound/locales/en-US/brand.ftl +++ b/browser/branding/foxhound/locales/en-US/brand.ftl @@ -1,25 +1,27 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# -## Firefox Brand +## Firefox and Mozilla Brand ## -## Firefox must be treated as a brand, and kept in English. -## It cannot be: -## - Declined to adapt to grammatical case. +## Firefox and Mozilla must be treated as a brand. +## +## They cannot be: ## - Transliterated. ## - Translated. ## -## Reference: https://www.mozilla.org/styleguide/communications/translation/ +## Declension should be avoided where possible, leaving the original +## brand unaltered in prominent UI positions. +## +## For further details, consult: +## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark -brand-shorter-name = Foxhound -brand-short-name = Foxhound +-brand-shortcut-name = Foxhound -brand-full-name = Project Foxhound # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). --brand-product-name = Foxhound +-brand-product-name = Project Foxhound -vendor-short-name = SAP -trademarkInfo = Project Foxhound is an experimental taint-aware web browser based on Firefox. +trademarkInfo = { " " } diff --git a/browser/branding/foxhound/locales/en-US/brand.properties b/browser/branding/foxhound/locales/en-US/brand.properties index 9b4c752af61bc..ce879d254591a 100644 --- a/browser/branding/foxhound/locales/en-US/brand.properties +++ b/browser/branding/foxhound/locales/en-US/brand.properties @@ -1,17 +1,7 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# brandShorterName=Foxhound brandShortName=Foxhound -brandFullName=Project Taintfox -# LOCALIZATION NOTE(brandProductName): -# This brand name can be used in messages where the product name needs to -# remain unchanged across different versions (Nightly, Beta, etc.). -brandProductName=Foxhound -vendorShortName=SAP - -syncBrandShortName=Sync +brandFullName=Foxhound diff --git a/browser/branding/foxhound/locales/jar.mn b/browser/branding/foxhound/locales/jar.mn index 16df31cead1dc..e67add60f582a 100644 --- a/browser/branding/foxhound/locales/jar.mn +++ b/browser/branding/foxhound/locales/jar.mn @@ -2,9 +2,6 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# [localization] @AB_CD@.jar: branding (en-US/**/*.ftl) @@ -12,5 +9,4 @@ @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ # Unofficial branding only exists in en-US - locale/branding/brand.dtd (en-US/brand.dtd) locale/branding/brand.properties (en-US/brand.properties) diff --git a/browser/branding/foxhound/locales/moz.build b/browser/branding/foxhound/locales/moz.build index 5d725a158bd0b..d988c0ff9b162 100644 --- a/browser/branding/foxhound/locales/moz.build +++ b/browser/branding/foxhound/locales/moz.build @@ -3,10 +3,5 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# -DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file +JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/branding/foxhound/moz.build b/browser/branding/foxhound/moz.build index 7303ab0e52941..dd081ac44496d 100644 --- a/browser/branding/foxhound/moz.build +++ b/browser/branding/foxhound/moz.build @@ -3,14 +3,11 @@ # 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/. -# -# Modifications Copyright SAP SE. 2019-2021. All rights reserved. -# -DIRS += ['content', 'locales'] +DIRS += ["content", "locales"] -DIST_SUBDIR = 'browser' -export('DIST_SUBDIR') +DIST_SUBDIR = "browser" +export("DIST_SUBDIR") -include('../branding-common.mozbuild') +include("../branding-common.mozbuild") FirefoxBranding() diff --git a/browser/branding/foxhound/msix/Assets/Document44x44.png b/browser/branding/foxhound/msix/Assets/Document44x44.png new file mode 100644 index 0000000000000..6b4855a22d2cb Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Document44x44.png differ diff --git a/browser/branding/foxhound/msix/Assets/LargeTile.scale-200.png b/browser/branding/foxhound/msix/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000000..c0183be2d94a1 Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/LargeTile.scale-200.png differ diff --git a/browser/branding/foxhound/msix/Assets/SmallTile.scale-200.png b/browser/branding/foxhound/msix/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000000..8130df5fa0490 Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/SmallTile.scale-200.png differ diff --git a/browser/branding/foxhound/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/foxhound/msix/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000..2201a29f8a527 Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Square150x150Logo.scale-200.png differ diff --git a/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000000..34782f67ad4bd Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000000..34782f67ad4bd Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/browser/branding/foxhound/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/foxhound/msix/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000..c1c040fbd2d3a Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Square44x44Logo.scale-200.png differ diff --git a/browser/branding/foxhound/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/foxhound/msix/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000000..2e0c0ba0356c4 Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/browser/branding/foxhound/msix/Assets/StoreLogo.scale-200.png b/browser/branding/foxhound/msix/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000000..c398bbf5b2c3b Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/StoreLogo.scale-200.png differ diff --git a/browser/branding/foxhound/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/foxhound/msix/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000..2759c2989ba62 Binary files /dev/null and b/browser/branding/foxhound/msix/Assets/Wide310x150Logo.scale-200.png differ diff --git a/browser/branding/foxhound/pbmode.ico b/browser/branding/foxhound/pbmode.ico index 47677c13fba68..6462477dbab77 100644 Binary files a/browser/branding/foxhound/pbmode.ico and b/browser/branding/foxhound/pbmode.ico differ diff --git a/browser/branding/foxhound/pref/firefox-branding.js b/browser/branding/foxhound/pref/firefox-branding.js index 5ae5255550ae2..f22dd0a51ccb3 100644 --- a/browser/branding/foxhound/pref/firefox-branding.js +++ b/browser/branding/foxhound/pref/firefox-branding.js @@ -1,9 +1,8 @@ /* 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/. */ -/* - * Modifications Copyright SAP SE. 2019-2021. All rights reserved. - */ + +// This file contains branding-specific prefs. pref("startup.homepage_override_url", ""); pref("startup.homepage_welcome_url", ""); @@ -28,6 +27,6 @@ pref("app.update.checkInstallTime.days", 2); // 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 +// Number of usages of the web console. +// If this is less than 5, then pasting code into the web console is disabled pref("devtools.selfxss.count", 5); diff --git a/browser/branding/foxhound/private_browsing.VisualElementsManifest.xml b/browser/branding/foxhound/private_browsing.VisualElementsManifest.xml new file mode 100644 index 0000000000000..fdff8c55ffe3b --- /dev/null +++ b/browser/branding/foxhound/private_browsing.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/foxhound/stubinstaller/bgstub.jpg b/browser/branding/foxhound/stubinstaller/bgstub.jpg index 289da91c35fb8..387b7a9033466 100644 Binary files a/browser/branding/foxhound/stubinstaller/bgstub.jpg and b/browser/branding/foxhound/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/foxhound/taintfox-square.png b/browser/branding/foxhound/taintfox-square.png new file mode 100644 index 0000000000000..563a39dfb839a Binary files /dev/null and b/browser/branding/foxhound/taintfox-square.png differ diff --git a/browser/branding/foxhound/wizHeader.bmp b/browser/branding/foxhound/wizHeader.bmp index 9a258d6c7c857..88b81975af0a9 100644 Binary files a/browser/branding/foxhound/wizHeader.bmp and b/browser/branding/foxhound/wizHeader.bmp differ diff --git a/browser/branding/foxhound/wizHeaderRTL.bmp b/browser/branding/foxhound/wizHeaderRTL.bmp index 7c6abe34ded6e..8613cfa31497e 100644 Binary files a/browser/branding/foxhound/wizHeaderRTL.bmp and b/browser/branding/foxhound/wizHeaderRTL.bmp differ diff --git a/browser/branding/foxhound/wizWatermark.bmp b/browser/branding/foxhound/wizWatermark.bmp index 0b194f018de51..df4bdfb815be4 100644 Binary files a/browser/branding/foxhound/wizWatermark.bmp and b/browser/branding/foxhound/wizWatermark.bmp differ