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/aurora/PrivateBrowsing_150.png | Bin 0 -> 17742 bytes browser/branding/aurora/PrivateBrowsing_70.png | Bin 0 -> 6027 bytes browser/branding/aurora/VisualElements_150.png | Bin 0 -> 29860 bytes browser/branding/aurora/VisualElements_70.png | Bin 0 -> 10756 bytes browser/branding/aurora/background.png | Bin 0 -> 33250 bytes browser/branding/aurora/branding.nsi | 68 ++++++++++++++++ browser/branding/aurora/configure.sh | 7 ++ .../branding/aurora/content/about-logo-private.png | Bin 0 -> 14101 bytes .../aurora/content/about-logo-private@2x.png | Bin 0 -> 38523 bytes browser/branding/aurora/content/about-logo.png | Bin 0 -> 28098 bytes browser/branding/aurora/content/about-logo.svg | 1 + browser/branding/aurora/content/about-logo@2x.png | Bin 0 -> 71122 bytes browser/branding/aurora/content/about-wordmark.svg | 16 ++++ browser/branding/aurora/content/about.png | Bin 0 -> 23386 bytes browser/branding/aurora/content/aboutDialog.css | 19 +++++ .../branding/aurora/content/firefox-wordmark.svg | 1 + browser/branding/aurora/content/jar.mn | 21 +++++ browser/branding/aurora/content/moz.build | 7 ++ browser/branding/aurora/default128.png | Bin 0 -> 14931 bytes browser/branding/aurora/default16.png | Bin 0 -> 758 bytes browser/branding/aurora/default22.png | Bin 0 -> 1157 bytes browser/branding/aurora/default24.png | Bin 0 -> 1336 bytes browser/branding/aurora/default256.png | Bin 0 -> 37594 bytes browser/branding/aurora/default32.png | Bin 0 -> 1998 bytes browser/branding/aurora/default48.png | Bin 0 -> 3877 bytes browser/branding/aurora/default64.png | Bin 0 -> 5373 bytes browser/branding/aurora/disk.icns | Bin 0 -> 1658119 bytes browser/branding/aurora/document.icns | Bin 0 -> 537641 bytes browser/branding/aurora/document.ico | Bin 0 -> 48848 bytes browser/branding/aurora/document_pdf.ico | Bin 0 -> 19994 bytes browser/branding/aurora/dsstore | Bin 0 -> 10244 bytes .../aurora/firefox.VisualElementsManifest.xml | 12 +++ browser/branding/aurora/firefox.icns | Bin 0 -> 929387 bytes browser/branding/aurora/firefox.ico | Bin 0 -> 73330 bytes browser/branding/aurora/firefox64.ico | Bin 0 -> 38630 bytes browser/branding/aurora/locales/en-US/brand.ftl | 27 +++++++ .../branding/aurora/locales/en-US/brand.properties | 7 ++ browser/branding/aurora/locales/jar.mn | 12 +++ browser/branding/aurora/locales/moz.build | 7 ++ browser/branding/aurora/moz.build | 13 +++ .../branding/aurora/msix/Assets/Document44x44.png | Bin 0 -> 2580 bytes .../aurora/msix/Assets/LargeTile.scale-200.png | Bin 0 -> 47619 bytes .../aurora/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 .../aurora/msix/Assets/StoreLogo.scale-200.png | Bin 0 -> 14069 bytes .../msix/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 17159 bytes browser/branding/aurora/newtab.ico | Bin 0 -> 6518 bytes browser/branding/aurora/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/aurora/pbmode.ico | Bin 0 -> 40230 bytes browser/branding/aurora/pref/firefox-branding.js | 35 +++++++++ .../private_browsing.VisualElementsManifest.xml | 12 +++ browser/branding/aurora/stubinstaller/bgstub.jpg | Bin 0 -> 58327 bytes .../aurora/stubinstaller/installing_page.css | 62 +++++++++++++++ .../aurora/stubinstaller/profile_cleanup_page.css | 42 ++++++++++ browser/branding/aurora/wizHeader.bmp | Bin 0 -> 25820 bytes browser/branding/aurora/wizHeaderRTL.bmp | Bin 0 -> 25820 bytes browser/branding/aurora/wizWatermark.bmp | Bin 0 -> 154544 bytes browser/branding/branding-common.mozbuild | 37 +++++++++ browser/branding/docs/UpdatingMacIcons.rst | 31 ++++++++ browser/branding/docs/index.rst | 22 ++++++ browser/branding/moz.build | 10 +++ 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 | 19 +++++ .../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 | 7 ++ 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 | 36 +++++++++ .../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 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 .../branding/unofficial/PrivateBrowsing_150.png | Bin 0 -> 28194 bytes browser/branding/unofficial/PrivateBrowsing_70.png | Bin 0 -> 17407 bytes browser/branding/unofficial/VisualElements_150.png | Bin 0 -> 33152 bytes browser/branding/unofficial/VisualElements_70.png | Bin 0 -> 11726 bytes browser/branding/unofficial/background.png | Bin 0 -> 20803 bytes browser/branding/unofficial/branding.nsi | 64 +++++++++++++++ browser/branding/unofficial/configure.sh | 5 ++ .../unofficial/content/about-logo-private.png | Bin 0 -> 14328 bytes .../unofficial/content/about-logo-private@2x.png | Bin 0 -> 36091 bytes browser/branding/unofficial/content/about-logo.png | Bin 0 -> 31344 bytes browser/branding/unofficial/content/about-logo.svg | 1 + .../branding/unofficial/content/about-logo@2x.png | Bin 0 -> 81442 bytes .../branding/unofficial/content/about-wordmark.svg | 3 + browser/branding/unofficial/content/about.png | Bin 0 -> 28322 bytes .../branding/unofficial/content/aboutDialog.css | 20 +++++ .../unofficial/content/firefox-wordmark.svg | 3 + browser/branding/unofficial/content/jar.mn | 21 +++++ browser/branding/unofficial/content/moz.build | 7 ++ browser/branding/unofficial/default128.png | Bin 0 -> 17585 bytes browser/branding/unofficial/default16.png | Bin 0 -> 757 bytes browser/branding/unofficial/default22.png | Bin 0 -> 1218 bytes browser/branding/unofficial/default24.png | Bin 0 -> 1415 bytes browser/branding/unofficial/default256.png | Bin 0 -> 45679 bytes browser/branding/unofficial/default32.png | Bin 0 -> 2292 bytes browser/branding/unofficial/default48.png | Bin 0 -> 4462 bytes browser/branding/unofficial/default64.png | Bin 0 -> 6441 bytes browser/branding/unofficial/disk.icns | Bin 0 -> 1510444 bytes browser/branding/unofficial/document.icns | Bin 0 -> 515047 bytes browser/branding/unofficial/document.ico | Bin 0 -> 49649 bytes browser/branding/unofficial/document_pdf.ico | Bin 0 -> 19994 bytes browser/branding/unofficial/dsstore | Bin 0 -> 12292 bytes .../unofficial/firefox.VisualElementsManifest.xml | 12 +++ browser/branding/unofficial/firefox.icns | Bin 0 -> 677456 bytes browser/branding/unofficial/firefox.ico | Bin 0 -> 75811 bytes browser/branding/unofficial/firefox64.ico | Bin 0 -> 38630 bytes .../branding/unofficial/locales/en-US/brand.ftl | 27 +++++++ .../unofficial/locales/en-US/brand.properties | 7 ++ browser/branding/unofficial/locales/jar.mn | 12 +++ browser/branding/unofficial/locales/moz.build | 7 ++ browser/branding/unofficial/moz.build | 13 +++ .../unofficial/msix/Assets/Document44x44.png | Bin 0 -> 2633 bytes .../unofficial/msix/Assets/LargeTile.scale-200.png | Bin 0 -> 53156 bytes .../unofficial/msix/Assets/SmallTile.scale-200.png | Bin 0 -> 10097 bytes .../msix/Assets/Square150x150Logo.scale-200.png | Bin 0 -> 18667 bytes ...44Logo.altform-lightunplated_targetsize-256.png | Bin 0 -> 64192 bytes ...re44x44Logo.altform-unplated_targetsize-256.png | Bin 0 -> 64192 bytes .../msix/Assets/Square44x44Logo.scale-200.png | Bin 0 -> 8658 bytes .../msix/Assets/Square44x44Logo.targetsize-256.png | Bin 0 -> 42819 bytes .../unofficial/msix/Assets/StoreLogo.scale-200.png | Bin 0 -> 16318 bytes .../msix/Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 19493 bytes browser/branding/unofficial/newtab.ico | Bin 0 -> 6518 bytes browser/branding/unofficial/newwindow.ico | Bin 0 -> 6518 bytes browser/branding/unofficial/pbmode.ico | Bin 0 -> 19140 bytes .../branding/unofficial/pref/firefox-branding.js | 32 ++++++++ .../private_browsing.VisualElementsManifest.xml | 12 +++ .../branding/unofficial/stubinstaller/bgstub.jpg | Bin 0 -> 15065 bytes .../unofficial/stubinstaller/installing_page.css | 61 +++++++++++++++ .../stubinstaller/profile_cleanup_page.css | 42 ++++++++++ browser/branding/unofficial/wizHeader.bmp | Bin 0 -> 25820 bytes browser/branding/unofficial/wizHeaderRTL.bmp | Bin 0 -> 25820 bytes browser/branding/unofficial/wizWatermark.bmp | Bin 0 -> 154544 bytes 249 files changed, 1635 insertions(+) create mode 100644 browser/branding/aurora/PrivateBrowsing_150.png create mode 100644 browser/branding/aurora/PrivateBrowsing_70.png create mode 100644 browser/branding/aurora/VisualElements_150.png create mode 100644 browser/branding/aurora/VisualElements_70.png create mode 100644 browser/branding/aurora/background.png create mode 100644 browser/branding/aurora/branding.nsi create mode 100644 browser/branding/aurora/configure.sh create mode 100644 browser/branding/aurora/content/about-logo-private.png create mode 100644 browser/branding/aurora/content/about-logo-private@2x.png create mode 100644 browser/branding/aurora/content/about-logo.png create mode 100644 browser/branding/aurora/content/about-logo.svg create mode 100644 browser/branding/aurora/content/about-logo@2x.png create mode 100644 browser/branding/aurora/content/about-wordmark.svg create mode 100644 browser/branding/aurora/content/about.png create mode 100644 browser/branding/aurora/content/aboutDialog.css create mode 100644 browser/branding/aurora/content/firefox-wordmark.svg create mode 100644 browser/branding/aurora/content/jar.mn create mode 100644 browser/branding/aurora/content/moz.build create mode 100644 browser/branding/aurora/default128.png create mode 100644 browser/branding/aurora/default16.png create mode 100644 browser/branding/aurora/default22.png create mode 100644 browser/branding/aurora/default24.png create mode 100644 browser/branding/aurora/default256.png create mode 100644 browser/branding/aurora/default32.png create mode 100644 browser/branding/aurora/default48.png create mode 100644 browser/branding/aurora/default64.png create mode 100644 browser/branding/aurora/disk.icns create mode 100644 browser/branding/aurora/document.icns create mode 100644 browser/branding/aurora/document.ico create mode 100644 browser/branding/aurora/document_pdf.ico create mode 100644 browser/branding/aurora/dsstore create mode 100644 browser/branding/aurora/firefox.VisualElementsManifest.xml create mode 100644 browser/branding/aurora/firefox.icns create mode 100644 browser/branding/aurora/firefox.ico create mode 100644 browser/branding/aurora/firefox64.ico create mode 100644 browser/branding/aurora/locales/en-US/brand.ftl create mode 100644 browser/branding/aurora/locales/en-US/brand.properties create mode 100644 browser/branding/aurora/locales/jar.mn create mode 100644 browser/branding/aurora/locales/moz.build create mode 100644 browser/branding/aurora/moz.build create mode 100644 browser/branding/aurora/msix/Assets/Document44x44.png create mode 100644 browser/branding/aurora/msix/Assets/LargeTile.scale-200.png create mode 100644 browser/branding/aurora/msix/Assets/SmallTile.scale-200.png create mode 100644 browser/branding/aurora/msix/Assets/Square150x150Logo.scale-200.png create mode 100644 browser/branding/aurora/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png create mode 100644 browser/branding/aurora/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png create mode 100644 browser/branding/aurora/msix/Assets/Square44x44Logo.scale-200.png create mode 100644 browser/branding/aurora/msix/Assets/Square44x44Logo.targetsize-256.png create mode 100644 browser/branding/aurora/msix/Assets/StoreLogo.scale-200.png create mode 100644 browser/branding/aurora/msix/Assets/Wide310x150Logo.scale-200.png create mode 100644 browser/branding/aurora/newtab.ico create mode 100644 browser/branding/aurora/newwindow.ico create mode 100644 browser/branding/aurora/pbmode.ico create mode 100644 browser/branding/aurora/pref/firefox-branding.js create mode 100644 browser/branding/aurora/private_browsing.VisualElementsManifest.xml create mode 100644 browser/branding/aurora/stubinstaller/bgstub.jpg create mode 100644 browser/branding/aurora/stubinstaller/installing_page.css create mode 100644 browser/branding/aurora/stubinstaller/profile_cleanup_page.css create mode 100644 browser/branding/aurora/wizHeader.bmp create mode 100644 browser/branding/aurora/wizHeaderRTL.bmp create mode 100644 browser/branding/aurora/wizWatermark.bmp create mode 100644 browser/branding/branding-common.mozbuild create mode 100644 browser/branding/docs/UpdatingMacIcons.rst create mode 100644 browser/branding/docs/index.rst create mode 100644 browser/branding/moz.build 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 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 create mode 100644 browser/branding/unofficial/PrivateBrowsing_150.png create mode 100644 browser/branding/unofficial/PrivateBrowsing_70.png create mode 100644 browser/branding/unofficial/VisualElements_150.png create mode 100644 browser/branding/unofficial/VisualElements_70.png create mode 100644 browser/branding/unofficial/background.png create mode 100644 browser/branding/unofficial/branding.nsi create mode 100644 browser/branding/unofficial/configure.sh create mode 100644 browser/branding/unofficial/content/about-logo-private.png create mode 100644 browser/branding/unofficial/content/about-logo-private@2x.png create mode 100644 browser/branding/unofficial/content/about-logo.png create mode 100644 browser/branding/unofficial/content/about-logo.svg create mode 100644 browser/branding/unofficial/content/about-logo@2x.png create mode 100644 browser/branding/unofficial/content/about-wordmark.svg create mode 100644 browser/branding/unofficial/content/about.png create mode 100644 browser/branding/unofficial/content/aboutDialog.css create mode 100644 browser/branding/unofficial/content/firefox-wordmark.svg create mode 100644 browser/branding/unofficial/content/jar.mn create mode 100644 browser/branding/unofficial/content/moz.build create mode 100644 browser/branding/unofficial/default128.png create mode 100644 browser/branding/unofficial/default16.png create mode 100644 browser/branding/unofficial/default22.png create mode 100644 browser/branding/unofficial/default24.png create mode 100644 browser/branding/unofficial/default256.png create mode 100644 browser/branding/unofficial/default32.png create mode 100644 browser/branding/unofficial/default48.png create mode 100644 browser/branding/unofficial/default64.png create mode 100644 browser/branding/unofficial/disk.icns create mode 100644 browser/branding/unofficial/document.icns create mode 100644 browser/branding/unofficial/document.ico create mode 100644 browser/branding/unofficial/document_pdf.ico create mode 100644 browser/branding/unofficial/dsstore create mode 100644 browser/branding/unofficial/firefox.VisualElementsManifest.xml create mode 100644 browser/branding/unofficial/firefox.icns create mode 100644 browser/branding/unofficial/firefox.ico create mode 100644 browser/branding/unofficial/firefox64.ico create mode 100644 browser/branding/unofficial/locales/en-US/brand.ftl create mode 100644 browser/branding/unofficial/locales/en-US/brand.properties create mode 100644 browser/branding/unofficial/locales/jar.mn create mode 100644 browser/branding/unofficial/locales/moz.build create mode 100644 browser/branding/unofficial/moz.build create mode 100644 browser/branding/unofficial/msix/Assets/Document44x44.png create mode 100644 browser/branding/unofficial/msix/Assets/LargeTile.scale-200.png create mode 100644 browser/branding/unofficial/msix/Assets/SmallTile.scale-200.png create mode 100644 browser/branding/unofficial/msix/Assets/Square150x150Logo.scale-200.png create mode 100644 browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png create mode 100644 browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png create mode 100644 browser/branding/unofficial/msix/Assets/Square44x44Logo.scale-200.png create mode 100644 browser/branding/unofficial/msix/Assets/Square44x44Logo.targetsize-256.png create mode 100644 browser/branding/unofficial/msix/Assets/StoreLogo.scale-200.png create mode 100644 browser/branding/unofficial/msix/Assets/Wide310x150Logo.scale-200.png create mode 100644 browser/branding/unofficial/newtab.ico create mode 100644 browser/branding/unofficial/newwindow.ico create mode 100644 browser/branding/unofficial/pbmode.ico create mode 100644 browser/branding/unofficial/pref/firefox-branding.js create mode 100644 browser/branding/unofficial/private_browsing.VisualElementsManifest.xml create mode 100644 browser/branding/unofficial/stubinstaller/bgstub.jpg create mode 100644 browser/branding/unofficial/stubinstaller/installing_page.css create mode 100644 browser/branding/unofficial/stubinstaller/profile_cleanup_page.css create mode 100644 browser/branding/unofficial/wizHeader.bmp create mode 100644 browser/branding/unofficial/wizHeaderRTL.bmp create mode 100644 browser/branding/unofficial/wizWatermark.bmp (limited to 'browser/branding') diff --git a/browser/branding/aurora/PrivateBrowsing_150.png b/browser/branding/aurora/PrivateBrowsing_150.png new file mode 100644 index 0000000000..62d2ec7576 Binary files /dev/null and b/browser/branding/aurora/PrivateBrowsing_150.png differ diff --git a/browser/branding/aurora/PrivateBrowsing_70.png b/browser/branding/aurora/PrivateBrowsing_70.png new file mode 100644 index 0000000000..5e012f3241 Binary files /dev/null and b/browser/branding/aurora/PrivateBrowsing_70.png differ diff --git a/browser/branding/aurora/VisualElements_150.png b/browser/branding/aurora/VisualElements_150.png new file mode 100644 index 0000000000..557bf39d2a Binary files /dev/null and b/browser/branding/aurora/VisualElements_150.png differ diff --git a/browser/branding/aurora/VisualElements_70.png b/browser/branding/aurora/VisualElements_70.png new file mode 100644 index 0000000000..a21bbb363f Binary files /dev/null and b/browser/branding/aurora/VisualElements_70.png differ diff --git a/browser/branding/aurora/background.png b/browser/branding/aurora/background.png new file mode 100644 index 0000000000..859e277c4c Binary files /dev/null and b/browser/branding/aurora/background.png differ diff --git a/browser/branding/aurora/branding.nsi b/browser/branding/aurora/branding.nsi new file mode 100644 index 0000000000..f3c573733e --- /dev/null +++ b/browser/branding/aurora/branding.nsi @@ -0,0 +1,68 @@ +# 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 Developer Edition builds. +# The official release build branding.nsi is located in other-license/branding/firefox/ +# The unofficial build branding.nsi is located in browser/branding/unofficial/ + +# BrandFullNameInternal is used for some registry and file system values +# instead of BrandFullName and typically should not be modified. +!define BrandFullNameInternal "Firefox Developer Edition" +!define BrandShortName "Firefox Developer Edition" +!define BrandFullName "Firefox Developer Edition" +!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-devedition-latest" +!define URLStubDownloadAMD64 "https://download.mozilla.org/?os=win64&lang=${AB_CD}&product=firefox-devedition-latest" +!define URLStubDownloadAArch64 "https://download.mozilla.org/?os=win64-aarch64&lang=${AB_CD}&product=firefox-devedition-latest" +!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=aurora&installer_lang=${AB_CD}" +!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/" +!define Channel "aurora" + +# The installer's certificate name and issuer expected by the stub installer +!define CertNameDownload "Mozilla Corporation" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" + +# Dialog units are used so the UI displays correctly with the system's DPI +# settings. +!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 + +# Enable DeveloperEdition-specific behavior +!define DEV_EDITION diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh new file mode 100644 index 0000000000..19d4ff057f --- /dev/null +++ b/browser/branding/aurora/configure.sh @@ -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/. + +MOZ_APP_DISPLAYNAME="Firefox Developer Edition" +MOZ_APP_REMOTINGNAME=firefox-dev +MOZ_DEV_EDITION=1 diff --git a/browser/branding/aurora/content/about-logo-private.png b/browser/branding/aurora/content/about-logo-private.png new file mode 100644 index 0000000000..f9d1b7fcb4 Binary files /dev/null and b/browser/branding/aurora/content/about-logo-private.png differ diff --git a/browser/branding/aurora/content/about-logo-private@2x.png b/browser/branding/aurora/content/about-logo-private@2x.png new file mode 100644 index 0000000000..14286282ef Binary files /dev/null and b/browser/branding/aurora/content/about-logo-private@2x.png differ diff --git a/browser/branding/aurora/content/about-logo.png b/browser/branding/aurora/content/about-logo.png new file mode 100644 index 0000000000..69b4da464f Binary files /dev/null and b/browser/branding/aurora/content/about-logo.png differ diff --git a/browser/branding/aurora/content/about-logo.svg b/browser/branding/aurora/content/about-logo.svg new file mode 100644 index 0000000000..cde52d7453 --- /dev/null +++ b/browser/branding/aurora/content/about-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/aurora/content/about-logo@2x.png b/browser/branding/aurora/content/about-logo@2x.png new file mode 100644 index 0000000000..9f409b9b85 Binary files /dev/null and b/browser/branding/aurora/content/about-logo@2x.png differ diff --git a/browser/branding/aurora/content/about-wordmark.svg b/browser/branding/aurora/content/about-wordmark.svg new file mode 100644 index 0000000000..afc687bcae --- /dev/null +++ b/browser/branding/aurora/content/about-wordmark.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + diff --git a/browser/branding/aurora/content/about.png b/browser/branding/aurora/content/about.png new file mode 100644 index 0000000000..1a0221f850 Binary files /dev/null and b/browser/branding/aurora/content/about.png differ diff --git a/browser/branding/aurora/content/aboutDialog.css b/browser/branding/aurora/content/aboutDialog.css new file mode 100644 index 0000000000..4a214ed6fd --- /dev/null +++ b/browser/branding/aurora/content/aboutDialog.css @@ -0,0 +1,19 @@ +/* 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; + padding-top: 64px; +} + +#bottomBox { + background-color: #1d1133; + padding: 15px 10px 15px; +} diff --git a/browser/branding/aurora/content/firefox-wordmark.svg b/browser/branding/aurora/content/firefox-wordmark.svg new file mode 100644 index 0000000000..62e80976e9 --- /dev/null +++ b/browser/branding/aurora/content/firefox-wordmark.svg @@ -0,0 +1 @@ + diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn new file mode 100644 index 0000000000..d623a6a2b3 --- /dev/null +++ b/browser/branding/aurora/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/aurora/content/moz.build b/browser/branding/aurora/content/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/aurora/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/aurora/default128.png b/browser/branding/aurora/default128.png new file mode 100644 index 0000000000..01c7a9fe7b Binary files /dev/null and b/browser/branding/aurora/default128.png differ diff --git a/browser/branding/aurora/default16.png b/browser/branding/aurora/default16.png new file mode 100644 index 0000000000..70a959af5f Binary files /dev/null and b/browser/branding/aurora/default16.png differ diff --git a/browser/branding/aurora/default22.png b/browser/branding/aurora/default22.png new file mode 100644 index 0000000000..db8fa16f83 Binary files /dev/null and b/browser/branding/aurora/default22.png differ diff --git a/browser/branding/aurora/default24.png b/browser/branding/aurora/default24.png new file mode 100644 index 0000000000..0a54eade45 Binary files /dev/null and b/browser/branding/aurora/default24.png differ diff --git a/browser/branding/aurora/default256.png b/browser/branding/aurora/default256.png new file mode 100644 index 0000000000..1ccd184753 Binary files /dev/null and b/browser/branding/aurora/default256.png differ diff --git a/browser/branding/aurora/default32.png b/browser/branding/aurora/default32.png new file mode 100644 index 0000000000..c641f00955 Binary files /dev/null and b/browser/branding/aurora/default32.png differ diff --git a/browser/branding/aurora/default48.png b/browser/branding/aurora/default48.png new file mode 100644 index 0000000000..d4e89b77b7 Binary files /dev/null and b/browser/branding/aurora/default48.png differ diff --git a/browser/branding/aurora/default64.png b/browser/branding/aurora/default64.png new file mode 100644 index 0000000000..1262892552 Binary files /dev/null and b/browser/branding/aurora/default64.png differ diff --git a/browser/branding/aurora/disk.icns b/browser/branding/aurora/disk.icns new file mode 100644 index 0000000000..dc98d76d7f Binary files /dev/null and b/browser/branding/aurora/disk.icns differ diff --git a/browser/branding/aurora/document.icns b/browser/branding/aurora/document.icns new file mode 100644 index 0000000000..9ef678b476 Binary files /dev/null and b/browser/branding/aurora/document.icns differ diff --git a/browser/branding/aurora/document.ico b/browser/branding/aurora/document.ico new file mode 100644 index 0000000000..d56e30d36b Binary files /dev/null and b/browser/branding/aurora/document.ico differ diff --git a/browser/branding/aurora/document_pdf.ico b/browser/branding/aurora/document_pdf.ico new file mode 100644 index 0000000000..d6fe7c5bde Binary files /dev/null and b/browser/branding/aurora/document_pdf.ico differ diff --git a/browser/branding/aurora/dsstore b/browser/branding/aurora/dsstore new file mode 100644 index 0000000000..0d2ef69a03 Binary files /dev/null and b/browser/branding/aurora/dsstore differ diff --git a/browser/branding/aurora/firefox.VisualElementsManifest.xml b/browser/branding/aurora/firefox.VisualElementsManifest.xml new file mode 100644 index 0000000000..85e09dd7a9 --- /dev/null +++ b/browser/branding/aurora/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/aurora/firefox.icns b/browser/branding/aurora/firefox.icns new file mode 100644 index 0000000000..314f9685c3 Binary files /dev/null and b/browser/branding/aurora/firefox.icns differ diff --git a/browser/branding/aurora/firefox.ico b/browser/branding/aurora/firefox.ico new file mode 100644 index 0000000000..416064a3f3 Binary files /dev/null and b/browser/branding/aurora/firefox.ico differ diff --git a/browser/branding/aurora/firefox64.ico b/browser/branding/aurora/firefox64.ico new file mode 100644 index 0000000000..48b7cf9254 Binary files /dev/null and b/browser/branding/aurora/firefox64.ico differ diff --git a/browser/branding/aurora/locales/en-US/brand.ftl b/browser/branding/aurora/locales/en-US/brand.ftl new file mode 100644 index 0000000000..f24843354f --- /dev/null +++ b/browser/branding/aurora/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 Developer Edition +-brand-shortcut-name = Firefox Developer Edition +-brand-full-name = Firefox Developer Edition +# 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/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties new file mode 100644 index 0000000000..3177de0c23 --- /dev/null +++ b/browser/branding/aurora/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 Developer Edition +brandFullName=Firefox Developer Edition diff --git a/browser/branding/aurora/locales/jar.mn b/browser/branding/aurora/locales/jar.mn new file mode 100644 index 0000000000..b7043d5df9 --- /dev/null +++ b/browser/branding/aurora/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/ +# Aurora branding only exists in en-US + locale/branding/brand.properties (en-US/brand.properties) diff --git a/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/aurora/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/aurora/moz.build b/browser/branding/aurora/moz.build new file mode 100644 index 0000000000..dd081ac444 --- /dev/null +++ b/browser/branding/aurora/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/aurora/msix/Assets/Document44x44.png b/browser/branding/aurora/msix/Assets/Document44x44.png new file mode 100644 index 0000000000..440f14c4ef Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Document44x44.png differ diff --git a/browser/branding/aurora/msix/Assets/LargeTile.scale-200.png b/browser/branding/aurora/msix/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..da18f2add4 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/LargeTile.scale-200.png differ diff --git a/browser/branding/aurora/msix/Assets/SmallTile.scale-200.png b/browser/branding/aurora/msix/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..0630c36667 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/SmallTile.scale-200.png differ diff --git a/browser/branding/aurora/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/aurora/msix/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..c46c365121 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Square150x150Logo.scale-200.png differ diff --git a/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..370fb02e0b Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..370fb02e0b Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/browser/branding/aurora/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/aurora/msix/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..df991c715e Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Square44x44Logo.scale-200.png differ diff --git a/browser/branding/aurora/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/aurora/msix/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..e0bf902712 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/browser/branding/aurora/msix/Assets/StoreLogo.scale-200.png b/browser/branding/aurora/msix/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000..44f308af27 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/StoreLogo.scale-200.png differ diff --git a/browser/branding/aurora/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/aurora/msix/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..fd56902043 Binary files /dev/null and b/browser/branding/aurora/msix/Assets/Wide310x150Logo.scale-200.png differ diff --git a/browser/branding/aurora/newtab.ico b/browser/branding/aurora/newtab.ico new file mode 100644 index 0000000000..a9b37c08c6 Binary files /dev/null and b/browser/branding/aurora/newtab.ico differ diff --git a/browser/branding/aurora/newwindow.ico b/browser/branding/aurora/newwindow.ico new file mode 100644 index 0000000000..5537207710 Binary files /dev/null and b/browser/branding/aurora/newwindow.ico differ diff --git a/browser/branding/aurora/pbmode.ico b/browser/branding/aurora/pbmode.ico new file mode 100644 index 0000000000..9d63ab6dea Binary files /dev/null and b/browser/branding/aurora/pbmode.ico differ diff --git a/browser/branding/aurora/pref/firefox-branding.js b/browser/branding/aurora/pref/firefox-branding.js new file mode 100644 index 0000000000..526997980e --- /dev/null +++ b/browser/branding/aurora/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_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%a2/firstrun/"); +pref("startup.homepage_welcome_url.additional", ""); +// The time interval between checks for a new version (in seconds) +pref("app.update.interval", 28800); // 8 hours +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); +// URL user can browse to manually if for some reason all update installation +// attempts fail. +pref("app.update.url.manual", "https://www.mozilla.org/%LOCALE%/firefox/aurora/?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/aurora/"); + +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"); +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", 2); + +// Give the user x seconds to reboot before showing a badge on the hamburger +// button. default=4 days +pref("app.update.badgeWaitTime", 345600); + +// Number of usages of the web console. +// 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/aurora/private_browsing.VisualElementsManifest.xml b/browser/branding/aurora/private_browsing.VisualElementsManifest.xml new file mode 100644 index 0000000000..fdff8c55ff --- /dev/null +++ b/browser/branding/aurora/private_browsing.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/aurora/stubinstaller/bgstub.jpg b/browser/branding/aurora/stubinstaller/bgstub.jpg new file mode 100644 index 0000000000..17e7c84560 Binary files /dev/null and b/browser/branding/aurora/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/aurora/stubinstaller/installing_page.css b/browser/branding/aurora/stubinstaller/installing_page.css new file mode 100644 index 0000000000..d78e9da1ec --- /dev/null +++ b/browser/branding/aurora/stubinstaller/installing_page.css @@ -0,0 +1,62 @@ +/* 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%; + max-width: 100%; + 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/aurora/stubinstaller/profile_cleanup_page.css b/browser/branding/aurora/stubinstaller/profile_cleanup_page.css new file mode 100644 index 0000000000..2d9c3ad189 --- /dev/null +++ b/browser/branding/aurora/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/aurora/wizHeader.bmp b/browser/branding/aurora/wizHeader.bmp new file mode 100644 index 0000000000..a20140ef3b Binary files /dev/null and b/browser/branding/aurora/wizHeader.bmp differ diff --git a/browser/branding/aurora/wizHeaderRTL.bmp b/browser/branding/aurora/wizHeaderRTL.bmp new file mode 100644 index 0000000000..e785523034 Binary files /dev/null and b/browser/branding/aurora/wizHeaderRTL.bmp differ diff --git a/browser/branding/aurora/wizWatermark.bmp b/browser/branding/aurora/wizWatermark.bmp new file mode 100644 index 0000000000..6352f15137 Binary files /dev/null and b/browser/branding/aurora/wizWatermark.bmp differ diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild new file mode 100644 index 0000000000..a38663a3dc --- /dev/null +++ b/browser/branding/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/docs/UpdatingMacIcons.rst b/browser/branding/docs/UpdatingMacIcons.rst new file mode 100644 index 0000000000..b55d80cffe --- /dev/null +++ b/browser/branding/docs/UpdatingMacIcons.rst @@ -0,0 +1,31 @@ +.. _updatingmacicons: + +==================== +Updating macOS Icons +==================== + +macOS icons are stored as ``icns`` files that contain the same logo in multiple different sizes and DPIs. Apple's `Human Interface Guidelines `_ should be consulted for the specifics. + +Although it may seem like we can simply be handed the highest resolution/DPI version and downscale for the remainder -- this is not the case, some finer details in the icons (most notably shadows) need to be tweaked for each size. The UX team should hand off PNGs for every size and DPI needed. + +Once those are in hand, the ``icns`` file can be created with something like the following: + +:: + + mkdir firefox.iconset + mv icon_16x16.png firefox.iconset + mv icon_32x32.png firefox.iconset + mv icon_32x32@2x.png firefox.iconset + mv icon_64x64@2x.png firefox.iconset + mv icon_128x128.png firefox.iconset + mv icon_256x256 firefox.iconset + mv icon_256x256@2x.png firefox.iconset + mv icon_512x512.png firefox.iconset + mv icon_512x512@2x.png firefox.iconset + mv icon_1024x1024@2x.png firefox.iconset + iconutil -c icns firefox.iconset + + +(The ``NxN`` part is obviously the resolution, and the ``@2x`` string is used in the high DPI versions.) + +This will create a ``firefox.icns`` file. You can verify that it includes all of the necessary resolutions and DPIs by inspecting it with ``Preview.app``. You will likely need to do this for all brandings (``official``, ``aurora``, ``nightly``, and ``unofficial`` at the time of writing). diff --git a/browser/branding/docs/index.rst b/browser/branding/docs/index.rst new file mode 100644 index 0000000000..23e07fbd60 --- /dev/null +++ b/browser/branding/docs/index.rst @@ -0,0 +1,22 @@ +Firefox Branding +================ + +Firefox has multiple different sets of "branding" that are used to hold channel-specific things such as: +* Logos and other iconography +* Product names (eg: "Mozilla Firefox", "Firefox Developer Edition") +* Channel-specific preferences (eg: ``app.update.interval``) + +Brandings are stored in the `branding subdirectory `_ and map to builds as follows: + +- ``official`` is used for Release and Beta builds +- ``aurora`` is used for Developer Edition builds +- ``nightly`` is used for Nightly and Try builds +- ``unofficial`` is used when no other branding is specified (eg: local developer builds) + + +Additional reading +------------------ + +.. toctree:: + + UpdatingMacIcons diff --git a/browser/branding/moz.build b/browser/branding/moz.build new file mode 100644 index 0000000000..06ba31e105 --- /dev/null +++ b/browser/branding/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/. + +SPHINX_TREES["docs"] = "docs" + +with Files("docs/**"): + SCHEDULES.exclusive = ["docs"] 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..af4fd77542 --- /dev/null +++ b/browser/branding/nightly/content/aboutDialog.css @@ -0,0 +1,19 @@ +/* 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; + 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..d988c0ff9b --- /dev/null +++ b/browser/branding/nightly/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/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..ad85ed0fc0 --- /dev/null +++ b/browser/branding/nightly/pref/firefox-branding.js @@ -0,0 +1,36 @@ +/* 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-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"); +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", 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 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 diff --git a/browser/branding/unofficial/PrivateBrowsing_150.png b/browser/branding/unofficial/PrivateBrowsing_150.png new file mode 100644 index 0000000000..ffa6199af7 Binary files /dev/null and b/browser/branding/unofficial/PrivateBrowsing_150.png differ diff --git a/browser/branding/unofficial/PrivateBrowsing_70.png b/browser/branding/unofficial/PrivateBrowsing_70.png new file mode 100644 index 0000000000..fc525879f1 Binary files /dev/null and b/browser/branding/unofficial/PrivateBrowsing_70.png differ diff --git a/browser/branding/unofficial/VisualElements_150.png b/browser/branding/unofficial/VisualElements_150.png new file mode 100644 index 0000000000..7b3010a398 Binary files /dev/null and b/browser/branding/unofficial/VisualElements_150.png differ diff --git a/browser/branding/unofficial/VisualElements_70.png b/browser/branding/unofficial/VisualElements_70.png new file mode 100644 index 0000000000..67792531ec Binary files /dev/null and b/browser/branding/unofficial/VisualElements_70.png differ diff --git a/browser/branding/unofficial/background.png b/browser/branding/unofficial/background.png new file mode 100644 index 0000000000..d54d8c05fc Binary files /dev/null and b/browser/branding/unofficial/background.png differ diff --git a/browser/branding/unofficial/branding.nsi b/browser/branding/unofficial/branding.nsi new file mode 100644 index 0000000000..1fc5c12d2a --- /dev/null +++ b/browser/branding/unofficial/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 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 "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" +!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/unofficial/configure.sh b/browser/branding/unofficial/configure.sh new file mode 100644 index 0000000000..edd3bd3e86 --- /dev/null +++ b/browser/branding/unofficial/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=Nightly diff --git a/browser/branding/unofficial/content/about-logo-private.png b/browser/branding/unofficial/content/about-logo-private.png new file mode 100644 index 0000000000..0544145600 Binary files /dev/null and b/browser/branding/unofficial/content/about-logo-private.png differ diff --git a/browser/branding/unofficial/content/about-logo-private@2x.png b/browser/branding/unofficial/content/about-logo-private@2x.png new file mode 100644 index 0000000000..696b784218 Binary files /dev/null and b/browser/branding/unofficial/content/about-logo-private@2x.png differ diff --git a/browser/branding/unofficial/content/about-logo.png b/browser/branding/unofficial/content/about-logo.png new file mode 100644 index 0000000000..d1b97d2791 Binary files /dev/null and b/browser/branding/unofficial/content/about-logo.png differ diff --git a/browser/branding/unofficial/content/about-logo.svg b/browser/branding/unofficial/content/about-logo.svg new file mode 100644 index 0000000000..787413ae71 --- /dev/null +++ b/browser/branding/unofficial/content/about-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/browser/branding/unofficial/content/about-logo@2x.png b/browser/branding/unofficial/content/about-logo@2x.png new file mode 100644 index 0000000000..ffdc0d5e9c Binary files /dev/null and b/browser/branding/unofficial/content/about-logo@2x.png differ diff --git a/browser/branding/unofficial/content/about-wordmark.svg b/browser/branding/unofficial/content/about-wordmark.svg new file mode 100644 index 0000000000..d666dbd8e1 --- /dev/null +++ b/browser/branding/unofficial/content/about-wordmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/browser/branding/unofficial/content/about.png b/browser/branding/unofficial/content/about.png new file mode 100644 index 0000000000..61f72c971e Binary files /dev/null and b/browser/branding/unofficial/content/about.png differ diff --git a/browser/branding/unofficial/content/aboutDialog.css b/browser/branding/unofficial/content/aboutDialog.css new file mode 100644 index 0000000000..efd812629d --- /dev/null +++ b/browser/branding/unofficial/content/aboutDialog.css @@ -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/. */ + +#aboutDialogContainer { + background-color: #130829; + color: #fff; + color-scheme: dark; +} + +#rightBox { + background-size: auto 64px; + margin-inline: 30px; + padding-top: 64px; +} + +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; +} diff --git a/browser/branding/unofficial/content/firefox-wordmark.svg b/browser/branding/unofficial/content/firefox-wordmark.svg new file mode 100644 index 0000000000..4f115db35d --- /dev/null +++ b/browser/branding/unofficial/content/firefox-wordmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn new file mode 100644 index 0000000000..a5e6f551aa --- /dev/null +++ b/browser/branding/unofficial/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-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/aboutDialog.css diff --git a/browser/branding/unofficial/content/moz.build b/browser/branding/unofficial/content/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/unofficial/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/unofficial/default128.png b/browser/branding/unofficial/default128.png new file mode 100644 index 0000000000..b0a0905a70 Binary files /dev/null and b/browser/branding/unofficial/default128.png differ diff --git a/browser/branding/unofficial/default16.png b/browser/branding/unofficial/default16.png new file mode 100644 index 0000000000..0c5a7cdb57 Binary files /dev/null and b/browser/branding/unofficial/default16.png differ diff --git a/browser/branding/unofficial/default22.png b/browser/branding/unofficial/default22.png new file mode 100644 index 0000000000..7ea6518d17 Binary files /dev/null and b/browser/branding/unofficial/default22.png differ diff --git a/browser/branding/unofficial/default24.png b/browser/branding/unofficial/default24.png new file mode 100644 index 0000000000..f2ce045cc9 Binary files /dev/null and b/browser/branding/unofficial/default24.png differ diff --git a/browser/branding/unofficial/default256.png b/browser/branding/unofficial/default256.png new file mode 100644 index 0000000000..73518d0747 Binary files /dev/null and b/browser/branding/unofficial/default256.png differ diff --git a/browser/branding/unofficial/default32.png b/browser/branding/unofficial/default32.png new file mode 100644 index 0000000000..acf7984ff2 Binary files /dev/null and b/browser/branding/unofficial/default32.png differ diff --git a/browser/branding/unofficial/default48.png b/browser/branding/unofficial/default48.png new file mode 100644 index 0000000000..1094218ad2 Binary files /dev/null and b/browser/branding/unofficial/default48.png differ diff --git a/browser/branding/unofficial/default64.png b/browser/branding/unofficial/default64.png new file mode 100644 index 0000000000..a8d37aff56 Binary files /dev/null and b/browser/branding/unofficial/default64.png differ diff --git a/browser/branding/unofficial/disk.icns b/browser/branding/unofficial/disk.icns new file mode 100644 index 0000000000..ca9a9313ae Binary files /dev/null and b/browser/branding/unofficial/disk.icns differ diff --git a/browser/branding/unofficial/document.icns b/browser/branding/unofficial/document.icns new file mode 100644 index 0000000000..6733b9ff3e Binary files /dev/null and b/browser/branding/unofficial/document.icns differ diff --git a/browser/branding/unofficial/document.ico b/browser/branding/unofficial/document.ico new file mode 100644 index 0000000000..2f4cdd6a07 Binary files /dev/null and b/browser/branding/unofficial/document.ico differ diff --git a/browser/branding/unofficial/document_pdf.ico b/browser/branding/unofficial/document_pdf.ico new file mode 100644 index 0000000000..d6fe7c5bde Binary files /dev/null and b/browser/branding/unofficial/document_pdf.ico differ diff --git a/browser/branding/unofficial/dsstore b/browser/branding/unofficial/dsstore new file mode 100644 index 0000000000..2d11482a75 Binary files /dev/null and b/browser/branding/unofficial/dsstore differ diff --git a/browser/branding/unofficial/firefox.VisualElementsManifest.xml b/browser/branding/unofficial/firefox.VisualElementsManifest.xml new file mode 100644 index 0000000000..6e89c2d438 --- /dev/null +++ b/browser/branding/unofficial/firefox.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/unofficial/firefox.icns b/browser/branding/unofficial/firefox.icns new file mode 100644 index 0000000000..e8122e2b99 Binary files /dev/null and b/browser/branding/unofficial/firefox.icns differ diff --git a/browser/branding/unofficial/firefox.ico b/browser/branding/unofficial/firefox.ico new file mode 100644 index 0000000000..59dbd0b313 Binary files /dev/null and b/browser/branding/unofficial/firefox.ico differ diff --git a/browser/branding/unofficial/firefox64.ico b/browser/branding/unofficial/firefox64.ico new file mode 100644 index 0000000000..d91140c38b Binary files /dev/null and b/browser/branding/unofficial/firefox64.ico differ diff --git a/browser/branding/unofficial/locales/en-US/brand.ftl b/browser/branding/unofficial/locales/en-US/brand.ftl new file mode 100644 index 0000000000..5eaea9a7c4 --- /dev/null +++ b/browser/branding/unofficial/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 = Nightly +-brand-full-name = 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/unofficial/locales/en-US/brand.properties b/browser/branding/unofficial/locales/en-US/brand.properties new file mode 100644 index 0000000000..346c3bdb50 --- /dev/null +++ b/browser/branding/unofficial/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=Nightly diff --git a/browser/branding/unofficial/locales/jar.mn b/browser/branding/unofficial/locales/jar.mn new file mode 100644 index 0000000000..e67add60f5 --- /dev/null +++ b/browser/branding/unofficial/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/ +# Unofficial branding only exists in en-US + locale/branding/brand.properties (en-US/brand.properties) diff --git a/browser/branding/unofficial/locales/moz.build b/browser/branding/unofficial/locales/moz.build new file mode 100644 index 0000000000..d988c0ff9b --- /dev/null +++ b/browser/branding/unofficial/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/unofficial/moz.build b/browser/branding/unofficial/moz.build new file mode 100644 index 0000000000..dd081ac444 --- /dev/null +++ b/browser/branding/unofficial/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/unofficial/msix/Assets/Document44x44.png b/browser/branding/unofficial/msix/Assets/Document44x44.png new file mode 100644 index 0000000000..6b4855a22d Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Document44x44.png differ diff --git a/browser/branding/unofficial/msix/Assets/LargeTile.scale-200.png b/browser/branding/unofficial/msix/Assets/LargeTile.scale-200.png new file mode 100644 index 0000000000..c0183be2d9 Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/LargeTile.scale-200.png differ diff --git a/browser/branding/unofficial/msix/Assets/SmallTile.scale-200.png b/browser/branding/unofficial/msix/Assets/SmallTile.scale-200.png new file mode 100644 index 0000000000..8130df5fa0 Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/SmallTile.scale-200.png differ diff --git a/browser/branding/unofficial/msix/Assets/Square150x150Logo.scale-200.png b/browser/branding/unofficial/msix/Assets/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000..2201a29f8a Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Square150x150Logo.scale-200.png differ diff --git a/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png b/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png new file mode 100644 index 0000000000..34782f67ad Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-lightunplated_targetsize-256.png differ diff --git a/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 0000000000..34782f67ad Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/browser/branding/unofficial/msix/Assets/Square44x44Logo.scale-200.png b/browser/branding/unofficial/msix/Assets/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000..c1c040fbd2 Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Square44x44Logo.scale-200.png differ diff --git a/browser/branding/unofficial/msix/Assets/Square44x44Logo.targetsize-256.png b/browser/branding/unofficial/msix/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 0000000000..2e0c0ba035 Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/browser/branding/unofficial/msix/Assets/StoreLogo.scale-200.png b/browser/branding/unofficial/msix/Assets/StoreLogo.scale-200.png new file mode 100644 index 0000000000..c398bbf5b2 Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/StoreLogo.scale-200.png differ diff --git a/browser/branding/unofficial/msix/Assets/Wide310x150Logo.scale-200.png b/browser/branding/unofficial/msix/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000..2759c2989b Binary files /dev/null and b/browser/branding/unofficial/msix/Assets/Wide310x150Logo.scale-200.png differ diff --git a/browser/branding/unofficial/newtab.ico b/browser/branding/unofficial/newtab.ico new file mode 100644 index 0000000000..a9b37c08c6 Binary files /dev/null and b/browser/branding/unofficial/newtab.ico differ diff --git a/browser/branding/unofficial/newwindow.ico b/browser/branding/unofficial/newwindow.ico new file mode 100644 index 0000000000..5537207710 Binary files /dev/null and b/browser/branding/unofficial/newwindow.ico differ diff --git a/browser/branding/unofficial/pbmode.ico b/browser/branding/unofficial/pbmode.ico new file mode 100644 index 0000000000..6462477dba Binary files /dev/null and b/browser/branding/unofficial/pbmode.ico differ diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/firefox-branding.js new file mode 100644 index 0000000000..f22dd0a51c --- /dev/null +++ b/browser/branding/unofficial/pref/firefox-branding.js @@ -0,0 +1,32 @@ +/* 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", ""); +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. +// 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/unofficial/private_browsing.VisualElementsManifest.xml b/browser/branding/unofficial/private_browsing.VisualElementsManifest.xml new file mode 100644 index 0000000000..fdff8c55ff --- /dev/null +++ b/browser/branding/unofficial/private_browsing.VisualElementsManifest.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/browser/branding/unofficial/stubinstaller/bgstub.jpg b/browser/branding/unofficial/stubinstaller/bgstub.jpg new file mode 100644 index 0000000000..26d5fe2a40 Binary files /dev/null and b/browser/branding/unofficial/stubinstaller/bgstub.jpg differ diff --git a/browser/branding/unofficial/stubinstaller/installing_page.css b/browser/branding/unofficial/stubinstaller/installing_page.css new file mode 100644 index 0000000000..a15a4a76ec --- /dev/null +++ b/browser/branding/unofficial/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/unofficial/stubinstaller/profile_cleanup_page.css b/browser/branding/unofficial/stubinstaller/profile_cleanup_page.css new file mode 100644 index 0000000000..2d9c3ad189 --- /dev/null +++ b/browser/branding/unofficial/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/unofficial/wizHeader.bmp b/browser/branding/unofficial/wizHeader.bmp new file mode 100644 index 0000000000..5bf355be54 Binary files /dev/null and b/browser/branding/unofficial/wizHeader.bmp differ diff --git a/browser/branding/unofficial/wizHeaderRTL.bmp b/browser/branding/unofficial/wizHeaderRTL.bmp new file mode 100644 index 0000000000..2af497d336 Binary files /dev/null and b/browser/branding/unofficial/wizHeaderRTL.bmp differ diff --git a/browser/branding/unofficial/wizWatermark.bmp b/browser/branding/unofficial/wizWatermark.bmp new file mode 100644 index 0000000000..bb987860c4 Binary files /dev/null and b/browser/branding/unofficial/wizWatermark.bmp differ -- cgit v1.2.3