From 36d22d82aa202bb199967e9512281e9a53db42c9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 21:33:14 +0200 Subject: Adding upstream version 115.7.0esr. Signed-off-by: Daniel Baumann --- browser/branding/nightly/PrivateBrowsing_150.png | Bin 0 -> 16207 bytes browser/branding/nightly/PrivateBrowsing_70.png | Bin 0 -> 5931 bytes browser/branding/nightly/VisualElements_150.png | Bin 0 -> 25470 bytes browser/branding/nightly/VisualElements_70.png | Bin 0 -> 9590 bytes browser/branding/nightly/background.png | Bin 0 -> 36848 bytes browser/branding/nightly/branding.nsi | 64 +++++++++++++++++++++ browser/branding/nightly/configure.sh | 6 ++ .../nightly/content/about-logo-private.png | Bin 0 -> 12848 bytes .../nightly/content/about-logo-private@2x.png | Bin 0 -> 32327 bytes browser/branding/nightly/content/about-logo.png | Bin 0 -> 24031 bytes browser/branding/nightly/content/about-logo.svg | 1 + browser/branding/nightly/content/about-logo@2x.png | Bin 0 -> 59241 bytes .../branding/nightly/content/about-wordmark.svg | 17 ++++++ browser/branding/nightly/content/about.png | Bin 0 -> 20535 bytes browser/branding/nightly/content/aboutDialog.css | 46 +++++++++++++++ .../branding/nightly/content/firefox-wordmark.svg | 1 + browser/branding/nightly/content/jar.mn | 21 +++++++ browser/branding/nightly/content/moz.build | 7 +++ browser/branding/nightly/default128.png | Bin 0 -> 12392 bytes browser/branding/nightly/default16.png | Bin 0 -> 756 bytes browser/branding/nightly/default22.png | Bin 0 -> 1146 bytes browser/branding/nightly/default24.png | Bin 0 -> 1281 bytes browser/branding/nightly/default256.png | Bin 0 -> 30546 bytes browser/branding/nightly/default32.png | Bin 0 -> 1910 bytes browser/branding/nightly/default48.png | Bin 0 -> 3606 bytes browser/branding/nightly/default64.png | Bin 0 -> 4826 bytes browser/branding/nightly/disk.icns | Bin 0 -> 1543130 bytes browser/branding/nightly/document.icns | Bin 0 -> 517716 bytes browser/branding/nightly/document.ico | Bin 0 -> 47042 bytes browser/branding/nightly/document_pdf.ico | Bin 0 -> 19994 bytes browser/branding/nightly/dsstore | Bin 0 -> 14340 bytes .../nightly/firefox.VisualElementsManifest.xml | 12 ++++ browser/branding/nightly/firefox.icns | Bin 0 -> 849878 bytes browser/branding/nightly/firefox.ico | Bin 0 -> 66730 bytes browser/branding/nightly/firefox64.ico | Bin 0 -> 38630 bytes browser/branding/nightly/locales/en-US/brand.ftl | 27 +++++++++ .../nightly/locales/en-US/brand.properties | 7 +++ browser/branding/nightly/locales/jar.mn | 12 ++++ browser/branding/nightly/locales/moz.build | 9 +++ browser/branding/nightly/moz.build | 13 +++++ .../branding/nightly/msix/Assets/Document44x44.png | Bin 0 -> 2579 bytes .../nightly/msix/Assets/LargeTile.scale-200.png | Bin 0 -> 47619 bytes .../nightly/msix/Assets/SmallTile.scale-200.png | Bin 0 -> 8923 bytes .../msix/Assets/Square150x150Logo.scale-200.png | Bin 0 -> 16227 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 .../nightly/msix/Assets/StoreLogo.scale-200.png | Bin 0 -> 14069 bytes .../msix/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 17159 bytes browser/branding/nightly/newtab.ico | Bin 0 -> 6518 bytes browser/branding/nightly/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/nightly/pbmode.ico | Bin 0 -> 37315 bytes browser/branding/nightly/pref/firefox-branding.js | 35 +++++++++++ .../private_browsing.VisualElementsManifest.xml | 12 ++++ browser/branding/nightly/stubinstaller/bgstub.jpg | Bin 0 -> 53597 bytes .../nightly/stubinstaller/installing_page.css | 61 ++++++++++++++++++++ .../nightly/stubinstaller/profile_cleanup_page.css | 42 ++++++++++++++ browser/branding/nightly/wizHeader.bmp | Bin 0 -> 25820 bytes browser/branding/nightly/wizHeaderRTL.bmp | Bin 0 -> 25820 bytes browser/branding/nightly/wizWatermark.bmp | Bin 0 -> 154544 bytes 61 files changed, 393 insertions(+) create mode 100644 browser/branding/nightly/PrivateBrowsing_150.png create mode 100644 browser/branding/nightly/PrivateBrowsing_70.png create mode 100644 browser/branding/nightly/VisualElements_150.png create mode 100644 browser/branding/nightly/VisualElements_70.png create mode 100644 browser/branding/nightly/background.png create mode 100644 browser/branding/nightly/branding.nsi create mode 100644 browser/branding/nightly/configure.sh create mode 100644 browser/branding/nightly/content/about-logo-private.png create mode 100644 browser/branding/nightly/content/about-logo-private@2x.png create mode 100644 browser/branding/nightly/content/about-logo.png create mode 100644 browser/branding/nightly/content/about-logo.svg create mode 100644 browser/branding/nightly/content/about-logo@2x.png create mode 100644 browser/branding/nightly/content/about-wordmark.svg create mode 100644 browser/branding/nightly/content/about.png create mode 100644 browser/branding/nightly/content/aboutDialog.css create mode 100644 browser/branding/nightly/content/firefox-wordmark.svg create mode 100644 browser/branding/nightly/content/jar.mn create mode 100644 browser/branding/nightly/content/moz.build create mode 100644 browser/branding/nightly/default128.png create mode 100644 browser/branding/nightly/default16.png create mode 100644 browser/branding/nightly/default22.png create mode 100644 browser/branding/nightly/default24.png create mode 100644 browser/branding/nightly/default256.png create mode 100644 browser/branding/nightly/default32.png create mode 100644 browser/branding/nightly/default48.png create mode 100644 browser/branding/nightly/default64.png create mode 100644 browser/branding/nightly/disk.icns create mode 100644 browser/branding/nightly/document.icns create mode 100644 browser/branding/nightly/document.ico create mode 100644 browser/branding/nightly/document_pdf.ico create mode 100644 browser/branding/nightly/dsstore create mode 100644 browser/branding/nightly/firefox.VisualElementsManifest.xml create mode 100644 browser/branding/nightly/firefox.icns create mode 100644 browser/branding/nightly/firefox.ico create mode 100644 browser/branding/nightly/firefox64.ico create mode 100644 browser/branding/nightly/locales/en-US/brand.ftl create mode 100644 browser/branding/nightly/locales/en-US/brand.properties create mode 100644 browser/branding/nightly/locales/jar.mn create mode 100644 browser/branding/nightly/locales/moz.build create mode 100644 browser/branding/nightly/moz.build create mode 100644 browser/branding/nightly/msix/Assets/Document44x44.png create mode 100644 browser/branding/nightly/msix/Assets/LargeTile.scale-200.png create mode 100644 browser/branding/nightly/msix/Assets/SmallTile.scale-200.png create mode 100644 browser/branding/nightly/msix/Assets/Square150x150Logo.scale-200.png create mode 100644 browser/branding/nightly/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png create mode 100644 browser/branding/nightly/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png create mode 100644 browser/branding/nightly/msix/Assets/Square44x44Logo.scale-200.png create mode 100644 browser/branding/nightly/msix/Assets/Square44x44Logo.targetsize-256.png create mode 100644 browser/branding/nightly/msix/Assets/StoreLogo.scale-200.png create mode 100644 browser/branding/nightly/msix/Assets/Wide310x150Logo.scale-200.png create mode 100644 browser/branding/nightly/newtab.ico create mode 100644 browser/branding/nightly/newwindow.ico create mode 100644 browser/branding/nightly/pbmode.ico create mode 100644 browser/branding/nightly/pref/firefox-branding.js create mode 100644 browser/branding/nightly/private_browsing.VisualElementsManifest.xml create mode 100644 browser/branding/nightly/stubinstaller/bgstub.jpg create mode 100644 browser/branding/nightly/stubinstaller/installing_page.css create mode 100644 browser/branding/nightly/stubinstaller/profile_cleanup_page.css create mode 100644 browser/branding/nightly/wizHeader.bmp create mode 100644 browser/branding/nightly/wizHeaderRTL.bmp create mode 100644 browser/branding/nightly/wizWatermark.bmp (limited to 'browser/branding/nightly') diff --git a/browser/branding/nightly/PrivateBrowsing_150.png b/browser/branding/nightly/PrivateBrowsing_150.png new file mode 100644 index 0000000000..af676d1b5f Binary files /dev/null and b/browser/branding/nightly/PrivateBrowsing_150.png differ diff --git a/browser/branding/nightly/PrivateBrowsing_70.png b/browser/branding/nightly/PrivateBrowsing_70.png new file mode 100644 index 0000000000..5e5f57687c Binary files /dev/null and b/browser/branding/nightly/PrivateBrowsing_70.png differ diff --git a/browser/branding/nightly/VisualElements_150.png b/browser/branding/nightly/VisualElements_150.png new file mode 100644 index 0000000000..fa21911461 Binary files /dev/null and b/browser/branding/nightly/VisualElements_150.png differ diff --git a/browser/branding/nightly/VisualElements_70.png b/browser/branding/nightly/VisualElements_70.png new file mode 100644 index 0000000000..cefb95b1c3 Binary files /dev/null and b/browser/branding/nightly/VisualElements_70.png differ diff --git a/browser/branding/nightly/background.png b/browser/branding/nightly/background.png new file mode 100644 index 0000000000..dc07244f01 Binary files /dev/null and b/browser/branding/nightly/background.png differ diff --git a/browser/branding/nightly/branding.nsi b/browser/branding/nightly/branding.nsi new file mode 100644 index 0000000000..b37853b776 --- /dev/null +++ b/browser/branding/nightly/branding.nsi @@ -0,0 +1,64 @@ +# 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 diff --git a/browser/branding/nightly/configure.sh b/browser/branding/nightly/configure.sh new file mode 100644 index 0000000000..7c7f2cf8c8 --- /dev/null +++ b/browser/branding/nightly/configure.sh @@ -0,0 +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/. + +MOZ_APP_DISPLAYNAME="Firefox Nightly" +MOZ_MACBUNDLE_ID=nightly diff --git a/browser/branding/nightly/content/about-logo-private.png b/browser/branding/nightly/content/about-logo-private.png new file mode 100644 index 0000000000..9f64352dbe Binary files /dev/null and b/browser/branding/nightly/content/about-logo-private.png differ diff --git a/browser/branding/nightly/content/about-logo-private@2x.png b/browser/branding/nightly/content/about-logo-private@2x.png new file mode 100644 index 0000000000..1949b437e4 Binary files /dev/null and b/browser/branding/nightly/content/about-logo-private@2x.png differ diff --git a/browser/branding/nightly/content/about-logo.png b/browser/branding/nightly/content/about-logo.png new file mode 100644 index 0000000000..de2404af05 Binary files /dev/null and b/browser/branding/nightly/content/about-logo.png differ diff --git a/browser/branding/nightly/content/about-logo.svg b/browser/branding/nightly/content/about-logo.svg new file mode 100644 index 0000000000..caf587e212 --- /dev/null +++ b/browser/branding/nightly/content/about-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/nightly/content/about-logo@2x.png b/browser/branding/nightly/content/about-logo@2x.png new file mode 100644 index 0000000000..1df472e725 Binary files /dev/null and b/browser/branding/nightly/content/about-logo@2x.png differ diff --git a/browser/branding/nightly/content/about-wordmark.svg b/browser/branding/nightly/content/about-wordmark.svg new file mode 100644 index 0000000000..f21d4fc9f0 --- /dev/null +++ b/browser/branding/nightly/content/about-wordmark.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/browser/branding/nightly/content/about.png b/browser/branding/nightly/content/about.png new file mode 100644 index 0000000000..29cecfc95b Binary files /dev/null and b/browser/branding/nightly/content/about.png differ diff --git a/browser/branding/nightly/content/aboutDialog.css b/browser/branding/nightly/content/aboutDialog.css new file mode 100644 index 0000000000..2dcdd22cfa --- /dev/null +++ b/browser/branding/nightly/content/aboutDialog.css @@ -0,0 +1,46 @@ +/* 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; +} + +#clientBox { + padding: 10px 0 15px; +} + +#leftBox { + background-image: url("chrome://branding/content/about-logo.png"); + background-repeat: no-repeat; + background-size: 192px auto; + background-position: center 20%; + /* min-width and min-height create room for the logo */ + min-width: 210px; + min-height: 210px; + margin-top: 20px; + margin-inline-start: 30px; +} + +@media (min-resolution: 2dppx) { + #leftBox { + background-image: url("chrome://branding/content/about-logo@2x.png"); + } +} + +.text-link { + color: #fff !important; + text-decoration: underline; +} + +#rightBox { + margin-inline: 30px; + padding-top: 64px; +} + +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; +} diff --git a/browser/branding/nightly/content/firefox-wordmark.svg b/browser/branding/nightly/content/firefox-wordmark.svg new file mode 100644 index 0000000000..65270a3cd9 --- /dev/null +++ b/browser/branding/nightly/content/firefox-wordmark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn new file mode 100644 index 0000000000..d623a6a2b3 --- /dev/null +++ b/browser/branding/nightly/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/nightly/content/moz.build b/browser/branding/nightly/content/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/nightly/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/nightly/default128.png b/browser/branding/nightly/default128.png new file mode 100644 index 0000000000..8fe085c56f Binary files /dev/null and b/browser/branding/nightly/default128.png differ diff --git a/browser/branding/nightly/default16.png b/browser/branding/nightly/default16.png new file mode 100644 index 0000000000..e01114ba2b Binary files /dev/null and b/browser/branding/nightly/default16.png differ diff --git a/browser/branding/nightly/default22.png b/browser/branding/nightly/default22.png new file mode 100644 index 0000000000..0527dfd563 Binary files /dev/null and b/browser/branding/nightly/default22.png differ diff --git a/browser/branding/nightly/default24.png b/browser/branding/nightly/default24.png new file mode 100644 index 0000000000..019d020fde Binary files /dev/null and b/browser/branding/nightly/default24.png differ diff --git a/browser/branding/nightly/default256.png b/browser/branding/nightly/default256.png new file mode 100644 index 0000000000..d0d8bd01cc Binary files /dev/null and b/browser/branding/nightly/default256.png differ diff --git a/browser/branding/nightly/default32.png b/browser/branding/nightly/default32.png new file mode 100644 index 0000000000..c0986eae93 Binary files /dev/null and b/browser/branding/nightly/default32.png differ diff --git a/browser/branding/nightly/default48.png b/browser/branding/nightly/default48.png new file mode 100644 index 0000000000..1980ffb35c Binary files /dev/null and b/browser/branding/nightly/default48.png differ diff --git a/browser/branding/nightly/default64.png b/browser/branding/nightly/default64.png new file mode 100644 index 0000000000..551c98d444 Binary files /dev/null and b/browser/branding/nightly/default64.png differ diff --git a/browser/branding/nightly/disk.icns b/browser/branding/nightly/disk.icns new file mode 100644 index 0000000000..323c8a8a69 Binary files /dev/null and b/browser/branding/nightly/disk.icns differ diff --git a/browser/branding/nightly/document.icns b/browser/branding/nightly/document.icns new file mode 100644 index 0000000000..8cb0f7f9dc Binary files /dev/null and b/browser/branding/nightly/document.icns differ diff --git a/browser/branding/nightly/document.ico b/browser/branding/nightly/document.ico new file mode 100644 index 0000000000..e5d0d840a7 Binary files /dev/null and b/browser/branding/nightly/document.ico differ diff --git a/browser/branding/nightly/document_pdf.ico b/browser/branding/nightly/document_pdf.ico new file mode 100644 index 0000000000..d6fe7c5bde Binary files /dev/null and b/browser/branding/nightly/document_pdf.ico differ diff --git a/browser/branding/nightly/dsstore b/browser/branding/nightly/dsstore new file mode 100644 index 0000000000..6b82c923a6 Binary files /dev/null and b/browser/branding/nightly/dsstore differ diff --git a/browser/branding/nightly/firefox.VisualElementsManifest.xml b/browser/branding/nightly/firefox.VisualElementsManifest.xml new file mode 100644 index 0000000000..85e09dd7a9 --- /dev/null +++ b/browser/branding/nightly/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/nightly/firefox.icns b/browser/branding/nightly/firefox.icns new file mode 100644 index 0000000000..d820967d9e Binary files /dev/null and b/browser/branding/nightly/firefox.icns differ diff --git a/browser/branding/nightly/firefox.ico b/browser/branding/nightly/firefox.ico new file mode 100644 index 0000000000..240b64298f Binary files /dev/null and b/browser/branding/nightly/firefox.ico differ diff --git a/browser/branding/nightly/firefox64.ico b/browser/branding/nightly/firefox64.ico new file mode 100644 index 0000000000..1f50606af6 Binary files /dev/null and b/browser/branding/nightly/firefox64.ico differ diff --git a/browser/branding/nightly/locales/en-US/brand.ftl b/browser/branding/nightly/locales/en-US/brand.ftl new file mode 100644 index 0000000000..86770b0374 --- /dev/null +++ b/browser/branding/nightly/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 = Nightly +-brand-short-name = Nightly +-brand-shortcut-name = Firefox Nightly +-brand-full-name = Firefox Nightly +# 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 = { " " } diff --git a/browser/branding/nightly/locales/en-US/brand.properties b/browser/branding/nightly/locales/en-US/brand.properties new file mode 100644 index 0000000000..e84fdd07d4 --- /dev/null +++ b/browser/branding/nightly/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=Nightly +brandShortName=Nightly +brandFullName=Firefox Nightly diff --git a/browser/branding/nightly/locales/jar.mn b/browser/branding/nightly/locales/jar.mn new file mode 100644 index 0000000000..c903766a5c --- /dev/null +++ b/browser/branding/nightly/locales/jar.mn @@ -0,0 +1,12 @@ +#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 (en-US/**/*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ +# Nightly branding only exists in en-US + locale/branding/brand.properties (en-US/brand.properties) diff --git a/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build new file mode 100644 index 0000000000..fff7035065 --- /dev/null +++ b/browser/branding/nightly/locales/moz.build @@ -0,0 +1,9 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DEFINES["MOZ_DISTRIBUTION_ID_UNQUOTED"] = CONFIG["MOZ_DISTRIBUTION_ID"] + +JAR_MANIFESTS += ["jar.mn"] diff --git a/browser/branding/nightly/moz.build b/browser/branding/nightly/moz.build new file mode 100644 index 0000000000..dd081ac444 --- /dev/null +++ b/browser/branding/nightly/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/nightly/msix/Assets/Document44x44.png b/browser/branding/nightly/msix/Assets/Document44x44.png new file mode 100644 index 0000000000..0d4e7915b8 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Document44x44.png differ diff --git a/browser/branding/nightly/msix/Assets/LargeTile.scale-200.png b/browser/branding/nightly/msix/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..2129097892 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/LargeTile.scale-200.png differ diff --git a/browser/branding/nightly/msix/Assets/SmallTile.scale-200.png b/browser/branding/nightly/msix/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..ce01b51eed Binary files /dev/null and b/browser/branding/nightly/msix/Assets/SmallTile.scale-200.png differ diff --git a/browser/branding/nightly/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/nightly/msix/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..594ef2afa4 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Square150x150Logo.scale-200.png differ diff --git a/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..a5df4eb268 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..a5df4eb268 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/browser/branding/nightly/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/nightly/msix/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..aa08176e34 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Square44x44Logo.scale-200.png differ diff --git a/browser/branding/nightly/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/nightly/msix/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..b0aa02aebb Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/browser/branding/nightly/msix/Assets/StoreLogo.scale-200.png b/browser/branding/nightly/msix/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000..9a8d831e86 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/StoreLogo.scale-200.png differ diff --git a/browser/branding/nightly/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/nightly/msix/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..a6d1e61076 Binary files /dev/null and b/browser/branding/nightly/msix/Assets/Wide310x150Logo.scale-200.png differ diff --git a/browser/branding/nightly/newtab.ico b/browser/branding/nightly/newtab.ico new file mode 100644 index 0000000000..a9b37c08c6 Binary files /dev/null and b/browser/branding/nightly/newtab.ico differ diff --git a/browser/branding/nightly/newwindow.ico b/browser/branding/nightly/newwindow.ico new file mode 100644 index 0000000000..5537207710 Binary files /dev/null and b/browser/branding/nightly/newwindow.ico differ diff --git a/browser/branding/nightly/pbmode.ico b/browser/branding/nightly/pbmode.ico new file mode 100644 index 0000000000..2087c2d8e6 Binary files /dev/null and b/browser/branding/nightly/pbmode.ico differ diff --git a/browser/branding/nightly/pref/firefox-branding.js b/browser/branding/nightly/pref/firefox-branding.js new file mode 100644 index 0000000000..3d16ac5937 --- /dev/null +++ b/browser/branding/nightly/pref/firefox-branding.js @@ -0,0 +1,35 @@ +/* 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", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD_VERSION%"); +pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +pref("startup.homepage_welcome_url.additional", ""); +// The time interval between checks for a new version (in seconds) +pref("app.update.interval", 7200); // 2 hours +// Give the user x seconds to react before showing the big UI. default=12 hours +pref("app.update.promptWaitTime", 43200); +// URL user can browse to manually if for some reason all update installation +// attempts fail. +pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/nightly/?reason=manual-update"); +// A default value for the "More information about this update" link +// supplied in the "An update is available" page of the update wizard. +pref("app.update.url.details", "https://www.mozilla.org/%LOCALE%/firefox/nightly/notes/"); + +pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&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"); + +// 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. +// 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/nightly/private_browsing.VisualElementsManifest.xml b/browser/branding/nightly/private_browsing.VisualElementsManifest.xml new file mode 100644 index 0000000000..fdff8c55ff --- /dev/null +++ b/browser/branding/nightly/private_browsing.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/nightly/stubinstaller/bgstub.jpg b/browser/branding/nightly/stubinstaller/bgstub.jpg new file mode 100644 index 0000000000..891036a4fe Binary files /dev/null and b/browser/branding/nightly/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/nightly/stubinstaller/installing_page.css b/browser/branding/nightly/stubinstaller/installing_page.css new file mode 100644 index 0000000000..8044838c79 --- /dev/null +++ b/browser/branding/nightly/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: 59px; +} diff --git a/browser/branding/nightly/stubinstaller/profile_cleanup_page.css b/browser/branding/nightly/stubinstaller/profile_cleanup_page.css new file mode 100644 index 0000000000..2d9c3ad189 --- /dev/null +++ b/browser/branding/nightly/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/nightly/wizHeader.bmp b/browser/branding/nightly/wizHeader.bmp new file mode 100644 index 0000000000..89eaf90125 Binary files /dev/null and b/browser/branding/nightly/wizHeader.bmp differ diff --git a/browser/branding/nightly/wizHeaderRTL.bmp b/browser/branding/nightly/wizHeaderRTL.bmp new file mode 100644 index 0000000000..451d87c70e Binary files /dev/null and b/browser/branding/nightly/wizHeaderRTL.bmp differ diff --git a/browser/branding/nightly/wizWatermark.bmp b/browser/branding/nightly/wizWatermark.bmp new file mode 100644 index 0000000000..f9d6a870e9 Binary files /dev/null and b/browser/branding/nightly/wizWatermark.bmp differ -- cgit v1.2.3