From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 02:47:55 +0200 Subject: Adding upstream version 124.0.1. Signed-off-by: Daniel Baumann --- browser/branding/official/LICENSE | 10 +++ browser/branding/official/PrivateBrowsing_150.png | Bin 0 -> 15664 bytes browser/branding/official/PrivateBrowsing_70.png | Bin 0 -> 5752 bytes browser/branding/official/VisualElements_150.png | Bin 0 -> 23037 bytes browser/branding/official/VisualElements_70.png | Bin 0 -> 8763 bytes browser/branding/official/background.png | Bin 0 -> 35286 bytes browser/branding/official/branding.nsi | 76 ++++++++++++++++++ browser/branding/official/configure.sh | 5 ++ .../official/content/about-logo-private.png | Bin 0 -> 12361 bytes .../official/content/about-logo-private@2x.png | Bin 0 -> 31694 bytes browser/branding/official/content/about-logo.png | Bin 0 -> 21840 bytes browser/branding/official/content/about-logo.svg | 1 + .../branding/official/content/about-logo@2x.png | Bin 0 -> 53453 bytes .../branding/official/content/about-wordmark.svg | 7 ++ browser/branding/official/content/about.png | Bin 0 -> 17990 bytes browser/branding/official/content/aboutDialog.css | 25 ++++++ .../branding/official/content/firefox-wordmark.svg | 1 + browser/branding/official/content/jar.mn | 21 +++++ browser/branding/official/content/moz.build | 7 ++ browser/branding/official/default128.png | Bin 0 -> 13513 bytes browser/branding/official/default16.png | Bin 0 -> 722 bytes browser/branding/official/default22.png | Bin 0 -> 1134 bytes browser/branding/official/default24.png | Bin 0 -> 1312 bytes browser/branding/official/default256.png | Bin 0 -> 32441 bytes browser/branding/official/default32.png | Bin 0 -> 1948 bytes browser/branding/official/default48.png | Bin 0 -> 3448 bytes browser/branding/official/default64.png | Bin 0 -> 5459 bytes browser/branding/official/disk.icns | Bin 0 -> 1525764 bytes browser/branding/official/document.icns | Bin 0 -> 501145 bytes browser/branding/official/document.ico | Bin 0 -> 45478 bytes browser/branding/official/document_pdf.ico | Bin 0 -> 19994 bytes browser/branding/official/dsstore | Bin 0 -> 12292 bytes .../official/firefox.VisualElementsManifest.xml | 12 +++ browser/branding/official/firefox.icns | Bin 0 -> 827218 bytes browser/branding/official/firefox.ico | Bin 0 -> 68328 bytes browser/branding/official/firefox64.ico | Bin 0 -> 38630 bytes browser/branding/official/locales/en-US/brand.ftl | 27 +++++++ .../official/locales/en-US/brand.properties | 7 ++ browser/branding/official/locales/jar.mn | 11 +++ browser/branding/official/locales/moz.build | 7 ++ browser/branding/official/moz.build | 13 +++ .../official/msix/Assets/Document44x44.png | Bin 0 -> 2569 bytes .../official/msix/Assets/LargeTile.scale-200.png | Bin 0 -> 187605 bytes .../official/msix/Assets/SmallTile.scale-200.png | Bin 0 -> 8923 bytes .../msix/Assets/Square150x150Logo.scale-200.png | Bin 0 -> 63556 bytes ...44Logo.altform-lightunplated_targetsize-256.png | Bin 0 -> 58010 bytes ...re44x44Logo.altform-unplated_targetsize-256.png | Bin 0 -> 58010 bytes .../msix/Assets/Square44x44Logo.scale-200.png | Bin 0 -> 7710 bytes .../msix/Assets/Square44x44Logo.targetsize-256.png | Bin 0 -> 39097 bytes .../official/msix/Assets/StoreLogo.scale-200.png | Bin 0 -> 14069 bytes .../msix/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 17159 bytes browser/branding/official/newtab.ico | Bin 0 -> 6518 bytes browser/branding/official/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/official/pbmode.ico | Bin 0 -> 35978 bytes browser/branding/official/pref/firefox-branding.js | 48 ++++++++++++ .../private_browsing.VisualElementsManifest.xml | 12 +++ browser/branding/official/stubinstaller/bgstub.jpg | Bin 0 -> 68315 bytes .../official/stubinstaller/installing_page.css | 87 +++++++++++++++++++++ .../stubinstaller/profile_cleanup_page.css | 75 ++++++++++++++++++ browser/branding/official/wizHeader.bmp | Bin 0 -> 25820 bytes browser/branding/official/wizHeaderRTL.bmp | Bin 0 -> 25820 bytes browser/branding/official/wizWatermark.bmp | Bin 0 -> 154544 bytes 62 files changed, 452 insertions(+) create mode 100644 browser/branding/official/LICENSE create mode 100644 browser/branding/official/PrivateBrowsing_150.png create mode 100644 browser/branding/official/PrivateBrowsing_70.png create mode 100644 browser/branding/official/VisualElements_150.png create mode 100644 browser/branding/official/VisualElements_70.png create mode 100644 browser/branding/official/background.png create mode 100644 browser/branding/official/branding.nsi create mode 100644 browser/branding/official/configure.sh create mode 100644 browser/branding/official/content/about-logo-private.png create mode 100644 browser/branding/official/content/about-logo-private@2x.png create mode 100644 browser/branding/official/content/about-logo.png create mode 100644 browser/branding/official/content/about-logo.svg create mode 100644 browser/branding/official/content/about-logo@2x.png create mode 100644 browser/branding/official/content/about-wordmark.svg create mode 100644 browser/branding/official/content/about.png create mode 100644 browser/branding/official/content/aboutDialog.css create mode 100644 browser/branding/official/content/firefox-wordmark.svg create mode 100644 browser/branding/official/content/jar.mn create mode 100644 browser/branding/official/content/moz.build create mode 100644 browser/branding/official/default128.png create mode 100644 browser/branding/official/default16.png create mode 100644 browser/branding/official/default22.png create mode 100644 browser/branding/official/default24.png create mode 100644 browser/branding/official/default256.png create mode 100644 browser/branding/official/default32.png create mode 100644 browser/branding/official/default48.png create mode 100644 browser/branding/official/default64.png create mode 100644 browser/branding/official/disk.icns create mode 100644 browser/branding/official/document.icns create mode 100644 browser/branding/official/document.ico create mode 100644 browser/branding/official/document_pdf.ico create mode 100644 browser/branding/official/dsstore create mode 100644 browser/branding/official/firefox.VisualElementsManifest.xml create mode 100644 browser/branding/official/firefox.icns create mode 100644 browser/branding/official/firefox.ico create mode 100644 browser/branding/official/firefox64.ico create mode 100644 browser/branding/official/locales/en-US/brand.ftl create mode 100644 browser/branding/official/locales/en-US/brand.properties create mode 100644 browser/branding/official/locales/jar.mn create mode 100644 browser/branding/official/locales/moz.build create mode 100644 browser/branding/official/moz.build create mode 100644 browser/branding/official/msix/Assets/Document44x44.png create mode 100644 browser/branding/official/msix/Assets/LargeTile.scale-200.png create mode 100644 browser/branding/official/msix/Assets/SmallTile.scale-200.png create mode 100644 browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png create mode 100644 browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png create mode 100644 browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png create mode 100644 browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png create mode 100644 browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png create mode 100644 browser/branding/official/msix/Assets/StoreLogo.scale-200.png create mode 100644 browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png create mode 100644 browser/branding/official/newtab.ico create mode 100644 browser/branding/official/newwindow.ico create mode 100644 browser/branding/official/pbmode.ico create mode 100644 browser/branding/official/pref/firefox-branding.js create mode 100644 browser/branding/official/private_browsing.VisualElementsManifest.xml create mode 100644 browser/branding/official/stubinstaller/bgstub.jpg create mode 100644 browser/branding/official/stubinstaller/installing_page.css create mode 100644 browser/branding/official/stubinstaller/profile_cleanup_page.css create mode 100644 browser/branding/official/wizHeader.bmp create mode 100644 browser/branding/official/wizHeaderRTL.bmp create mode 100644 browser/branding/official/wizWatermark.bmp (limited to 'browser/branding/official') diff --git a/browser/branding/official/LICENSE b/browser/branding/official/LICENSE new file mode 100644 index 0000000000..9593f9c7b6 --- /dev/null +++ b/browser/branding/official/LICENSE @@ -0,0 +1,10 @@ +These files are under the MPL 2, as below. However, please note that you +are not granted any trademark rights or licenses to the trademarks of the +Mozilla Foundation or any party, including without limitation the +Firefox name or logo. + +For more information, see: https://www.mozilla.org/foundation/licensing/ + +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 https://mozilla.org/MPL/2.0/. diff --git a/browser/branding/official/PrivateBrowsing_150.png b/browser/branding/official/PrivateBrowsing_150.png new file mode 100644 index 0000000000..e95485e137 Binary files /dev/null and b/browser/branding/official/PrivateBrowsing_150.png differ diff --git a/browser/branding/official/PrivateBrowsing_70.png b/browser/branding/official/PrivateBrowsing_70.png new file mode 100644 index 0000000000..b6fb4a11de Binary files /dev/null and b/browser/branding/official/PrivateBrowsing_70.png differ diff --git a/browser/branding/official/VisualElements_150.png b/browser/branding/official/VisualElements_150.png new file mode 100644 index 0000000000..f764a48966 Binary files /dev/null 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 new file mode 100644 index 0000000000..197a645b42 Binary files /dev/null and b/browser/branding/official/VisualElements_70.png differ diff --git a/browser/branding/official/background.png b/browser/branding/official/background.png new file mode 100644 index 0000000000..31331ff808 Binary files /dev/null and b/browser/branding/official/background.png differ diff --git a/browser/branding/official/branding.nsi b/browser/branding/official/branding.nsi new file mode 100644 index 0000000000..bbdead7e4a --- /dev/null +++ b/browser/branding/official/branding.nsi @@ -0,0 +1,76 @@ +# 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 official release builds. +# The nightly build branding.nsi is located in browser/installer/windows/nsis/ +# 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 "Mozilla Firefox" +!define BrandFullName "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" + +; 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 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 "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" + +# Dialog units are used so the UI displays correctly with the system's DPI +# settings. These are tweaked to look good with the en-US strings; ideally +# we would customize them for each locale but we don't really have a way to +# implement that and it would be a ton of work for the localizers. +!define PROFILE_CLEANUP_LABEL_TOP "50u" +!define PROFILE_CLEANUP_LABEL_LEFT "22u" +!define PROFILE_CLEANUP_LABEL_WIDTH "175u" +!define PROFILE_CLEANUP_LABEL_HEIGHT "100u" +!define PROFILE_CLEANUP_LABEL_ALIGN "left" +!define PROFILE_CLEANUP_CHECKBOX_LEFT "22u" +!define PROFILE_CLEANUP_CHECKBOX_WIDTH "175u" +!define PROFILE_CLEANUP_BUTTON_LEFT "22u" +!define INSTALL_HEADER_TOP "70u" +!define INSTALL_HEADER_LEFT "22u" +!define INSTALL_HEADER_WIDTH "180u" +!define INSTALL_HEADER_HEIGHT "100u" +!define INSTALL_BODY_LEFT "22u" +!define INSTALL_BODY_WIDTH "180u" +!define INSTALL_INSTALLING_TOP "115u" +!define INSTALL_INSTALLING_LEFT "270u" +!define INSTALL_INSTALLING_WIDTH "150u" +!define INSTALL_PROGRESS_BAR_TOP "100u" +!define INSTALL_PROGRESS_BAR_LEFT "270u" +!define INSTALL_PROGRESS_BAR_WIDTH "150u" +!define INSTALL_PROGRESS_BAR_HEIGHT "12u" + +!define PROFILE_CLEANUP_CHECKBOX_TOP_MARGIN "12u" +!define PROFILE_CLEANUP_BUTTON_TOP_MARGIN "12u" +!define PROFILE_CLEANUP_BUTTON_X_PADDING "80u" +!define PROFILE_CLEANUP_BUTTON_Y_PADDING "8u" +!define INSTALL_BODY_TOP_MARGIN "20u" + +# Font settings that can be customized for each channel +!define INSTALL_HEADER_FONT_SIZE 20 +!define INSTALL_HEADER_FONT_WEIGHT 600 +!define INSTALL_INSTALLING_FONT_SIZE 15 +!define INSTALL_INSTALLING_FONT_WEIGHT 600 + +# UI Colors that can be customized for each channel +!define COMMON_TEXT_COLOR 0x000000 +!define COMMON_BACKGROUND_COLOR 0xFFFFFF +!define INSTALL_INSTALLING_TEXT_COLOR 0xFFFFFF +# This color is written as 0x00BBGGRR because it's actually a COLORREF value. +!define PROGRESS_BAR_BACKGROUND_COLOR 0xFFAA00 diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh new file mode 100644 index 0000000000..92ef14e03f --- /dev/null +++ b/browser/branding/official/configure.sh @@ -0,0 +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/. + +MOZ_APP_DISPLAYNAME=Firefox diff --git a/browser/branding/official/content/about-logo-private.png b/browser/branding/official/content/about-logo-private.png new file mode 100644 index 0000000000..e5359a1c23 Binary files /dev/null and b/browser/branding/official/content/about-logo-private.png differ diff --git a/browser/branding/official/content/about-logo-private@2x.png b/browser/branding/official/content/about-logo-private@2x.png new file mode 100644 index 0000000000..74315c3973 Binary files /dev/null and b/browser/branding/official/content/about-logo-private@2x.png differ diff --git a/browser/branding/official/content/about-logo.png b/browser/branding/official/content/about-logo.png new file mode 100644 index 0000000000..b37e61c59f Binary files /dev/null and b/browser/branding/official/content/about-logo.png differ diff --git a/browser/branding/official/content/about-logo.svg b/browser/branding/official/content/about-logo.svg new file mode 100644 index 0000000000..c382310ecd --- /dev/null +++ b/browser/branding/official/content/about-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/official/content/about-logo@2x.png b/browser/branding/official/content/about-logo@2x.png new file mode 100644 index 0000000000..6ca067c1af Binary files /dev/null and b/browser/branding/official/content/about-logo@2x.png differ diff --git a/browser/branding/official/content/about-wordmark.svg b/browser/branding/official/content/about-wordmark.svg new file mode 100644 index 0000000000..22a228028d --- /dev/null +++ b/browser/branding/official/content/about-wordmark.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/browser/branding/official/content/about.png b/browser/branding/official/content/about.png new file mode 100644 index 0000000000..bec6b90de5 Binary files /dev/null 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 new file mode 100644 index 0000000000..0a88f2f784 --- /dev/null +++ b/browser/branding/official/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-color: #20123a; + color: #fff; + color-scheme: dark; +} + +#rightBox { + margin-inline: 30px; +} + +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; +} + +#trademark { + font-size: xx-small; + text-align: center; + color: #999999; + margin-block: 10px; +} diff --git a/browser/branding/official/content/firefox-wordmark.svg b/browser/branding/official/content/firefox-wordmark.svg new file mode 100644 index 0000000000..65270a3cd9 --- /dev/null +++ b/browser/branding/official/content/firefox-wordmark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn new file mode 100644 index 0000000000..d623a6a2b3 --- /dev/null +++ b/browser/branding/official/content/jar.mn @@ -0,0 +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/. + +browser.jar: +% content branding %content/branding/ contentaccessible=yes + content/branding/about.png + content/branding/about-logo.png + content/branding/about-logo.svg + content/branding/about-logo@2x.png + content/branding/about-logo-private.png + content/branding/about-logo-private@2x.png + content/branding/about-wordmark.svg + 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/aboutDialog.css diff --git a/browser/branding/official/content/moz.build b/browser/branding/official/content/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/official/content/moz.build @@ -0,0 +1,7 @@ +# -*- 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"] diff --git a/browser/branding/official/default128.png b/browser/branding/official/default128.png new file mode 100644 index 0000000000..b92d78ca6d Binary files /dev/null and b/browser/branding/official/default128.png differ diff --git a/browser/branding/official/default16.png b/browser/branding/official/default16.png new file mode 100644 index 0000000000..fe860e46b1 Binary files /dev/null and b/browser/branding/official/default16.png differ diff --git a/browser/branding/official/default22.png b/browser/branding/official/default22.png new file mode 100644 index 0000000000..3aff987a84 Binary files /dev/null and b/browser/branding/official/default22.png differ diff --git a/browser/branding/official/default24.png b/browser/branding/official/default24.png new file mode 100644 index 0000000000..cfce6e7d64 Binary files /dev/null and b/browser/branding/official/default24.png differ diff --git a/browser/branding/official/default256.png b/browser/branding/official/default256.png new file mode 100644 index 0000000000..ddc9d4db1f Binary files /dev/null and b/browser/branding/official/default256.png differ diff --git a/browser/branding/official/default32.png b/browser/branding/official/default32.png new file mode 100644 index 0000000000..67042dbb2b Binary files /dev/null and b/browser/branding/official/default32.png differ diff --git a/browser/branding/official/default48.png b/browser/branding/official/default48.png new file mode 100644 index 0000000000..765ea42459 Binary files /dev/null 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 0000000000..39e7738902 Binary files /dev/null and b/browser/branding/official/default64.png differ diff --git a/browser/branding/official/disk.icns b/browser/branding/official/disk.icns new file mode 100644 index 0000000000..4353ef0965 Binary files /dev/null and b/browser/branding/official/disk.icns differ diff --git a/browser/branding/official/document.icns b/browser/branding/official/document.icns new file mode 100644 index 0000000000..50d9701405 Binary files /dev/null and b/browser/branding/official/document.icns differ diff --git a/browser/branding/official/document.ico b/browser/branding/official/document.ico new file mode 100644 index 0000000000..fcec7dc156 Binary files /dev/null and b/browser/branding/official/document.ico differ diff --git a/browser/branding/official/document_pdf.ico b/browser/branding/official/document_pdf.ico new file mode 100644 index 0000000000..d6fe7c5bde Binary files /dev/null and b/browser/branding/official/document_pdf.ico differ diff --git a/browser/branding/official/dsstore b/browser/branding/official/dsstore new file mode 100644 index 0000000000..8ea7036745 Binary files /dev/null and b/browser/branding/official/dsstore differ diff --git a/browser/branding/official/firefox.VisualElementsManifest.xml b/browser/branding/official/firefox.VisualElementsManifest.xml new file mode 100644 index 0000000000..85e09dd7a9 --- /dev/null +++ b/browser/branding/official/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/official/firefox.icns b/browser/branding/official/firefox.icns new file mode 100644 index 0000000000..6e8ca8725f Binary files /dev/null and b/browser/branding/official/firefox.icns differ diff --git a/browser/branding/official/firefox.ico b/browser/branding/official/firefox.ico new file mode 100644 index 0000000000..d8ba663ba7 Binary files /dev/null and b/browser/branding/official/firefox.ico differ diff --git a/browser/branding/official/firefox64.ico b/browser/branding/official/firefox64.ico new file mode 100644 index 0000000000..c3a32449d2 Binary files /dev/null and b/browser/branding/official/firefox64.ico differ diff --git a/browser/branding/official/locales/en-US/brand.ftl b/browser/branding/official/locales/en-US/brand.ftl new file mode 100644 index 0000000000..8496cb22ff --- /dev/null +++ b/browser/branding/official/locales/en-US/brand.ftl @@ -0,0 +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/. + +## Firefox and Mozilla Brand +## +## Firefox and Mozilla must be treated as a brand. +## +## They cannot be: +## - Transliterated. +## - Translated. +## +## 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 = Firefox +-brand-short-name = Firefox +-brand-shortcut-name = Firefox +-brand-full-name = Mozilla Firefox +# 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 = Firefox +-vendor-short-name = Mozilla +trademarkInfo = Firefox and the Firefox logos are trademarks of the Mozilla Foundation. diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties new file mode 100644 index 0000000000..e199526902 --- /dev/null +++ b/browser/branding/official/locales/en-US/brand.properties @@ -0,0 +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/. + +brandShorterName=Firefox +brandShortName=Firefox +brandFullName=Mozilla Firefox diff --git a/browser/branding/official/locales/jar.mn b/browser/branding/official/locales/jar.mn new file mode 100644 index 0000000000..2250233dd6 --- /dev/null +++ b/browser/branding/official/locales/jar.mn @@ -0,0 +1,11 @@ +#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/. + +[localization] @AB_CD@.jar: + branding (%*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.properties (%brand.properties) diff --git a/browser/branding/official/locales/moz.build b/browser/branding/official/locales/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/official/locales/moz.build @@ -0,0 +1,7 @@ +# -*- 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"] diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build new file mode 100644 index 0000000000..dd081ac444 --- /dev/null +++ b/browser/branding/official/moz.build @@ -0,0 +1,13 @@ +# -*- 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/official/msix/Assets/Document44x44.png b/browser/branding/official/msix/Assets/Document44x44.png new file mode 100644 index 0000000000..61d83ee39f Binary files /dev/null and b/browser/branding/official/msix/Assets/Document44x44.png differ diff --git a/browser/branding/official/msix/Assets/LargeTile.scale-200.png b/browser/branding/official/msix/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..2e36cdfb1b Binary files /dev/null and b/browser/branding/official/msix/Assets/LargeTile.scale-200.png differ diff --git a/browser/branding/official/msix/Assets/SmallTile.scale-200.png b/browser/branding/official/msix/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..16c23dabbf Binary files /dev/null and b/browser/branding/official/msix/Assets/SmallTile.scale-200.png differ diff --git a/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..3a8409e643 Binary files /dev/null and b/browser/branding/official/msix/Assets/Square150x150Logo.scale-200.png differ diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..9b370d66df Binary files /dev/null and b/browser/branding/official/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..9b370d66df Binary files /dev/null and b/browser/branding/official/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..74af40181a Binary files /dev/null and b/browser/branding/official/msix/Assets/Square44x44Logo.scale-200.png differ diff --git a/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..15b9de5641 Binary files /dev/null and b/browser/branding/official/msix/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/browser/branding/official/msix/Assets/StoreLogo.scale-200.png b/browser/branding/official/msix/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000..6e83ce4084 Binary files /dev/null and b/browser/branding/official/msix/Assets/StoreLogo.scale-200.png differ diff --git a/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..b37f47de6c Binary files /dev/null and b/browser/branding/official/msix/Assets/Wide310x150Logo.scale-200.png differ diff --git a/browser/branding/official/newtab.ico b/browser/branding/official/newtab.ico new file mode 100644 index 0000000000..a9b37c08c6 Binary files /dev/null and b/browser/branding/official/newtab.ico differ diff --git a/browser/branding/official/newwindow.ico b/browser/branding/official/newwindow.ico new file mode 100644 index 0000000000..5537207710 Binary files /dev/null and b/browser/branding/official/newwindow.ico differ diff --git a/browser/branding/official/pbmode.ico b/browser/branding/official/pbmode.ico new file mode 100644 index 0000000000..bfa3aa6ced Binary files /dev/null and b/browser/branding/official/pbmode.ico differ diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js new file mode 100644 index 0000000000..5125604fe9 --- /dev/null +++ b/browser/branding/official/pref/firefox-branding.js @@ -0,0 +1,48 @@ +/* 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/. */ + +// This file contains branding-specific prefs. + +pref("startup.homepage_override_url", ""); +pref("startup.homepage_welcome_url", "about:welcome"); +pref("startup.homepage_welcome_url.additional", ""); +// Interval: Time between checks for a new version (in seconds) +pref("app.update.interval", 43200); // 12 hours +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); +// app.update.url.manual: URL user can browse to manually if for some reason +// all update installation attempts fail. +// app.update.url.details: a default value for the "More information about this +// update" link supplied in the "An update is available" page of the update +// wizard. +#if MOZ_UPDATE_CHANNEL == beta + pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/beta?reason=manual-update"); + pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/beta/notes"); + pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew"); + pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%beta/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog"); +#elifdef MOZ_ESR + pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/enterprise?reason=manual-update"); + pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/organizations/notes"); + pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew"); + pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog"); +#else + pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/new?reason=manual-update"); + pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/notes"); + pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=whatsnew"); + pref("app.releaseNotesURL.aboutDialog", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog"); +#endif +pref("app.releaseNotesURL.prompt", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=updateprompt"); + +// 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); + +// 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. +// If this is less than 5, then pasting code into the web console is disabled +pref("devtools.selfxss.count", 0); diff --git a/browser/branding/official/private_browsing.VisualElementsManifest.xml b/browser/branding/official/private_browsing.VisualElementsManifest.xml new file mode 100644 index 0000000000..fdff8c55ff --- /dev/null +++ b/browser/branding/official/private_browsing.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/official/stubinstaller/bgstub.jpg b/browser/branding/official/stubinstaller/bgstub.jpg new file mode 100644 index 0000000000..4d6240399c Binary files /dev/null and b/browser/branding/official/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/official/stubinstaller/installing_page.css b/browser/branding/official/stubinstaller/installing_page.css new file mode 100644 index 0000000000..5704eb3b3e --- /dev/null +++ b/browser/branding/official/stubinstaller/installing_page.css @@ -0,0 +1,87 @@ +/* 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: black; +} + +/* + * We want to treat the two pieces of text in the left column as one unit and + center that unit vertically in the window. In order to make IE8 do that, + we have to wrap the two bits of text in a container and make that a + table-cell (which means we need an outer container that's display: table). + So that's what this mess is doing. + */ +#text_column { + position: fixed; + height: 100%; + margin-left: 30px; + width: 40%; + display: table; +} + +#text_column_container { + display: table-cell; + vertical-align: middle; + padding-top: 60px; +} + +#header { + font-size: 24px; + font-weight: 800; + margin-top: 0; +} + +#content { + font-size: 22px; +} + +#installing { + position: fixed; + right: 30px; + bottom: 55%; + margin-top: auto; + margin-bottom: auto; + width: 35%; +} + +#label { + color: white; + + position: relative; + top: 50px; + + text-align: center; + font-size: 20px; +} + +#progress_background { + width: 100%; + height: 20px; + 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: 20px solid; + box-sizing: border-box; +} + +/* No blurb or footer for this layout. */ +#blurb, +#footer { + visibility: hidden; +} diff --git a/browser/branding/official/stubinstaller/profile_cleanup_page.css b/browser/branding/official/stubinstaller/profile_cleanup_page.css new file mode 100644 index 0000000000..a8dbad0e11 --- /dev/null +++ b/browser/branding/official/stubinstaller/profile_cleanup_page.css @@ -0,0 +1,75 @@ +/* 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: black; +} + +/* + * We want to treat the two pieces of text in the left column as one unit and + center that unit vertically in the window. In order to make IE8 do that, + we have to wrap the two bits of text in a container and make that a + table-cell (which means we need an outer container that's display: table). + So that's what this mess is doing. + */ +#profileRefreshForm { + position: fixed; + height: 100%; + margin-left: 30px; + width: 40%; + display: table; +} + +#profileRefreshContainer { + display: table-cell; + vertical-align: middle; +} + +#refreshCheckboxContainer, +#refreshButtonContainer { + margin-top: 20px; +} + +#header { + font-size: 25px; + font-weight: 600; +} + +#refreshCheckboxContainer { + position: relative; +} + +#refreshCheckbox { + position: absolute; + top: 1px; +} + +#checkboxLabel { + font-size: 14px; + display: block; +} + +.checkboxLabel-ltr { + margin-left: 25px; +} + +.checkboxLabel-rtl { + margin-right: 25px; +} + +#refreshButton { + padding: 8px 70px; + font-size: 16px; + background: #005ccc; + color: white; +} + +body.normal-contrast #refreshButton { + border: none; +} + +/* No footer for this layout. */ +#footer { + visibility: hidden; +} diff --git a/browser/branding/official/wizHeader.bmp b/browser/branding/official/wizHeader.bmp new file mode 100644 index 0000000000..420824226d Binary files /dev/null and b/browser/branding/official/wizHeader.bmp differ diff --git a/browser/branding/official/wizHeaderRTL.bmp b/browser/branding/official/wizHeaderRTL.bmp new file mode 100644 index 0000000000..7f74929910 Binary files /dev/null and b/browser/branding/official/wizHeaderRTL.bmp differ diff --git a/browser/branding/official/wizWatermark.bmp b/browser/branding/official/wizWatermark.bmp new file mode 100644 index 0000000000..b3b3c91d32 Binary files /dev/null and b/browser/branding/official/wizWatermark.bmp differ -- cgit v1.2.3