diff options
Diffstat (limited to 'libre/iceweasel')
| -rw-r--r-- | libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch | 4 | ||||
| -rw-r--r-- | libre/iceweasel/9004-FSDG-misc.patch | 814 | ||||
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 12 |
3 files changed, 748 insertions, 82 deletions
diff --git a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch index c773a8b08..e1da46760 100644 --- a/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch +++ b/libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch @@ -131,7 +131,7 @@ index 1506af2913..5f43ff26f3 100644 @@ -99,4 +99,4 @@ is updated. .. _configuration schema: SearchConfigurationSchema.html - .. _remote settings: /services/common/services/RemoteSettings.html + .. _remote settings: /services/settings/index.html -.. _search-default-override-allowlist bucket: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-default-override-allowlist/records +.. _search-default-override-allowlist bucket: resource://app/defaults/settings/main/search-default-override-allowlist.json diff --git a/toolkit/components/search/docs/SearchEngineConfiguration.rst b/toolkit/components/search/docs/SearchEngineConfiguration.rst @@ -989,7 +989,7 @@ index cb72224e1b..79940b598a 100644 // 1: Consult CRLite but only collect telemetry. // 2: Consult CRLite and enforce both "Revoked" and "Not Revoked" results. // 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked". --pref("security.pki.crlite_mode", 1); +-pref("security.pki.crlite_mode", 3); +pref("security.pki.crlite_mode", 0); // Issuer we use to detect MitM proxies. Set to the issuer of the cert of the diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch index 6324ce2b9..72981fb63 100644 --- a/libre/iceweasel/9004-FSDG-misc.patch +++ b/libre/iceweasel/9004-FSDG-misc.patch @@ -82,25 +82,34 @@ index b2d18d3098..e2e643bcf2 100644 -- 2.35.1 -From 897828b97d1729b3e2fc734c699a1f0fa127cbe2 Mon Sep 17 00:00:00 2001 +From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001 From: grizzlyuser <grizzlyuser@protonmail.com> -Date: Tue, 15 Mar 2022 13:29:29 +0100 +Date: Sat, 7 May 2022 21:46:48 +0200 Subject: [PATCH] Remove 'More from Mozilla' section in Preferences Currently it contains functionality to provide links to nonfree software -like Firefox Mobile, which is not compatible with the FSDG. +like Firefox Mobile, which is not compatible with the FSDG for the same +reasons as desktop Firefox. --- - browser/app/profile/firefox.js | 2 +- - browser/components/preferences/jar.mn | 4 ---- - browser/components/preferences/preferences.js | 9 --------- - browser/components/preferences/preferences.xhtml | 12 ------------ - 4 files changed, 1 insertion(+), 26 deletions(-) + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 12 ------- + browser/components/preferences/jar.mn | 4 --- + .../more-from-mozilla-qr-code-advanced.svg | 4 --- + .../more-from-mozilla-qr-code-simple-cn.svg | 4 --- + .../more-from-mozilla-qr-code-simple.svg | 4 --- + .../components/preferences/moreFromMozilla.js | 33 +------------------ + browser/components/preferences/preferences.js | 9 ----- + .../components/preferences/preferences.xhtml | 12 ------- + 9 files changed, 2 insertions(+), 82 deletions(-) + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg + delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 33a2ff36a7..72526ee950 100644 +index 76b495ea6c..d0c2b98b11 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -997,7 +997,7 @@ pref("browser.preferences.experimental", true); +@@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true); #else pref("browser.preferences.experimental", false); #endif @@ -109,11 +118,41 @@ index 33a2ff36a7..72526ee950 100644 pref("browser.preferences.experimental.hidden", false); pref("browser.preferences.defaultPerformanceSettings.enabled", true); +diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 4c59b84a7c..44d36d3b28 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -33,7 +33,6 @@ var gExceptionPaths = [ + "chrome://browser/content/assets/moz-vpn.svg", + "chrome://browser/content/assets/vpn-logo.svg", + "chrome://browser/content/assets/focus-promo.png", +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg", + "chrome://browser/content/assets/klar-qr-code.svg", + + // These app marketplace icons are referenced based on the user's locale +@@ -136,17 +135,6 @@ var whitelist = [ + // extensions/pref/autoconfig/src/nsReadConfig.cpp + { file: "resource://gre/defaults/autoconfig/prefcalls.js" }, + +- // browser/components/preferences/moreFromMozilla.js +- // These files URLs are constructed programatically at run time. +- { +- file: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg", +- }, +- { +- file: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg", +- }, +- + { file: "resource://gre/greprefs.js" }, + + // layout/mathml/nsMathMLChar.cpp diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn -index 752b0b2ae3..4f3babeaf8 100644 +index 912d9edf08..dd4697a368 100644 --- a/browser/components/preferences/jar.mn +++ b/browser/components/preferences/jar.mn -@@ -14,10 +14,6 @@ browser.jar: +@@ -14,12 +14,8 @@ browser.jar: content/browser/preferences/containers.js content/browser/preferences/sync.js content/browser/preferences/experimental.js @@ -124,6 +163,84 @@ index 752b0b2ae3..4f3babeaf8 100644 - content/browser/preferences/more-from-mozilla-qr-code-simple.svg - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg - content/browser/preferences/more-from-mozilla-qr-code-advanced.svg + content/browser/preferences/web-appearance-dark.svg + content/browser/preferences/web-appearance-light.svg +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg +deleted file mode 100644 +index 4848d3e20c..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +-<!-- 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/. --> +-<svg width="113" height="113" fill="content" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h105a2 2 0 0 1 2 2v105a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h105a4 4 0 0 1 4 4v105a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm10 6h22.448v22.448H10V10Zm6.414 3.207h-3.207V29.24H29.24V13.207H16.414ZM38.862 10h6.414v3.207h3.207v3.207h-3.207v3.207h3.207v-3.207h3.207V10h6.413v3.207h3.207V10h3.207v6.414h-9.62v6.414h3.206v3.207h3.207v-3.207h3.207V19.62h3.207v-3.207h3.207v3.207h3.207v-6.414h3.207V22.828h-3.207v3.207H70.93v6.413h-3.207v-3.207h-3.207v6.414H61.31v-6.414h-3.207v3.207h-3.206v-6.413h-6.414v-3.207h-6.414v3.207h-3.207v-3.207h-3.207v-6.414h6.414v-3.207h-3.207V10Zm6.414 22.448h-3.207v-6.413h3.207v6.413Zm-9.62 9.621h6.413v-3.207h-3.207v-3.207h6.414v-3.207h3.207v-3.207h3.207v3.207h3.207v6.414H51.69v-3.207h-3.207v3.207h3.207v3.207h-6.414v3.207h-3.207V54.897h-3.207v3.206h-3.207v-3.206h-3.207V51.69h-3.207v-3.207h3.207v-3.207h3.207v3.207h3.207v-3.207h-3.207v-3.207Zm-3.208 0v3.207h-3.207v-3.207h3.207Zm-3.207-3.207v-3.207h6.414v6.414h-3.207v-3.207h-3.207Zm-9.62 0v-3.207h6.414v3.207h3.206v3.207h-6.413v-3.207H19.62Zm0 0v3.207h-3.207v3.207h-3.207v-3.207H10v-3.207H19.621Zm6.414 19.241V51.69h3.206v3.207h3.207v3.206h-6.413Zm0 3.207v-3.207h-3.207V48.483h3.207v-3.207H19.62v3.207h-6.414v6.414h6.414v3.206h3.207v3.207h-6.414v-3.207H10v19.242h12.828v-3.207H19.62V70.93h6.414v6.414h6.413v-3.207h3.207V83.759h3.207v-3.207h3.207v16.034h16.034v3.207H48.483V103h9.62v-3.207h3.207V103h16.035v-3.207H67.724v-3.207H61.31V93.38H70.931v-3.207h12.828v6.414h-3.207V93.38h-6.414v3.207h6.414V103H93.379v-3.207h3.207v-3.207h3.207v3.207H103V93.38h-3.207v-3.207H90.172v-3.206h3.207v-3.207h3.207V70.93h-9.62v-3.207H96.586v-3.207H93.38V61.31h3.207v-3.207H93.38v-3.206h3.207V51.69h3.207V64.517H103V51.69h-3.207v-3.207H103v-3.207h-3.207v3.207h-3.207v3.207H93.38v-3.207h-3.207v3.207h-3.206v3.207h-3.207v-6.414h3.207v-3.207H96.586v-3.207h3.207v-3.207h-3.207v-3.207h-6.414v3.207H83.76v3.207h-6.414v-3.207h-3.207v6.414H70.93v3.207h3.207v-3.207H83.759v3.207h-6.414v3.207h3.207v3.207H70.93v3.206H80.552v3.207h3.207v-3.207h3.207v3.207h3.206v3.207h-3.206v3.207h-3.207v-3.207h-6.414V61.31H70.93v3.207h3.207v3.207h-6.414v6.414h-3.207V70.93H61.31v3.207h-3.207V70.93h-3.206v3.207H51.69V83.759h-3.207v3.207h-3.207v-6.414h-3.207v-3.207h3.207v-3.207h-3.207v3.207h-3.207V70.93h-3.207v-6.414h3.207v3.207h3.207V61.31h-6.414v-3.207h-3.207v3.207h-6.413Zm0 3.207V61.31h-3.207v3.207H19.62v3.207h3.207v-3.207h3.207Zm3.206 6.414h3.207v3.207h-3.207V70.93Zm0 0v-3.207h3.207v-3.207h-6.413v6.414h3.206Zm25.656 16.035h-6.414v3.206h-3.207v3.207H58.103v-3.207h3.207v-3.206h3.207v-3.207h3.207v6.413h3.207V83.76h-3.207v-3.207h-3.207v-3.207H61.31v3.207h-3.207v3.207h-3.206v3.207Zm3.206 0h3.207v-3.207h3.207v-3.207H61.31v3.207h-3.207v3.207Zm0 0h-3.206v3.206h3.206v-3.206Zm-3.206-12.828v3.207h3.206v-3.207h-3.206Zm28.862-3.207v-3.207h-6.414v3.207H70.93v3.207h6.414V70.93h6.414Zm0 0v3.207h3.207V70.93h-3.207Zm6.413-16.034h-3.206v3.206h3.206v-3.206Zm-6.413 3.206v-3.206h-3.207v3.206h3.207Zm6.413-19.24v3.206h3.207v-3.207h-3.207Zm0 16.034V51.69h3.207v3.207h-3.207Zm3.207 28.862v-3.207h-3.207v3.207h3.207Zm-3.207 9.62v6.414h3.207V93.38h-3.207Zm0 0v-3.207h-3.206v3.207h3.206Zm-6.413 3.207v3.207h3.207v-3.207h-3.207ZM54.897 38.862H64.517v3.207h-9.62v-3.207Zm19.24-25.655h-6.413V10h6.414v3.207Zm-12.827 9.62h-3.207v-3.206h3.207v3.207ZM80.552 10H103v22.448H80.552V10Zm6.413 3.207H83.76V29.24H99.793V13.207H86.966Zm-70.551 3.207H26.035V26.035H16.414V16.414Zm70.552 0H96.586V26.035h-9.62V16.414ZM35.656 29.24h3.206v3.207h-3.207v-3.207Zm38.482 0h3.207v6.414h-3.207v-6.414Zm-6.414 6.414h3.207v3.207h-3.207v-3.207Zm32.07 32.07H103V77.344h-3.207V67.724Zm-6.415 6.413h-3.207v3.207h3.207v-3.207Zm-19.241 3.207H70.93v3.207h3.207v-3.207Zm6.414 0h-3.207V86.966H86.966V77.345h-6.414ZM10 80.552h22.448V103H10V80.552Zm6.414 3.207h-3.207V99.793H29.24V83.76H16.414Zm64.138-3.207h3.207v3.207h-3.207v-3.207Zm-64.138 6.413H26.035V96.587H16.414v-9.62Zm19.241 0h3.207v6.414h-3.207v-6.413Zm6.414 12.828h3.207V103h-3.207v-3.207Z" fill="#141422"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.08 11.08 0 0 1-.218-.355 2.928 2.928 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.032.032 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144a4.633 4.633 0 0 0-2.55.982 2.782 2.782 0 0 0-.239-.181 4.295 4.295 0 0 1-.026-2.264c-.854.414-1.613 1-2.229 1.723h-.004c-.367-.465-.341-1.999-.32-2.32a1.656 1.656 0 0 0-.31.165c-.323.231-.626.49-.904.775a8.089 8.089 0 0 0-.866 1.039v.001-.002a7.821 7.821 0 0 0-1.242 2.806l-.013.06c-.017.082-.08.49-.091.579l-.002.02a8.82 8.82 0 0 0-.15 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.359a9.523 9.523 0 0 0-.6-4.652v.002ZM54.395 60.29c.043.02.083.043.128.063l.006.004a5.116 5.116 0 0 1-.134-.067Zm9.755-6.765v-.01l.001.01h-.001Z" fill="url(#a)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#b)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#c)"/><path d="m60.566 54.129.058.042a5.043 5.043 0 0 0-.86-1.121c-2.88-2.88-.755-6.241-.397-6.413l.004-.006c-2.326 1.362-3.116 3.883-3.187 5.145.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37Z" fill="url(#d)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#e)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#f)"/><path d="M53.202 52.452c.075.047.137.09.192.127a4.295 4.295 0 0 1-.026-2.264c-.855.414-1.614 1-2.23 1.723.046-.001 1.389-.025 2.064.414Z" fill="url(#g)"/><path d="M47.323 56.705c.715 4.222 4.542 7.447 8.886 7.57 4.021.113 6.59-2.222 7.65-4.498a8.387 8.387 0 0 0 .289-6.25v-.009c0-.007-.002-.01 0-.009l.002.016c.328 2.145-.763 4.222-2.469 5.629l-.005.012c-3.324 2.707-6.504 1.633-7.146 1.195a4.961 4.961 0 0 1-.135-.067c-1.938-.927-2.738-2.69-2.566-4.206a2.379 2.379 0 0 1-2.194-1.38 3.493 3.493 0 0 1 3.405-.136 4.611 4.611 0 0 0 3.476.136c-.003-.075-1.615-.716-2.243-1.335-.336-.331-.495-.49-.637-.61a2.78 2.78 0 0 0-.238-.181c-.055-.038-.117-.078-.192-.127-.675-.44-2.018-.415-2.063-.414h-.004c-.367-.465-.341-2-.32-2.32a1.66 1.66 0 0 0-.31.165c-.323.23-.626.49-.904.775-.319.32-.61.667-.87 1.036v.002-.002a7.82 7.82 0 0 0-1.242 2.805c-.005.019-.334 1.457-.172 2.203h.002Z" fill="url(#h)"/><path d="M59.763 53.05c.339.331.628.71.86 1.122.052.039.099.077.14.114 2.099 1.935.999 4.67.917 4.864 1.705-1.405 2.795-3.483 2.468-5.629-1.047-2.611-2.824-3.665-4.272-5.956a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.191 1.686 1.686 0 0 1-.144-.383.024.024 0 0 0-.015-.008.035.035 0 0 0-.018 0l-.004.003-.007.004c-.358.17-2.483 3.533.397 6.41l-.002.004Z" fill="url(#i)"/><path d="M60.762 54.287a1.93 1.93 0 0 0-.139-.114l-.057-.042a3.196 3.196 0 0 0-2.233-.542c3.33 1.665 2.437 7.4-2.179 7.184a4.12 4.12 0 0 1-1.205-.232 4.906 4.906 0 0 1-.428-.186l.007.004c.643.44 3.822 1.513 7.146-1.195l.005-.012c.083-.193 1.183-2.929-.917-4.864v-.001Z" fill="url(#j)"/><path d="M52.34 57.321s.427-1.593 3.06-1.593c.285 0 1.1-.794 1.114-1.025a4.612 4.612 0 0 1-3.476-.136 3.492 3.492 0 0 0-3.405.136 2.378 2.378 0 0 0 2.194 1.38c-.172 1.514.629 3.278 2.566 4.206.043.02.084.043.128.063-1.13-.585-2.065-1.69-2.181-3.03Z" fill="url(#k)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.033.033 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37 3.197 3.197 0 0 0-2.233-.542c3.331 1.665 2.437 7.4-2.178 7.184a4.117 4.117 0 0 1-1.205-.232 4.828 4.828 0 0 1-.429-.186l.007.004a4.825 4.825 0 0 1-.135-.067c.043.02.084.043.128.063-1.13-.584-2.064-1.69-2.18-3.03 0 0 .427-1.593 3.06-1.593.285 0 1.099-.794 1.114-1.024-.004-.076-1.616-.717-2.244-1.336-.336-.331-.495-.49-.636-.61a2.765 2.765 0 0 0-.24-.181 4.293 4.293 0 0 1-.025-2.264c-.855.414-1.614 1-2.23 1.723h-.004c-.366-.465-.34-1.999-.32-2.32a1.653 1.653 0 0 0-.309.165 6.75 6.75 0 0 0-.905.775 8.08 8.08 0 0 0-.866 1.039v.001-.002a7.82 7.82 0 0 0-1.242 2.805l-.013.062c-.017.081-.095.495-.106.584-.072.427-.117.858-.137 1.29v.049a9.261 9.261 0 0 0 18.386 1.566l.042-.359a9.525 9.525 0 0 0-.6-4.652Zm-.919.475.002.01-.002-.01Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.247 48.782) scale(19.3057)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(56.08 56.666) scale(19.3057)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.468 44.481) scale(13.9847)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(53.929 61.684) scale(9.19171)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.73773 -1.14544 1.34103 5.5467 57.013 55.01)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 48.065) scale(6.61363)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(61.097 43.764) scale(28.2178)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1701 20.56421 -13.49616 1.42422 58.751 45.329)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 50.454) scale(17.614)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.38 51.41) scale(19.2794)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="63.842" y1="49.59" x2="48.468" y2="64.423" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="63.656" y1="49.512" x2="50.577" y2="62.593" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg> +\ No newline at end of file +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg +deleted file mode 100644 +index 5052db9702..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +-<!-- 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/. --> +-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h72a2 2 0 0 1 2 2v72a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h72a4 4 0 0 1 4 4v72a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm7.08 3.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm18.163-2.27h4.541v2.27h2.27v2.27h-2.27v2.27h-2.27v2.271h4.54v-4.54h2.27V9.35h2.271v6.811h-2.27v2.27h2.27v4.541h-2.27v-2.27h-2.27v-2.27h-2.27v2.27h-2.271v-2.27h-2.27V7.08Zm0 13.622v-2.27h-2.27V9.35h-2.27v13.622h2.27v2.27h-9.081v2.271h-2.27v2.27H13.89v-4.54h-2.27v2.27H7.08v2.27h2.27v2.27h2.27v2.271h9.081v2.27h2.271v2.27h-2.27v2.271h-2.27v-2.27h-2.27v-2.27H7.08v2.27h4.54v2.27H9.35v2.27h6.811v-2.27h2.27v4.54h6.811v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-4.54h2.27v-2.271h-4.54v-2.27h2.27v-2.271h2.27v-4.54h2.27v2.27h4.541v2.27h-2.27v2.27h2.27v-2.27h2.27v-4.54h-2.27v-2.271h-2.27v2.27h-2.27v-2.27h-2.27Zm0 0h-2.27v2.27h2.27v-2.27Zm-9.081 11.352v2.27h2.27v2.27h2.27v-4.54h-4.54Zm4.54 9.081h-4.54v2.27h4.54v-2.27Zm-4.54-9.081v-2.27h2.27v-2.271h-4.54v4.54h2.27Zm-9.082 0v-2.27h2.27v2.27h-2.27ZM41.135 9.35V7.08h2.27v2.27h-2.27Zm2.27 20.433h-2.27v-4.54h2.27v2.27h2.27v-2.27h2.271v-4.541h2.27v2.27h2.271v-4.54h2.27V25.242h2.27v2.271h-4.54v-2.27h-2.27v4.54h-6.811Zm9.082 2.27v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v4.541h-2.27v4.541h2.27v4.54h-2.27v4.541h-4.541v2.271h-2.27v-2.27h-2.27v2.27h2.27v2.27h-4.541v-4.54h-6.811v2.27h-2.27v-4.54h-4.541v2.27h-2.27v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54H13.89v2.27h-2.27v-4.541H9.35v2.27H7.08v2.27h4.54v2.271H7.08v2.27h4.54v-2.27h2.27v2.27h2.271v-2.27h2.27v2.27h6.811v6.811h2.271v2.27h2.27v2.271h-4.54v2.27h2.27v2.271h2.27v-4.54h2.27v-2.271h-2.27v-4.54h4.541v2.27h2.27v2.27h-2.27v2.27h2.27v4.541h-2.27v2.27h2.27v-2.27h2.27v2.27h6.811v-2.27h4.541v-4.54h4.541v2.27h-2.27v4.54h2.27v-2.27h2.27v2.27h9.082V66.11h2.27v2.27h4.541v-2.27h-2.27v-6.811h2.27V45.675h-2.27v13.622h-2.27v-2.27h-2.27v-4.541h-6.811v-2.27h-4.541v-6.811h2.27v4.54h4.54v-4.54h-2.27v-2.27h-6.811v-2.271h2.27v-2.27h2.27v2.27h2.271v-4.54h4.54v9.08h2.271v-2.27h2.27v-2.27h-2.27v-6.811h2.27v-2.27h2.271v2.27h2.27v-4.541h-2.27v-2.27H59.299v2.27h-2.271v2.27h-2.27v2.27Zm2.27 0v2.271h-2.27v-2.27h2.27Zm2.271-2.27h2.27v2.27h2.27v-4.54h-4.54v2.27Zm0 0v2.27h-2.27v-2.27h2.27Zm9.082 29.515h-2.27v2.27h-2.271v2.27h4.54v-4.54ZM54.757 66.11h2.27v2.27h2.271v2.271h4.54v-2.27h-2.27v-2.27h-2.27v-2.271h-4.54v2.27Zm-6.81-2.27v2.27h2.27v-2.27h-2.27Zm-2.271 0v-2.27h-6.811v-2.27h2.27v-2.271h2.27v-2.27h9.082v4.54h-4.54v-2.27h-2.271v2.27h2.27v4.54h-2.27Zm0 0h-9.081v2.27h2.27v2.27h2.27v2.271h2.27v-2.27h2.27v-4.541Zm-9.082-6.811v2.27h-2.27v-2.27h2.27Zm0-2.27h2.27v2.27h-2.27v-2.27Zm0 0h-2.27v-2.271h2.27v2.27Zm-6.81 4.54v-6.811h-2.271v6.811h2.27ZM47.945 7.08h4.541v4.54h-2.27V9.35h-2.27V7.08Zm0 2.27v2.27h2.27v2.27h4.541v2.271h-4.54v2.27h-6.811v-2.27h2.27v-2.27h-2.27v-2.27h2.27V9.35h2.27Zm9.082-2.27H72.92v15.892H57.028V7.08Zm4.54 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm49.949 0H68.379v6.811H61.57V11.621Zm-18.163 9.082h2.27v2.27h-2.27v-2.27ZM68.38 34.324h2.27v2.27h-2.27v-2.27Zm2.27 2.27h2.27v4.541h-2.27v-4.54Zm-4.54 11.352h2.27v2.27h-2.27v-2.27Zm-9.082 6.811h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Zm59.03 9.082h2.27v2.27h-2.27v-2.27Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215-.052-.082-.104-.164-.154-.25a2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.953 1.953 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.856 4.856 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.077.031-.15.07-.219.117-.229.163-.444.347-.64.549-.225.227-.43.473-.613.735a5.537 5.537 0 0 0-.88 1.986l-.009.043c-.012.057-.056.346-.064.41l-.002.014c-.057.298-.093.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.742 6.742 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006.007Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.57 3.57 0 0 0-.608-.795c-2.039-2.038-.535-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="m37.665 37.134.136.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.461.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.683 1.683 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.238-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.712 5.712 0 0 0-.616.733 5.536 5.536 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.017 38.433a1.349 1.349 0 0 0-.098-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.915 2.915 0 0 1-.853-.164 3.434 3.434 0 0 1-.303-.132l.005.003c.455.311 2.706 1.071 5.059-.846l.004-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.683 1.683 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.036 8.036 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.308 3.308 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.432 3.432 0 0 1-.303-.132l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .778-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.536 5.536 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.743 6.743 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.5074)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68222)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="rotate(83.976 2.969 39.153) scale(14.6396 9.60783)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg> +diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg +deleted file mode 100644 +index 279595db10..0000000000 +--- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg ++++ /dev/null +@@ -1,4 +0,0 @@ +-<!-- 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/. --> +-<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M76 2H4a2 2 0 0 0-2 2v72a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2ZM4 0a4 4 0 0 0-4 4v72a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V4a4 4 0 0 0-4-4H4Zm3.08 7.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm20.434-2.27h2.27v2.27h2.27V7.08h4.541v2.27h2.27v2.27H36.596v2.27h-4.541v2.271h-2.27v-2.27h-2.271v-2.27h2.27V9.35h2.27V7.08Zm-4.541 4.54h-2.27V9.35h2.27v2.27Zm2.27 11.352v-4.54h2.27v-2.27h4.541V13.89h4.541v2.27h4.54v2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.271v2.271h-2.27Zm-4.54 2.27V18.433h2.27v4.54h2.27v2.27h-4.54Zm0 0v2.271h-9.081v-2.27h9.08Zm11.351-2.27h-2.27v-2.27h2.27v2.27Zm2.27 0h-2.27v4.541h-2.27v-2.27h-2.27v2.27h2.27v2.27h4.54V22.973Zm2.271 0v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v6.811h4.54v-2.27h-2.27v-4.54Zm2.27 0h-2.27v-2.27h2.27v2.27Zm4.542-6.81h-2.27V22.971h-2.271v2.27h2.27v2.271h2.27v2.27h-2.27v2.27h2.27v-2.27h2.271v2.27h2.27v2.271h2.27v-4.54h2.271v2.27h2.27v2.27h-2.27v2.27h-2.27v2.27h-4.541v6.811h2.27v2.271h4.541v4.541h-6.811v-2.27h-2.27v2.27h-2.27v-2.27h-4.541v2.27h-4.541v-2.27h-4.54v2.27h2.27v2.27h2.27v2.27H45.675v4.541h2.271v2.27h-2.27v2.271h-2.27v-4.54h-4.541v-2.27h-2.27v-2.271h-2.27v2.27h2.27v2.27h-2.27v2.27h-2.271v-2.27h-2.27v-2.27h-2.271v-4.54h2.27v2.27h2.27v-2.27h-2.27v-2.271h2.27v-2.27h-4.54v-2.27h2.27v-2.271h-2.27v-4.54h2.27v-2.271h-2.27v-6.811h2.27v-2.27h-2.27v2.27h-4.54v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54h-2.27V36.593H13.89v-4.54h-2.27v-2.27h2.27v-2.271H7.08v6.811h2.27v4.54h4.54v2.271h-2.27v2.27H9.35v-2.27H7.08v2.27h2.27v2.27H7.08v2.271h2.27v-2.27h2.27v2.27h2.27v-4.54h4.541v-2.27h-2.27v-4.541h2.27v2.27h2.27v2.27h2.271v2.27h-2.27v2.27h-2.27v2.271h-2.27v2.27H11.62v2.271H7.08v2.27h4.54v-2.27h4.541v2.27h9.081v9.081h4.541v4.541h-2.27v4.541h4.54v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-2.271h2.27v-2.27h2.27v2.27h2.271v2.27h-2.27v6.811H45.675v-4.54h2.271v4.54h2.27v-4.54h2.271v4.54h6.811v-2.27h2.27v2.27h2.27v-2.27h-2.27v-2.27h-4.54v-2.27h-9.081v-2.271H59.297v2.27h2.27v-2.27h2.27v4.54h4.541v4.541h2.271v-2.27h2.27v-4.54h-2.27v-2.271h2.27v-2.27h-2.27v-2.27h2.27v-4.541h-2.27v-4.541h2.27V27.513h-2.27v-2.27h-2.27v2.27h-6.811v-2.27h-4.541v2.27h-2.27v-2.27h-2.271v-2.27h2.27v-4.541h-4.54v-2.27Zm2.27-6.812h2.27v4.54h-2.27v2.271h-2.27v-4.54h2.27V9.35Zm0 0h-6.811V7.08h6.811v2.27Zm0 13.622v-2.27h-2.27v2.27h2.27Zm9.081 6.811v2.27h2.27v2.271h-2.27v2.27h-2.27v4.541h-4.54v2.27h2.27v2.27h4.54v-2.27h2.27v4.541h-2.27v4.541h2.27v6.811h2.271v2.27h-2.27v2.27h4.54v-4.54h2.271v-4.54h-2.27v-4.541h2.27v-4.541h-2.27v-4.54h2.27v-6.811h-2.27v-2.271h2.27v-2.27h-4.54v2.27h-2.271v-2.27h-2.27Zm6.812 24.974h-2.27v2.27h2.27v-2.27Zm0-4.54h-4.541v-2.27h4.54v2.27Zm-4.541-9.082h2.27v2.27h-2.27v-2.27Zm-2.27 0v-4.54h2.27v4.54h-2.27Zm4.54-4.54v-2.27h-2.27v2.27h2.27Zm0 0h2.27v2.27h-2.27v-2.27Zm-4.54 4.54v2.27h-2.27v-2.27h2.27Zm0-11.352v-2.27h-2.27v2.27h2.27ZM57.028 68.38h-2.27v2.27h2.27v-2.27Zm-24.974 0h-2.27v2.27h2.27v-2.27ZM20.702 47.946v2.27h2.27v2.271h-4.54v-4.54h2.27Zm2.27-2.27v2.27h-2.27v-2.27h2.27Zm2.27 0v2.27h2.271v-2.27h-2.27Zm0 0h-2.27v-2.27h2.27v2.27Zm-2.27-9.082v2.27h-2.27v-2.27h2.27Zm0 0h2.27v-2.27h-2.27v2.27ZM9.35 34.324v-2.27h2.27v2.27H9.35Zm15.893 20.433h2.27v-2.27h-2.27v2.27ZM41.135 66.11v4.541h2.27v-4.54h-2.27Zm6.811-4.54v-2.27h2.27v2.27h-2.27Zm-2.27-6.812h-2.27v-2.27h2.27v2.27Zm0 0v2.27h2.27v-2.27h-2.27Zm4.54-20.433v2.27h2.271v-2.27h-2.27Zm2.271-9.081h-2.27v2.27h2.27v-2.27Zm4.54-18.163H72.92v15.892H57.028V7.08Zm4.541 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm34.056 0h2.27v2.27h-2.27v-2.27Zm15.892 0h6.811v6.811H61.57V11.621Zm-4.54 43.137h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .663 1.99l.002.01c-.741-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.024.024 0 0 0-.013 0l-.003.002-.004.003.002-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.967 1.967 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.855 4.855 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.076.031-.15.07-.218.117-.23.163-.444.347-.641.549a5.73 5.73 0 0 0-.613.735 5.535 5.535 0 0 0-.88 1.986l-.008.043c-.013.057-.057.346-.065.41l-.002.014c-.057.298-.092.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.743 6.743 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006l.001.007h-.001Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.567 3.567 0 0 0-.608-.795c-2.038-2.038-.534-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.153-.011.23-.011a3.308 3.308 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="M37.666 37.134c.053.034.096.063.135.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.462.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.684 1.684 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.237-.234-.35-.347-.45-.432a1.973 1.973 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.72 5.72 0 0 0-.616.733 5.538 5.538 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.023.023 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.018 38.433a1.351 1.351 0 0 0-.099-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.916 2.916 0 0 1-.853-.164 3.497 3.497 0 0 1-.192-.08c-.037-.016-.074-.033-.11-.052l.004.003c.455.311 2.706 1.071 5.06-.846l.003-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.684 1.684 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66a6.81 6.81 0 0 1 .664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.023.023 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.495 3.495 0 0 1-.193-.079c-.037-.017-.074-.033-.11-.053l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .779-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.988 1.988 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.538 5.538 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.742 6.742 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.50741)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68221)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.53635 14.55876 -9.55479 1.0083 41.594 32.091)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg> +\ No newline at end of file +diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js +index 1208a5dbcd..ff91f7421e 100644 +--- a/browser/components/preferences/moreFromMozilla.js ++++ b/browser/components/preferences/moreFromMozilla.js +@@ -81,38 +81,7 @@ var gMoreFromMozillaPane = { + }, + + renderProducts() { +- let products = [ +- { +- id: "firefox-mobile", +- title_string_id: "more-from-moz-firefox-mobile-title", +- description_string_id: "more-from-moz-firefox-mobile-description", +- region: "global", +- button: { +- id: "fxMobile", +- type: "link", +- label_string_id: "more-from-moz-learn-more-link", +- actionURL: AppConstants.isChinaRepack() +- ? "https://www.firefox.com.cn/browsers/mobile/" +- : "https://www.mozilla.org/firefox/browsers/mobile/", +- }, +- qrcode: { +- title: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-title", +- }, +- image_src_prefix: +- "chrome://browser/content/preferences/more-from-mozilla-qr-code", +- button: { +- id: "qr-code-send-email", +- label: { +- string_id: "more-from-moz-qr-code-box-firefox-mobile-button", +- }, +- actionURL: AppConstants.isChinaRepack() +- ? "https://www.firefox.com.cn/mobile/get-app/" +- : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm", +- }, +- }, +- }, +- ]; ++ let products = []; + + if (BrowserUtils.shouldShowVPNPromo()) { + const vpn = { diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index f6dc2b3781..34c7d8c528 100644 --- a/browser/components/preferences/preferences.js @@ -189,7 +306,617 @@ index 81059f3d2e..be23729276 100644 </vbox> </vbox> -- -2.35.1 +2.36.0 + + +From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001 +From: grizzlyuser <grizzlyuser@protonmail.com> +Date: Sat, 7 May 2022 21:51:06 +0200 +Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private + Browsing + +Please correct me if I'm wrong, but these are not compatible with FSDG +for the same reasons as the original Firefox. +--- + browser/app/profile/firefox.js | 2 +- + .../static/browser_all_files_referenced.js | 2 - + .../newtab/lib/OnboardingMessageProvider.jsm | 215 ------------------ + .../newtab/lib/PanelTestProvider.jsm | 84 ------- + .../content/assets/focus-qr-code.svg | 114 ---------- + .../content/assets/klar-qr-code.svg | 114 ---------- + 6 files changed, 1 insertion(+), 530 deletions(-) + delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg + delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index d0c2b98b11..54cc9de7e6 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g + pref("browser.promo.focus.disallowed_regions", "cn"); + + // Default to enabling focus promos to be shown where allowed. +-pref("browser.promo.focus.enabled", true); ++pref("browser.promo.focus.enabled", false); + + // Comma separated string of mozilla vpn supported platforms. + pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux"); +diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js +index 44d36d3b28..6823855d56 100644 +--- a/browser/base/content/test/static/browser_all_files_referenced.js ++++ b/browser/base/content/test/static/browser_all_files_referenced.js +@@ -32,8 +32,6 @@ var gExceptionPaths = [ + "chrome://activity-stream/content/data/content/assets/remote/", + "chrome://browser/content/assets/moz-vpn.svg", + "chrome://browser/content/assets/vpn-logo.svg", +- "chrome://browser/content/assets/focus-promo.png", +- "chrome://browser/content/assets/klar-qr-code.svg", + + // These app marketplace icons are referenced based on the user's locale + // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx +diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +index dab8a0ec19..81bedf523c 100644 +--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm ++++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm +@@ -95,221 +95,6 @@ const ONBOARDING_MESSAGES = () => [ + ], + }, + }, +- { +- id: "PB_NEWTAB_FOCUS_PROMO", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "fluent:about-private-browsing-focus-promo-cta", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: "fluent:about-private-browsing-focus-promo-text-c", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "FOCUS_PROMO", +- template: "multistage", +- modal: "tab", +- metrics: "block", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- order: 0, +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/focus-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- image_overrides: { +- de: +- "chrome://browser/content/assets/klar-qr-code.svg", +- }, +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 1, +- period: 604800000, // Max 1 per week +- }, +- ], +- lifetime: 3, +- }, +- targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')", +- }, +- { +- id: "PB_NEWTAB_KLAR_PROMO", +- template: "pb_newtab", +- groups: ["pbNewtab"], +- content: { +- infoBody: "fluent:about-private-browsing-info-description-simplified", +- infoEnabled: true, +- infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg", +- infoLinkText: "fluent:about-private-browsing-learn-more-link", +- infoTitle: "", +- infoTitleEnabled: false, +- promoEnabled: true, +- promoType: "FOCUS", +- promoHeader: "fluent:about-private-browsing-focus-promo-header-c", +- promoImageLarge: "chrome://browser/content/assets/focus-promo.png", +- promoLinkText: "Download Firefox Klar", +- promoLinkType: "button", +- promoSectionStyle: "below-search", +- promoTitle: +- "Firefox Klar clears your history every time while blocking ads and trackers.", +- promoTitleEnabled: true, +- promoButton: { +- action: { +- type: "SHOW_SPOTLIGHT", +- data: { +- content: { +- id: "KLAR_PROMO", +- template: "multistage", +- modal: "tab", +- metrics: "block", +- backdrop: "transparent", +- screens: [ +- { +- id: "DEFAULT_MODAL_UI", +- order: 0, +- content: { +- logo: { +- imageURL: +- "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: "Get Firefox Klar", +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/klar-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- }, +- }, +- }, +- }, +- priority: 2, +- frequency: { +- custom: [ +- { +- cap: 1, +- period: 604800000, // Max 1 per week +- }, +- ], +- lifetime: 3, +- }, +- targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'", +- }, + { + id: "PB_NEWTAB_INFO_SECTION", + template: "pb_newtab", +diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm +index a991581f7b..af57c3eea8 100644 +--- a/browser/components/newtab/lib/PanelTestProvider.jsm ++++ b/browser/components/newtab/lib/PanelTestProvider.jsm +@@ -558,90 +558,6 @@ const MESSAGES = () => [ + frequency: { lifetime: 3 }, + trigger: { id: "defaultBrowserCheck" }, + }, +- { +- id: "PB_FOCUS_PROMO", +- groups: ["panel-test-provider"], +- template: "spotlight", +- content: { +- template: "multistage", +- backdrop: "transparent", +- screens: [ +- { +- id: "PBM_FIREFOX_FOCUS", +- order: 0, +- content: { +- logo: { +- imageURL: "chrome://browser/content/assets/focus-logo.svg", +- height: "48px", +- }, +- title: { +- string_id: "spotlight-focus-promo-title", +- }, +- subtitle: { +- string_id: "spotlight-focus-promo-subtitle", +- }, +- dismiss_button: { +- action: { +- navigate: true, +- }, +- }, +- ios: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- android: { +- action: { +- data: { +- args: +- "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- email_link: { +- action: { +- data: { +- args: "https://mozilla.org", +- where: "tabshifted", +- }, +- type: "OPEN_URL", +- navigate: true, +- }, +- }, +- tiles: { +- type: "mobile_downloads", +- data: { +- QR_code: { +- image_url: +- "chrome://browser/content/assets/focus-qr-code.svg", +- alt_text: { +- string_id: "spotlight-focus-promo-qr-code", +- }, +- image_overrides: { +- de: "chrome://browser/content/assets/klar-qr-code.svg", +- }, +- }, +- email: { +- link_text: "Email yourself a link", +- }, +- marketplace_buttons: ["ios", "android"], +- }, +- }, +- }, +- }, +- ], +- }, +- trigger: { id: "defaultBrowserCheck" }, +- }, + { + id: "PB_NEWTAB_VPN_PROMO", + template: "pb_newtab", +diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg +deleted file mode 100644 +index f182567314..0000000000 +--- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +-<!-- 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/. --> +-<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg"> +-<rect width="113" height="113" rx="4" fill="white"/> +-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM77.3448 10H74.1379H70.931H67.7241V13.2069H64.5172H61.3103V16.4138V19.6207H58.1034H54.8966V16.4138V13.2069V10H51.6897V13.2069H48.4828V10H45.2759H42.069V13.2069H38.8621V10H35.6552V13.2069H38.8621V16.4138H35.6552V19.6207H38.8621V22.8276H35.6552V26.0345H38.8621H42.069V29.2414V32.4483H38.8621V29.2414H35.6552V32.4483H38.8621V35.6552V38.8621H42.069H45.2759V35.6552H42.069V32.4483H45.2759V29.2414V26.0345V22.8276H48.4828V26.0345H51.6897V22.8276H54.8966H58.1034H61.3103V26.0345H58.1034V29.2414H54.8966V32.4483H51.6897V29.2414H48.4828V32.4483V35.6552V38.8621H51.6897V42.069H54.8966V38.8621H58.1034H61.3103V35.6552H64.5172V38.8621V42.069H67.7241V45.2759H70.931H74.1379V42.069H77.3448H80.5517V45.2759H83.7586V48.4828H80.5517V51.6897H83.7586V54.8966H80.5517H77.3448H74.1379V51.6897V48.4828H70.931V51.6897V54.8966V58.1034H74.1379V61.3103H77.3448V64.5172V67.7241H74.1379V70.931H70.931V67.7241H67.7241V70.931H64.5172V74.1379H67.7241V70.931H70.931V74.1379H74.1379V77.3448H70.931H67.7241V80.5517H64.5172V83.7586H61.3103V86.9655H58.1034V83.7586H54.8966V86.9655H58.1034V90.1724H54.8966V93.3793H51.6897V90.1724V86.9655V83.7586V80.5517V77.3448H48.4828V74.1379H51.6897V70.931H48.4828V74.1379H45.2759V70.931V67.7241H42.069V64.5172V61.3103H38.8621V58.1034V54.8966H42.069V51.6897H38.8621V48.4828H35.6552V45.2759H38.8621V42.069H35.6552V38.8621V35.6552H32.4483H29.2414H26.0345V38.8621H22.8276V42.069H19.6207V45.2759H22.8276V48.4828H26.0345V51.6897H22.8276H19.6207V48.4828H16.4138V45.2759H13.2069V48.4828H10V51.6897V54.8966H13.2069H16.4138V51.6897H19.6207V54.8966H22.8276H26.0345V58.1034H22.8276H19.6207V61.3103H16.4138V58.1034H13.2069V61.3103H10V64.5172V67.7241H13.2069H16.4138V70.931H13.2069H10V74.1379H13.2069H16.4138V77.3448H13.2069H10V80.5517H13.2069H16.4138V77.3448H19.6207V80.5517H22.8276V83.7586H19.6207V86.9655H16.4138V83.7586H13.2069H10V86.9655V90.1724H13.2069V86.9655H16.4138V90.1724H19.6207H22.8276H26.0345V93.3793H22.8276H19.6207H16.4138H13.2069V96.5862V99.7931H16.4138V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931V96.5862H29.2414H32.4483V99.7931H29.2414V103H32.4483V99.7931H35.6552H38.8621V103H42.069H45.2759V99.7931H48.4828V103H51.6897V99.7931H54.8966H58.1034V103H61.3103H64.5172V99.7931H67.7241V103H70.931V99.7931H74.1379V96.5862H77.3448V93.3793V90.1724V86.9655H74.1379V83.7586V80.5517H77.3448V77.3448V74.1379H80.5517V77.3448H83.7586H86.9655H90.1724H93.3793V74.1379H96.5862V70.931V67.7241H93.3793V64.5172H90.1724V61.3103H93.3793H96.5862V64.5172H99.7931V67.7241V70.931V74.1379V77.3448H103V74.1379V70.931V67.7241V64.5172H99.7931V61.3103H96.5862V58.1034H99.7931V54.8966H103V51.6897H99.7931V54.8966H96.5862V58.1034H93.3793V54.8966H90.1724V58.1034V61.3103H86.9655V58.1034H83.7586V54.8966H86.9655V51.6897H90.1724H93.3793H96.5862V48.4828H93.3793V45.2759V42.069H96.5862V45.2759H99.7931V42.069H103V38.8621H99.7931V42.069H96.5862V38.8621V35.6552H93.3793H90.1724H86.9655V38.8621H90.1724V42.069V45.2759V48.4828H86.9655V45.2759V42.069H83.7586H80.5517V38.8621H83.7586V35.6552H80.5517V38.8621H77.3448V35.6552V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V26.0345H74.1379V29.2414V32.4483V35.6552V38.8621H70.931H67.7241V35.6552H70.931V32.4483V29.2414H67.7241V26.0345V22.8276H64.5172V19.6207V16.4138H67.7241H70.931V19.6207H74.1379H77.3448V16.4138V13.2069V10ZM64.5172 29.2414H67.7241V32.4483H64.5172V29.2414ZM61.3103 29.2414V32.4483H58.1034V29.2414H61.3103ZM61.3103 29.2414H64.5172V26.0345H61.3103V29.2414ZM83.7586 58.1034V61.3103H80.5517V58.1034H83.7586ZM90.1724 64.5172V67.7241V70.931H93.3793V74.1379H90.1724H86.9655V70.931V67.7241H83.7586H80.5517V64.5172H83.7586H86.9655H90.1724ZM80.5517 74.1379V70.931H83.7586V74.1379H80.5517ZM70.931 90.1724V93.3793H74.1379V96.5862H70.931H67.7241V93.3793V90.1724H70.931ZM64.5172 90.1724V86.9655H67.7241V90.1724H64.5172ZM61.3103 93.3793V90.1724H64.5172V93.3793H61.3103ZM61.3103 93.3793V96.5862H64.5172V99.7931H61.3103H58.1034V96.5862V93.3793H61.3103ZM70.931 90.1724V86.9655H74.1379V90.1724H70.931ZM45.2759 99.7931H42.069H38.8621V96.5862H42.069V93.3793H45.2759H48.4828V96.5862H45.2759V99.7931ZM16.4138 74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276H19.6207H16.4138ZM13.2069 61.3103H16.4138V64.5172H13.2069V61.3103ZM29.2414 51.6897V54.8966H26.0345V51.6897H29.2414ZM29.2414 51.6897V48.4828H32.4483V51.6897H29.2414ZM22.8276 45.2759V42.069H26.0345V45.2759H22.8276ZM26.0345 58.1034H29.2414V61.3103H32.4483V58.1034H35.6552V61.3103H38.8621V64.5172H35.6552H32.4483H29.2414H26.0345H22.8276V61.3103H26.0345V58.1034ZM42.069 80.5517H38.8621V77.3448V74.1379V70.931H35.6552V74.1379H32.4483V70.931V67.7241H35.6552H38.8621H42.069V70.931V74.1379V77.3448V80.5517ZM42.069 86.9655V83.7586V80.5517H45.2759V77.3448H48.4828V80.5517V83.7586V86.9655V90.1724H45.2759V86.9655H42.069ZM42.069 86.9655V90.1724H38.8621V86.9655H42.069ZM54.8966 38.8621H51.6897V35.6552H54.8966V38.8621ZM42.069 13.2069V16.4138H45.2759V19.6207H48.4828V16.4138V13.2069H45.2759H42.069ZM58.1034 74.1379V70.931H61.3103V74.1379H58.1034ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM19.6207 35.6552H16.4138H13.2069H10V38.8621V42.069H13.2069V38.8621H16.4138H19.6207V35.6552ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM61.3103 77.3448H58.1034V80.5517H61.3103V77.3448ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM29.2414 90.1724H32.4483V93.3793H29.2414V90.1724Z" fill="#1C1B22"/> +-<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/> +-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/> +-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/> +-<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/> +-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/> +-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/> +-<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/> +-<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/> +-<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/> +-<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/> +-<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/> +-<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/> +-<defs> +-<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.13" stop-color="#9356F4"/> +-<stop offset="0.29" stop-color="#8951E5"/> +-<stop offset="0.46" stop-color="#7A49CD"/> +-<stop offset="0.64" stop-color="#643DAB"/> +-<stop offset="0.82" stop-color="#492E81"/> +-<stop offset="1" stop-color="#291D4F"/> +-</linearGradient> +-<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.65" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)"> +-<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/> +-<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/> +-<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/> +-<stop offset="0.94" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)"> +-<stop offset="0.18" stop-color="#9658F9"/> +-<stop offset="0.33" stop-color="#7E48EA"/> +-<stop offset="0.37" stop-color="#7542E5"/> +-<stop offset="0.41" stop-color="#6A3DD0"/> +-<stop offset="0.48" stop-color="#5332A2"/> +-<stop offset="0.56" stop-color="#41297E"/> +-<stop offset="0.63" stop-color="#342264"/> +-<stop offset="0.69" stop-color="#2C1E54"/> +-<stop offset="0.74" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)"> +-<stop offset="0.07" stop-color="#9358FC"/> +-<stop offset="0.13" stop-color="#9857F8"/> +-<stop offset="0.21" stop-color="#A755EB"/> +-<stop offset="0.3" stop-color="#BF52D7"/> +-<stop offset="0.39" stop-color="#E14EBA"/> +-<stop offset="0.42" stop-color="#EF4CAF"/> +-<stop offset="0.74" stop-color="#FF7583"/> +-<stop offset="0.97" stop-color="#FFB753"/> +-</radialGradient> +-<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)"> +-<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/> +-<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/> +-<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/> +-<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/> +-<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/> +-<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/> +-</radialGradient> +-<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)"> +-<stop offset="0.03" stop-color="#9658F9"/> +-<stop offset="0.62" stop-color="#7542E5"/> +-<stop offset="0.72" stop-color="#6339C2"/> +-<stop offset="0.93" stop-color="#37246B"/> +-<stop offset="1" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)"> +-<stop offset="0.2" stop-color="#AB71FF"/> +-<stop offset="0.29" stop-color="#A46BFC"/> +-<stop offset="0.41" stop-color="#9059F2"/> +-<stop offset="0.54" stop-color="#7542E5"/> +-<stop offset="0.64" stop-color="#6239BF"/> +-<stop offset="0.94" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)"> +-<stop offset="0.09" stop-color="#9658F9"/> +-<stop offset="0.14" stop-color="#8C51F3"/> +-<stop offset="0.26" stop-color="#7542E5"/> +-<stop offset="0.29" stop-color="#6E3ED6"/> +-<stop offset="0.4" stop-color="#5533A6"/> +-<stop offset="0.5" stop-color="#422980"/> +-<stop offset="0.59" stop-color="#342365"/> +-<stop offset="0.67" stop-color="#2C1E55"/> +-<stop offset="0.74" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.12" stop-color="#9155F6"/> +-<stop offset="0.25" stop-color="#834CEE"/> +-<stop offset="0.34" stop-color="#7542E5"/> +-<stop offset="0.78" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)"> +-<stop offset="0.19" stop-color="#9658F9"/> +-<stop offset="0.49" stop-color="#834BED"/> +-<stop offset="0.66" stop-color="#7542E5"/> +-<stop offset="0.7" stop-color="#6B3DD2"/> +-<stop offset="0.79" stop-color="#52319F"/> +-<stop offset="0.91" stop-color="#291D4F"/> +-</radialGradient> +-<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse"> +-<stop stop-color="#9059FF" stop-opacity="0.9"/> +-<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/> +-</linearGradient> +-</defs> +-</svg> +diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg +deleted file mode 100644 +index 2217ca055c..0000000000 +--- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg ++++ /dev/null +@@ -1,114 +0,0 @@ +-<!-- 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/. --> +-<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg"> +-<rect width="113" height="113" rx="4" fill="white"/> +-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM70.931 10H67.7241V13.2069H64.5172V10H61.3103H58.1034V13.2069H54.8966V10H51.6897H48.4828H45.2759H42.069H38.8621V13.2069H35.6552V16.4138V19.6207H38.8621V22.8276H42.069V26.0345H38.8621H35.6552V29.2414V32.4483H38.8621V35.6552H35.6552V38.8621V42.069H32.4483V38.8621V35.6552H29.2414H26.0345V38.8621H22.8276H19.6207H16.4138V35.6552H13.2069V38.8621H10V42.069V45.2759V48.4828V51.6897V54.8966V58.1034V61.3103V64.5172V67.7241V70.931H13.2069V74.1379V77.3448H10V80.5517V83.7586H13.2069V86.9655H10V90.1724H13.2069V93.3793H10V96.5862V99.7931H13.2069V103H16.4138V99.7931V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931H29.2414H32.4483V103H35.6552H38.8621H42.069H45.2759V99.7931V96.5862H48.4828H51.6897V99.7931H48.4828V103H51.6897H54.8966H58.1034V99.7931V96.5862V93.3793V90.1724H54.8966V86.9655H51.6897V90.1724H48.4828H45.2759V86.9655H48.4828V83.7586H45.2759V80.5517H48.4828H51.6897H54.8966V83.7586H58.1034V80.5517H61.3103V83.7586H64.5172V80.5517H61.3103V77.3448V74.1379H64.5172H67.7241H70.931V77.3448H67.7241V80.5517V83.7586V86.9655V90.1724V93.3793V96.5862H70.931V99.7931H67.7241V103H70.931H74.1379V99.7931V96.5862H70.931V93.3793V90.1724V86.9655H74.1379V90.1724H77.3448V86.9655V83.7586V80.5517V77.3448H80.5517H83.7586H86.9655H90.1724V74.1379V70.931V67.7241H86.9655V70.931V74.1379H83.7586H80.5517V70.931H83.7586V67.7241H80.5517V64.5172H83.7586H86.9655V61.3103H90.1724V64.5172H93.3793H96.5862V67.7241H99.7931H103V64.5172H99.7931H96.5862V61.3103V58.1034H99.7931V61.3103H103V58.1034H99.7931V54.8966H103V51.6897H99.7931V48.4828H103V45.2759V42.069V38.8621H99.7931H96.5862H93.3793V42.069H90.1724H86.9655V45.2759V48.4828H83.7586H80.5517V51.6897H77.3448V48.4828H74.1379V51.6897H70.931V54.8966V58.1034H74.1379V61.3103H70.931V64.5172V67.7241H74.1379V64.5172H77.3448V67.7241V70.931H74.1379H70.931H67.7241H64.5172H61.3103H58.1034V74.1379H54.8966V70.931H51.6897V74.1379H54.8966V77.3448H51.6897H48.4828V74.1379V70.931H45.2759V74.1379H42.069H38.8621H35.6552H32.4483H29.2414V70.931V67.7241V64.5172H26.0345H22.8276V67.7241H19.6207H16.4138V70.931H13.2069V67.7241V64.5172H16.4138V61.3103V58.1034H13.2069V54.8966V51.6897V48.4828H16.4138V45.2759H13.2069V42.069H16.4138H19.6207V45.2759H22.8276V42.069H26.0345H29.2414H32.4483V45.2759V48.4828H35.6552H38.8621V51.6897H42.069V48.4828V45.2759H45.2759V42.069H42.069V38.8621H45.2759V35.6552H48.4828V32.4483H51.6897V35.6552V38.8621V42.069H54.8966H58.1034H61.3103V38.8621H58.1034V35.6552H61.3103V32.4483H64.5172V29.2414H67.7241V32.4483H70.931V35.6552H74.1379H77.3448V38.8621H80.5517H83.7586H86.9655H90.1724V35.6552H86.9655H83.7586H80.5517H77.3448V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V19.6207H74.1379V16.4138H77.3448V13.2069H74.1379V16.4138H70.931V13.2069V10ZM70.931 26.0345V22.8276H67.7241V19.6207H64.5172V16.4138H61.3103H58.1034H54.8966V19.6207H58.1034H61.3103V22.8276H64.5172H67.7241V26.0345H70.931ZM70.931 26.0345V29.2414V32.4483H74.1379V29.2414V26.0345H70.931ZM64.5172 29.2414V26.0345H61.3103H58.1034V29.2414V32.4483H61.3103V29.2414H64.5172ZM51.6897 29.2414H54.8966V32.4483H51.6897V29.2414ZM51.6897 29.2414V26.0345H48.4828V22.8276H51.6897V19.6207H48.4828H45.2759V16.4138H48.4828V13.2069H45.2759H42.069H38.8621V16.4138H42.069V19.6207V22.8276H45.2759V26.0345V29.2414V32.4483H48.4828V29.2414H51.6897ZM42.069 42.069H38.8621V45.2759H42.069V42.069ZM22.8276 90.1724H19.6207H16.4138V86.9655V83.7586H13.2069V80.5517V77.3448H16.4138V80.5517H19.6207V77.3448H16.4138V74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276V77.3448V80.5517V83.7586H19.6207V86.9655H22.8276V90.1724ZM80.5517 61.3103V64.5172H77.3448V61.3103H80.5517ZM86.9655 58.1034V61.3103H83.7586H80.5517V58.1034H83.7586H86.9655ZM86.9655 58.1034V54.8966H90.1724V58.1034H86.9655ZM80.5517 51.6897V54.8966H83.7586V51.6897H80.5517ZM96.5862 45.2759H99.7931V48.4828H96.5862V45.2759ZM93.3793 45.2759V42.069H96.5862V45.2759H93.3793ZM93.3793 45.2759V48.4828V51.6897H90.1724V48.4828V45.2759H93.3793ZM96.5862 58.1034V54.8966H93.3793V58.1034H96.5862ZM77.3448 77.3448V74.1379H74.1379V77.3448H77.3448ZM45.2759 83.7586V86.9655H42.069V83.7586H45.2759ZM32.4483 96.5862H29.2414H26.0345V99.7931H22.8276V96.5862V93.3793V90.1724H26.0345V93.3793H29.2414V90.1724H32.4483H35.6552H38.8621H42.069H45.2759V93.3793H42.069H38.8621H35.6552H32.4483V96.5862ZM51.6897 90.1724V93.3793V96.5862H54.8966V93.3793V90.1724H51.6897ZM32.4483 96.5862V99.7931H35.6552V96.5862H32.4483ZM42.069 38.8621H38.8621V35.6552H42.069V38.8621ZM38.8621 32.4483V29.2414H42.069V32.4483H38.8621ZM64.5172 38.8621V42.069H67.7241V38.8621V35.6552H64.5172V38.8621ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM83.7586 42.069H80.5517V45.2759H83.7586V42.069ZM74.1379 42.069H70.931V45.2759H74.1379V42.069ZM29.2414 45.2759H26.0345V48.4828V51.6897H22.8276V48.4828H19.6207V51.6897H16.4138V54.8966H19.6207V51.6897H22.8276V54.8966V58.1034H19.6207V61.3103H22.8276V58.1034H26.0345V61.3103H29.2414V58.1034H32.4483H35.6552V61.3103H32.4483V64.5172V67.7241H35.6552V70.931H38.8621V67.7241V64.5172H35.6552V61.3103H38.8621V58.1034V54.8966H35.6552H32.4483V51.6897H29.2414V48.4828V45.2759ZM29.2414 51.6897V54.8966V58.1034H26.0345V54.8966V51.6897H29.2414ZM96.5862 70.931H93.3793V74.1379H96.5862V77.3448H99.7931H103V74.1379H99.7931H96.5862V70.931ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM70.931 80.5517H74.1379V83.7586H70.931V80.5517ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM64.5172 90.1724H61.3103V93.3793V96.5862V99.7931V103H64.5172V99.7931V96.5862V93.3793V90.1724Z" fill="#1C1B22"/> +-<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/> +-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/> +-<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/> +-<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/> +-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/> +-<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/> +-<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/> +-<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/> +-<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/> +-<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/> +-<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/> +-<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/> +-<defs> +-<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.13" stop-color="#9356F4"/> +-<stop offset="0.29" stop-color="#8951E5"/> +-<stop offset="0.46" stop-color="#7A49CD"/> +-<stop offset="0.64" stop-color="#643DAB"/> +-<stop offset="0.82" stop-color="#492E81"/> +-<stop offset="1" stop-color="#291D4F"/> +-</linearGradient> +-<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.65" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)"> +-<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/> +-<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/> +-<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/> +-<stop offset="0.94" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)"> +-<stop offset="0.18" stop-color="#9658F9"/> +-<stop offset="0.33" stop-color="#7E48EA"/> +-<stop offset="0.37" stop-color="#7542E5"/> +-<stop offset="0.41" stop-color="#6A3DD0"/> +-<stop offset="0.48" stop-color="#5332A2"/> +-<stop offset="0.56" stop-color="#41297E"/> +-<stop offset="0.63" stop-color="#342264"/> +-<stop offset="0.69" stop-color="#2C1E54"/> +-<stop offset="0.74" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)"> +-<stop offset="0.07" stop-color="#9358FC"/> +-<stop offset="0.13" stop-color="#9857F8"/> +-<stop offset="0.21" stop-color="#A755EB"/> +-<stop offset="0.3" stop-color="#BF52D7"/> +-<stop offset="0.39" stop-color="#E14EBA"/> +-<stop offset="0.42" stop-color="#EF4CAF"/> +-<stop offset="0.74" stop-color="#FF7583"/> +-<stop offset="0.97" stop-color="#FFB753"/> +-</radialGradient> +-<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)"> +-<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/> +-<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/> +-<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/> +-<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/> +-<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/> +-<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/> +-</radialGradient> +-<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)"> +-<stop offset="0.03" stop-color="#9658F9"/> +-<stop offset="0.62" stop-color="#7542E5"/> +-<stop offset="0.72" stop-color="#6339C2"/> +-<stop offset="0.93" stop-color="#37246B"/> +-<stop offset="1" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)"> +-<stop offset="0.2" stop-color="#AB71FF"/> +-<stop offset="0.29" stop-color="#A46BFC"/> +-<stop offset="0.41" stop-color="#9059F2"/> +-<stop offset="0.54" stop-color="#7542E5"/> +-<stop offset="0.64" stop-color="#6239BF"/> +-<stop offset="0.94" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)"> +-<stop offset="0.09" stop-color="#9658F9"/> +-<stop offset="0.14" stop-color="#8C51F3"/> +-<stop offset="0.26" stop-color="#7542E5"/> +-<stop offset="0.29" stop-color="#6E3ED6"/> +-<stop offset="0.4" stop-color="#5533A6"/> +-<stop offset="0.5" stop-color="#422980"/> +-<stop offset="0.59" stop-color="#342365"/> +-<stop offset="0.67" stop-color="#2C1E55"/> +-<stop offset="0.74" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)"> +-<stop stop-color="#9658F9"/> +-<stop offset="0.12" stop-color="#9155F6"/> +-<stop offset="0.25" stop-color="#834CEE"/> +-<stop offset="0.34" stop-color="#7542E5"/> +-<stop offset="0.78" stop-color="#291D4F"/> +-</radialGradient> +-<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)"> +-<stop offset="0.19" stop-color="#9658F9"/> +-<stop offset="0.49" stop-color="#834BED"/> +-<stop offset="0.66" stop-color="#7542E5"/> +-<stop offset="0.7" stop-color="#6B3DD2"/> +-<stop offset="0.79" stop-color="#52319F"/> +-<stop offset="0.91" stop-color="#291D4F"/> +-</radialGradient> +-<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse"> +-<stop stop-color="#9059FF" stop-opacity="0.9"/> +-<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/> +-</linearGradient> +-</defs> +-</svg> +-- +2.36.0 diff --git a/browser/app/permissions b/browser/app/permissions index 991284081d..888cc811ce 100644 @@ -291,67 +1018,6 @@ index 1b29e8d..6f7566c 100644 ## Firefox Account - Signed in sync-profile-picture = -diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml -index 5b0709e..38ea275 100644 ---- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml -+++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml -@@ -89,19 +89,6 @@ - <ul class="features-list"> - </ul> - </div> -- -- <footer> -- <img class="dev-edition-logo" -- src="chrome://devtools-startup/content/aboutdevtools/images/dev-edition-logo.svg" -- alt="" /> -- <div class="footer-message"> -- <h1 class="footer-message-title" data-l10n-id="footer-title"></h1> -- <p data-l10n-id="footer-message"></p> -- <a class="external footer-link" -- href="https://www.mozilla.org/firefox/developer/" -- target="_blank" data-l10n-id="footer-learn-more-link"></a> -- </div> -- </footer> - </div> - - </body> -diff --git a/devtools/startup/locales/en-US/aboutDevTools.ftl b/devtools/startup/locales/en-US/aboutDevTools.ftl -index db2146d..e02ab58 100644 ---- a/devtools/startup/locales/en-US/aboutDevTools.ftl -+++ b/devtools/startup/locales/en-US/aboutDevTools.ftl -@@ -3,18 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - head-title = About Developer Tools --enable-title = Enable Firefox Developer Tools --enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element -+enable-title = Enable Iceweasel Developer Tools -+enable-inspect-element-title = Enable Iceweasel Developer Tools to use Inspect Element - enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector. --enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools. -+enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Iceweasel Developer Tools. - enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab. - enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger. --enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser. -+enable-common-message = Iceweasel Developer Tools are disabled by default to give you more control over your browser. - enable-learn-more-link = Learn more about Developer Tools - enable-enable-button = Enable Developer Tools - enable-close-button = Close this Tab - --welcome-title = Welcome to Firefox Developer Tools! -+welcome-title = Welcome to Iceweasel Developer Tools! - newsletter-title = Mozilla Developer Newsletter - newsletter-message = Get developer news, tricks and resources sent straight to your inbox. - newsletter-email-placeholder = -@@ -24,8 +24,6 @@ newsletter-subscribe-button = Subscribe - newsletter-thanks-title = Thanks! - newsletter-thanks-message = If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us. - --footer-title = Firefox Developer Edition --footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows. - footer-learn-more-link = Learn more - - features-learn-more = Learn more diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl index edd871b..77870fe 100644 --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index a349c661d..d0b4b06d4 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -60,7 +60,7 @@ pkgname=iceweasel epoch=1 -pkgver=99.0.1 +pkgver=100.0 pkgrel=1 pkgrel+=.parabola1 _brandingver=98.0-1 @@ -72,7 +72,7 @@ url="https://wiki.parabola.nu/Iceweasel" depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack nodejs cbindgen nasm - python-setuptools python-psutil python-zstandard lld dump_syms + python-setuptools python-zstandard lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi) makedepends+=(quilt libxslt imagemagick git jq python-jsonschema) makedepends_i686=(gcc10) @@ -98,15 +98,15 @@ source_armv7h=(build-arm-libopus.patch) source_i686=('avoid-libxul-OOM-python-check.patch' 'rust-static-disable-network-test-on-static-libraries.patch' 'firefox-99.0.1-fdlibm-double.patch') -sha256sums=('76d22279ce99588a728bb2d034064be0d5918b5900631f2148d4565b8a72e00b' +sha256sums=('664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') sha256sums+=('f3e89499909b172476e931d9ab18b856d0001e3042b3816d1728809536179768' 'SKIP' - 'af53bd22378cd87c27438c34dc1daf3f1909735e85c914b56440751a9dc16856' + '0bfffc020a5fba0895c40f79bd613c1e2504bf24239dfbc04474f6263fd0e834' 'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b' 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1' - '0471c2f625ed8e76833bc7c15dfab23e613600f4ee1abe5e81047237644eea95' + '71c098c5b7d62babf2296d55d43a7bc9f2ca10da9ee77552f9afa01b78541522' '9386f1c50506cd20ab6d212335d5e4417faeb2aea371dd46f2d107d171e80b83' 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d') sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9') @@ -471,7 +471,7 @@ build() { export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="$srcdir/mozbuild" # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # LTO needs more open files ulimit -n 4096 |