Commit 995f759c authored by Mike Perry's avatar Mike Perry Committed by Alex Catarineu
Browse files

Bug 2176: Rebrand Firefox to TorBrowser

See also Bugs #5194, #7187, #8115, #8219.

This patch does some basic renaming of Firefox to TorBrowser. The rest of the
branding is done by images and icons.

Also fix bug 27905.

Bug 25702: Update Tor Browser icon to follow design guidelines

- Updated all of the branding in /browser/branding/official with new 'stable'
icon series.
- Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and
add the source svg in the same directory
- Copied /browser/branding/official over /browser/branding/nightly and the new
/browser/branding/alpha directories. Replaced content with 'nightly' and
'alpha' icon series.
Updated VisualElements_70.png and VisualElements_150.png with updated icons in
each branding directory (fixes #22654)
- Updated firefox.VisualElementsManfiest.xml with updated colors in each
branding directory
- Updated content/identity-icons-brand.svg with Tor Browser icon (fixes #28111)
- Added firefox.svg to each branding directory from which all the other icons
are derived (apart from document.icns and document.ico)
- Added default256.png and default512.png icons
- Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed
original icon
- Use the Tor Browser icon within devtools/client/themes/images/.

Bug 30631: Blurry Tor Browser icon on macOS app switcher

It would seem the png2icns tool does not generate correct icns files and
so on macOS the larger icons were missing resulting in blurry icons in
the OS chrome. Regenerated the padded icons in a macOS VM using
iconutil.

Bug 28196: preparations for using torbutton tor-browser-brand.ftl

A small change to Fluent FileSource class is required so that we
can register a new source without its supported locales being
counted as available locales for the browser.

Bug 31803: Replaced about:debugging logo with flat version
parent a064471a
......@@ -477,7 +477,7 @@ function prompt(aActor, aBrowser, aRequest) {
let chromeDoc = aBrowser.ownerDocument;
let stringBundle = chromeDoc.defaultView.gNavigatorBundle;
let localization = new Localization(
["branding/brand.ftl", "browser/browser.ftl"],
["branding/tor-browser-brand.ftl", "browser/browser.ftl"],
true
);
......
......@@ -35,7 +35,7 @@
#endif
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="branding/tor-browser-brand.ftl"/>
<html:link rel="localization" href="browser/aboutDialog.ftl"/>
</linkset>
......
......@@ -27,7 +27,7 @@
<link rel="icon" id="favicon" href="chrome://global/skin/icons/warning.svg"/>
<link rel="localization" href="browser/aboutCertError.ftl" />
<link rel="localization" href="browser/nsserrors.ftl" />
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
</head>
<body dir="&locale.dir;">
......
......@@ -15,7 +15,7 @@
toolkit/components/places/src/nsFaviconService.h should be updated. -->
<link rel="icon" type="image/png" id="favicon"
href="chrome://global/skin/icons/warning.svg"/>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
<link rel="localization" href="browser/aboutRestartRequired.ftl"/>
</head>
<body>
......
......@@ -15,7 +15,7 @@
href="chrome://browser/content/aboutTabCrashed.css"/>
<link rel="stylesheet" type="text/css" media="all"
href="chrome://browser/skin/aboutTabCrashed.css"/>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
<link rel="localization" href="browser/aboutTabCrashed.ftl"/>
<title data-l10n-id="crashed-title"></title>
......
......@@ -9,7 +9,7 @@
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" />
<link rel="stylesheet" href="chrome://browser/skin/blockedSite.css" type="text/css" media="all" />
<link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/blocklist_favicon.png"/>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
<link rel="localization" href="browser/safebrowsing/blockedSite.ftl"/>
</head>
<body>
......
......@@ -17,7 +17,7 @@
data-l10n-attrs="style, buttonlabelaccept, buttonaccesskeyaccept">
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="branding/tor-browser-brand.ftl"/>
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
<html:link rel="localization" href="browser/sync.ftl"/>
</linkset>
......
......@@ -935,7 +935,7 @@ const gStoragePressureObserver = {
}
this._lastNotificationTime = Date.now();
MozXULElement.insertFTLIfNeeded("branding/brand.ftl");
MozXULElement.insertFTLIfNeeded("branding/tor-browser-brand.ftl");
MozXULElement.insertFTLIfNeeded("browser/preferences/preferences.ftl");
const BYTES_IN_GIGABYTE = 1073741824;
......
......@@ -65,7 +65,7 @@
persist="screenX screenY width height sizemode"
data-l10n-sync="true">
<head>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
<link rel="localization" href="browser/branding/brandings.ftl"/>
<link rel="localization" href="toolkit/global/textActions.ftl"/>
......
......@@ -11,7 +11,7 @@
# browser-doctype.inc must also be included.
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="branding/tor-browser-brand.ftl"/>
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
......
......@@ -10,7 +10,7 @@
<meta name="referrer" content="no-referrer">
<link rel="stylesheet" type="text/css" href="chrome://global/skin/in-content/common.css">
<link rel="stylesheet" type="text/css" href="chrome://browser/skin/newInstallPage.css">
<link rel="localization" href="branding/brand.ftl">
<link rel="localization" href="branding/tor-browser-brand.ftl">
<link rel="localization" href="browser/branding/sync-brand.ftl">
<link rel="localization" href="browser/newInstallPage.ftl">
<link rel="icon" type="image/png" href="chrome://branding/content/icon32.png">
......
......@@ -18,7 +18,7 @@
buttonidextra1="refresh-profile">
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="branding/tor-browser-brand.ftl"/>
<html:link rel="localization" href="browser/safeMode.ftl"/>
</linkset>
......
......@@ -15,7 +15,7 @@
chromemargin="0,0,0,0">
<head>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="branding/tor-browser-brand.ftl"/>
<link rel="localization" href="browser/webrtcIndicator.ftl"/>
<title data-l10n-id="webrtc-indicator-title"></title>
<script src="chrome://browser/content/webrtcIndicator.js"></script>
......
# 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 BrandFullName "Firefox Nightly"
!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-nightly-latest"
!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-nightly-latest"
!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&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.
!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 COMMON_TEXT_COLOR 0xFFFFFF
!define COMMON_BACKGROUND_COLOR 0x000000
!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF
# 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="Tor Browser"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment