tor-commits September 2024

tor-commits@lists.torproject.org

1 participants
250 discussions

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 42831: Remove the shopping components.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ee9a53d8 by Henry Wilkes at 2024-09-18T20:12:06+00:00 Bug 42831: Remove the shopping components. - - - - - 12 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - toolkit/components/shopping/jar.mn - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -613,8 +613,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); ===================================== browser/base/content/browser.js ===================================== @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4340,10 +4340,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { ===================================== browser/base/content/browser.js.globals ===================================== @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", ===================================== browser/base/content/browser.xhtml ===================================== @@ -127,7 +127,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -380,6 +380,8 @@ <image class="urlbar-icon" id="translations-button-circle-arrows" /> <html:span id="translations-button-locale" aria-hidden="true" /> </hbox> +  <hbox id="shopping-sidebar-button" class="urlbar-page-action" role="button" ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", - ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs", + // Removed ShoppingUtils. tor-browser#42831. SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", @@ -481,19 +481,7 @@ let JSWINDOWACTORS = { matches: ["about:tabcrashed*"], }, - AboutWelcomeShopping: { - parent: { - esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs", - events: { - Update: {}, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed AboutWelcomeShopping. tor-browser#42831. AboutWelcome: { parent: { @@ -890,27 +878,7 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ShoppingSidebar: { - parent: { - esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs", - events: { - ContentReady: { wantUntrusted: true }, - PolledRequestMade: { wantUntrusted: true }, - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - ReportProductAvailable: { wantUntrusted: true }, - AdClicked: { wantUntrusted: true }, - AdImpression: { wantUntrusted: true }, - DisableShopping: { wantUntrusted: true }, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed ShoppingSidebar. tor-browser#42831. SpeechDispatcher: { parent: { @@ -2276,7 +2244,6 @@ BrowserGlue.prototype = { } }, () => lazy.RFPHelper.uninit(), - () => lazy.ShoppingUtils.uninit(), () => { if (AppConstants.MOZ_UPDATER) { lazy.UpdateListener.reset(); @@ -3234,13 +3201,6 @@ BrowserGlue.prototype = { }, }, - { - name: "ShoppingUtils.init", - task: () => { - lazy.ShoppingUtils.init(); - }, - }, - { // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already. name: "start-orb-javascript-oracle", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -96,12 +96,7 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, + // Removed about:shoppingsidebar. tor-browser#42831. {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== browser/components/about/components.conf ===================================== @@ -24,7 +24,7 @@ pages = [ 'rights', 'sessionrestore', 'settings', - 'shoppingsidebar', + # Removed 'shoppingsidebar'. tor-browser#42831. 'tabcrashed', 'unloads', 'welcome', ===================================== browser/components/shopping/jar.mn ===================================== @@ -2,30 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -browser.jar: - content/browser/shopping/onboarding.mjs (content/onboarding.mjs) - content/browser/shopping/shopping.html (content/shopping.html) - content/browser/shopping/shopping-container.css (content/shopping-container.css) - content/browser/shopping/shopping-page.css (content/shopping-page.css) - content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js) - content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css) - content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs) - content/browser/shopping/highlights.mjs (content/highlights.mjs) - content/browser/shopping/highlight-item.css (content/highlight-item.css) - content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs) - content/browser/shopping/shopping-card.css (content/shopping-card.css) - content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs) - content/browser/shopping/letter-grade.css (content/letter-grade.css) - content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs) - content/browser/shopping/settings.mjs (content/settings.mjs) - content/browser/shopping/settings.css (content/settings.css) - content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs) - content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs) - content/browser/shopping/reliability.mjs (content/reliability.mjs) - content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css) - content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs) - content/browser/shopping/unanalyzed.css (content/unanalyzed.css) - content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs) - content/browser/shopping/recommended-ad.css (content/recommended-ad.css) - content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs) - content/browser/shopping/assets/ (content/assets/*) +# Removed desktop shopping-sidebar content. tor-browser#42831. ===================================== browser/components/shopping/moz.build ===================================== @@ -6,14 +6,8 @@ JAR_MANIFESTS += ["jar.mn"] -FINAL_TARGET_FILES.actors += [ - "ShoppingSidebarChild.sys.mjs", - "ShoppingSidebarParent.sys.mjs", -] - -EXTRA_JS_MODULES += [ - "ShoppingUtils.sys.mjs", -] +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils. +# tor-browser#42831. BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] ===================================== toolkit/components/shopping/jar.mn ===================================== @@ -2,19 +2,4 @@ # 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/. -toolkit.jar: - content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs) - content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs) - content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs) - content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json) - content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json) - content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json) - content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json) - content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json) - content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json) - content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json) - content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json) - content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json) - content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json) - content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json) - content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json) +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831. ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -216,21 +216,7 @@ export let RemotePageAccessManager = { ], RPMRecordTelemetryEvent: ["*"], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.autoOpen.userEnabled", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - }, + // Removed about:shoppingsidebar. tor-browser#42831. "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ee9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ee9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] Bug 42831: Remove the shopping components.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a02c5383 by Henry Wilkes at 2024-09-18T20:10:20+00:00 Bug 42831: Remove the shopping components. - - - - - 12 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - toolkit/components/shopping/jar.mn - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -613,8 +613,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); ===================================== browser/base/content/browser.js ===================================== @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -71,8 +71,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4338,10 +4338,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { ===================================== browser/base/content/browser.js.globals ===================================== @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", ===================================== browser/base/content/browser.xhtml ===================================== @@ -127,7 +127,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -380,6 +380,8 @@ <image class="urlbar-icon" id="translations-button-circle-arrows" /> <html:span id="translations-button-locale" aria-hidden="true" /> </hbox> +  <hbox id="shopping-sidebar-button" class="urlbar-page-action" role="button" ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", - ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs", + // Removed ShoppingUtils. tor-browser#42831. SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", @@ -500,19 +500,7 @@ let JSWINDOWACTORS = { matches: ["about:tabcrashed*"], }, - AboutWelcomeShopping: { - parent: { - esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs", - events: { - Update: {}, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed AboutWelcomeShopping. tor-browser#42831. AboutWelcome: { parent: { @@ -909,27 +897,7 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ShoppingSidebar: { - parent: { - esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs", - events: { - ContentReady: { wantUntrusted: true }, - PolledRequestMade: { wantUntrusted: true }, - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - ReportProductAvailable: { wantUntrusted: true }, - AdClicked: { wantUntrusted: true }, - AdImpression: { wantUntrusted: true }, - DisableShopping: { wantUntrusted: true }, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed ShoppingSidebar. tor-browser#42831. SpeechDispatcher: { parent: { @@ -2295,7 +2263,6 @@ BrowserGlue.prototype = { } }, () => lazy.RFPHelper.uninit(), - () => lazy.ShoppingUtils.uninit(), () => { if (AppConstants.MOZ_UPDATER) { lazy.UpdateListener.reset(); @@ -3253,13 +3220,6 @@ BrowserGlue.prototype = { }, }, - { - name: "ShoppingUtils.init", - task: () => { - lazy.ShoppingUtils.init(); - }, - }, - { // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already. name: "start-orb-javascript-oracle", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -92,12 +92,7 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, + // Removed about:shoppingsidebar. tor-browser#42831. {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== browser/components/about/components.conf ===================================== @@ -26,7 +26,7 @@ pages = [ 'robots', 'sessionrestore', 'settings', - 'shoppingsidebar', + # Removed 'shoppingsidebar'. tor-browser#42831. 'tabcrashed', 'unloads', 'welcome', ===================================== browser/components/shopping/jar.mn ===================================== @@ -2,30 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -browser.jar: - content/browser/shopping/onboarding.mjs (content/onboarding.mjs) - content/browser/shopping/shopping.html (content/shopping.html) - content/browser/shopping/shopping-container.css (content/shopping-container.css) - content/browser/shopping/shopping-page.css (content/shopping-page.css) - content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js) - content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css) - content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs) - content/browser/shopping/highlights.mjs (content/highlights.mjs) - content/browser/shopping/highlight-item.css (content/highlight-item.css) - content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs) - content/browser/shopping/shopping-card.css (content/shopping-card.css) - content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs) - content/browser/shopping/letter-grade.css (content/letter-grade.css) - content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs) - content/browser/shopping/settings.mjs (content/settings.mjs) - content/browser/shopping/settings.css (content/settings.css) - content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs) - content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs) - content/browser/shopping/reliability.mjs (content/reliability.mjs) - content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css) - content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs) - content/browser/shopping/unanalyzed.css (content/unanalyzed.css) - content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs) - content/browser/shopping/recommended-ad.css (content/recommended-ad.css) - content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs) - content/browser/shopping/assets/ (content/assets/*) +# Removed desktop shopping-sidebar content. tor-browser#42831. ===================================== browser/components/shopping/moz.build ===================================== @@ -6,14 +6,8 @@ JAR_MANIFESTS += ["jar.mn"] -FINAL_TARGET_FILES.actors += [ - "ShoppingSidebarChild.sys.mjs", - "ShoppingSidebarParent.sys.mjs", -] - -EXTRA_JS_MODULES += [ - "ShoppingUtils.sys.mjs", -] +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils. +# tor-browser#42831. BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] ===================================== toolkit/components/shopping/jar.mn ===================================== @@ -2,19 +2,4 @@ # 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/. -toolkit.jar: - content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs) - content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs) - content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs) - content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json) - content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json) - content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json) - content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json) - content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json) - content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json) - content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json) - content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json) - content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json) - content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json) - content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json) - content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json) +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831. ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -216,21 +216,7 @@ export let RemotePageAccessManager = { ], RPMRecordTelemetryEvent: ["*"], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.autoOpen.userEnabled", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - }, + // Removed about:shoppingsidebar. tor-browser#42831. "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a02c538… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a02c538… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] Bug 42831: Remove the shopping components.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a3e97048 by Henry Wilkes at 2024-09-18T20:02:56+00:00 Bug 42831: Remove the shopping components. - - - - - 12 changed files: - browser/base/content/browser-init.js - browser/base/content/browser.js - browser/base/content/browser.js.globals - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - toolkit/components/shopping/jar.mn - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== browser/base/content/browser-init.js ===================================== @@ -621,8 +621,6 @@ var gBrowserInit = { CaptivePortalWatcher.delayedStartup(); - ShoppingSidebarManager.ensureInitialized(); - SessionStore.promiseAllWindowsRestored.then(() => { this._schedulePerWindowIdleTasks(); document.documentElement.setAttribute("sessionrestored", "true"); ===================================== browser/base/content/browser.js ===================================== @@ -39,7 +39,7 @@ ChromeUtils.defineESModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs", HomePage: "resource:///modules/HomePage.sys.mjs", - isProductURL: "chrome://global/content/shopping/ShoppingProduct.mjs", + // Removed isProductURL from ShoppingProduct.mjs. tor-browser#42831. LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.sys.mjs", LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs", @@ -72,8 +72,8 @@ ChromeUtils.defineESModuleGetters(this, { SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs", SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", - ShoppingSidebarParent: "resource:///actors/ShoppingSidebarParent.sys.mjs", - ShoppingSidebarManager: "resource:///actors/ShoppingSidebarParent.sys.mjs", + // Removed ShoppingSidebarParent and ShoppingSidebarManager. + // tor-browser#42831. ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs", SitePermissions: "resource:///modules/SitePermissions.sys.mjs", @@ -4382,10 +4382,6 @@ var TabsProgressListener = { return; } - // Some shops use pushState to move between individual products, so - // the shopping code needs to be told about all of these. - ShoppingSidebarManager.onLocationChange(aBrowser, aLocationURI, aFlags); - // Filter out location changes caused by anchor navigation // or history.push/pop/replaceState. if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) { ===================================== browser/base/content/browser.js.globals ===================================== @@ -130,7 +130,6 @@ "E10SUtils", "ExtensionsUI", "HomePage", - "isProductURL", "LightweightThemeConsumer", "LoginHelper", "LoginManagerParent", @@ -161,8 +160,6 @@ "SearchUIUtils", "SessionStartup", "SessionStore", - "ShoppingSidebarParent", - "ShoppingSidebarManager", "ShortcutUtils", "SiteDataManager", "SitePermissions", ===================================== browser/base/content/browser.xhtml ===================================== @@ -131,7 +131,7 @@ Services.scriptloader.loadSubScript("chrome://browser/content/places/places-menupopup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); + // Removed shopping-sidebar.js. tor-browser#42831. Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -398,6 +398,8 @@ <image class="urlbar-icon" id="translations-button-circle-arrows" /> <html:span id="translations-button-locale" aria-hidden="true" /> </hbox> +  <hbox id="shopping-sidebar-button" class="urlbar-page-action" role="button" ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -86,7 +86,7 @@ ChromeUtils.defineESModuleGetters(lazy, { SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs", ShellService: "resource:///modules/ShellService.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", - ShoppingUtils: "resource:///modules/ShoppingUtils.sys.mjs", + // Removed ShoppingUtils. tor-browser#42831. SpecialMessageActions: "resource://messaging-system/lib/SpecialMessageActions.sys.mjs", TRRRacer: "resource:///modules/TRRPerformance.sys.mjs", @@ -522,19 +522,7 @@ let JSWINDOWACTORS = { matches: ["about:tor"], }, - AboutWelcomeShopping: { - parent: { - esModuleURI: "resource:///actors/AboutWelcomeParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/AboutWelcomeChild.sys.mjs", - events: { - Update: {}, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed AboutWelcomeShopping. tor-browser#42831. AboutWelcome: { parent: { @@ -975,27 +963,7 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ShoppingSidebar: { - parent: { - esModuleURI: "resource:///actors/ShoppingSidebarParent.sys.mjs", - }, - child: { - esModuleURI: "resource:///actors/ShoppingSidebarChild.sys.mjs", - events: { - ContentReady: { wantUntrusted: true }, - PolledRequestMade: { wantUntrusted: true }, - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - ReportProductAvailable: { wantUntrusted: true }, - AdClicked: { wantUntrusted: true }, - AdImpression: { wantUntrusted: true }, - DisableShopping: { wantUntrusted: true }, - }, - }, - matches: ["about:shoppingsidebar"], - remoteTypes: ["privilegedabout"], - }, + // Removed ShoppingSidebar. tor-browser#42831. SpeechDispatcher: { parent: { @@ -2386,7 +2354,6 @@ BrowserGlue.prototype = { } }, () => lazy.RFPHelper.uninit(), - () => lazy.ShoppingUtils.uninit(), () => { if (AppConstants.MOZ_UPDATER) { lazy.UpdateListener.reset(); @@ -3369,13 +3336,6 @@ BrowserGlue.prototype = { }, }, - { - name: "ShoppingUtils.init", - task: () => { - lazy.ShoppingUtils.init(); - }, - }, - { // Starts the JSOracle process for ORB JavaScript validation, if it hasn't started already. name: "start-orb-javascript-oracle", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -102,12 +102,7 @@ static const RedirEntry kRedirMap[] = { {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"shoppingsidebar", "chrome://browser/content/shopping/shopping.html", - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT | - nsIAboutModule::IS_SECURE_CHROME_UI}, + // Removed about:shoppingsidebar. tor-browser#42831. {"tabcrashed", "chrome://browser/content/aboutTabCrashed.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== browser/components/about/components.conf ===================================== @@ -28,7 +28,7 @@ pages = [ 'rulesets', 'sessionrestore', 'settings', - 'shoppingsidebar', + # Removed 'shoppingsidebar'. tor-browser#42831. 'tabcrashed', 'unloads', 'welcome', ===================================== browser/components/shopping/jar.mn ===================================== @@ -2,30 +2,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -browser.jar: - content/browser/shopping/onboarding.mjs (content/onboarding.mjs) - content/browser/shopping/shopping.html (content/shopping.html) - content/browser/shopping/shopping-container.css (content/shopping-container.css) - content/browser/shopping/shopping-page.css (content/shopping-page.css) - content/browser/shopping/shopping-sidebar.js (content/shopping-sidebar.js) - content/browser/shopping/shopping-message-bar.css (content/shopping-message-bar.css) - content/browser/shopping/shopping-message-bar.mjs (content/shopping-message-bar.mjs) - content/browser/shopping/highlights.mjs (content/highlights.mjs) - content/browser/shopping/highlight-item.css (content/highlight-item.css) - content/browser/shopping/highlight-item.mjs (content/highlight-item.mjs) - content/browser/shopping/shopping-card.css (content/shopping-card.css) - content/browser/shopping/shopping-card.mjs (content/shopping-card.mjs) - content/browser/shopping/letter-grade.css (content/letter-grade.css) - content/browser/shopping/letter-grade.mjs (content/letter-grade.mjs) - content/browser/shopping/settings.mjs (content/settings.mjs) - content/browser/shopping/settings.css (content/settings.css) - content/browser/shopping/shopping-container.mjs (content/shopping-container.mjs) - content/browser/shopping/adjusted-rating.mjs (content/adjusted-rating.mjs) - content/browser/shopping/reliability.mjs (content/reliability.mjs) - content/browser/shopping/analysis-explainer.css (content/analysis-explainer.css) - content/browser/shopping/analysis-explainer.mjs (content/analysis-explainer.mjs) - content/browser/shopping/unanalyzed.css (content/unanalyzed.css) - content/browser/shopping/unanalyzed.mjs (content/unanalyzed.mjs) - content/browser/shopping/recommended-ad.css (content/recommended-ad.css) - content/browser/shopping/recommended-ad.mjs (content/recommended-ad.mjs) - content/browser/shopping/assets/ (content/assets/*) +# Removed desktop shopping-sidebar content. tor-browser#42831. ===================================== browser/components/shopping/moz.build ===================================== @@ -6,14 +6,8 @@ JAR_MANIFESTS += ["jar.mn"] -FINAL_TARGET_FILES.actors += [ - "ShoppingSidebarChild.sys.mjs", - "ShoppingSidebarParent.sys.mjs", -] - -EXTRA_JS_MODULES += [ - "ShoppingUtils.sys.mjs", -] +# Removed ShoppingSidebarParent, ShoppingSidebarChild and ShoppingUtils. +# tor-browser#42831. BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] ===================================== toolkit/components/shopping/jar.mn ===================================== @@ -2,19 +2,4 @@ # 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/. -toolkit.jar: - content/global/shopping/ProductConfig.mjs (content/ProductConfig.mjs) - content/global/shopping/ProductValidator.sys.mjs (content/ProductValidator.sys.mjs) - content/global/shopping/ShoppingProduct.mjs (content/ShoppingProduct.mjs) - content/global/shopping/analysis_response.schema.json (schemas/analysis_response.schema.json) - content/global/shopping/recommendations_response.schema.json (schemas/recommendations_response.schema.json) - content/global/shopping/analysis_request.schema.json (schemas/analysis_request.schema.json) - content/global/shopping/recommendations_request.schema.json (schemas/recommendations_request.schema.json) - content/global/shopping/attribution_response.schema.json (schemas/attribution_response.schema.json) - content/global/shopping/attribution_request.schema.json (schemas/attribution_request.schema.json) - content/global/shopping/reporting_response.schema.json (schemas/reporting_response.schema.json) - content/global/shopping/reporting_request.schema.json (schemas/reporting_request.schema.json) - content/global/shopping/analysis_status_request.schema.json (schemas/analysis_status_request.schema.json) - content/global/shopping/analysis_status_response.schema.json (schemas/analysis_status_response.schema.json) - content/global/shopping/analyze_request.schema.json (schemas/analyze_request.schema.json) - content/global/shopping/analyze_response.schema.json (schemas/analyze_response.schema.json) +# Removed ShoppingProduct modules and schema JSONs. tor-browser#42831. ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -231,21 +231,7 @@ export let RemotePageAccessManager = { "rulesets:update-channel", ], }, - "about:shoppingsidebar": { - RPMSetPref: [ - "browser.shopping.experience2023.optedIn", - "browser.shopping.experience2023.active", - "browser.shopping.experience2023.ads.userEnabled", - "browser.shopping.experience2023.sidebarClosedCount", - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - "browser.shopping.experience2023.autoOpen.userEnabled", - ], - RPMGetFormatURLPref: ["app.support.baseURL"], - RPMGetIntPref: ["browser.shopping.experience2023.sidebarClosedCount"], - RPMGetBoolPref: [ - "browser.shopping.experience2023.showKeepSidebarClosedMessage", - ], - }, + // Removed about:shoppingsidebar. tor-browser#42831. "about:tabcrashed": { RPMSendAsyncMessage: ["Load", "closeTab", "restoreTab", "restoreAll"], RPMAddMessageListener: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a3e9704… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a3e9704… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 40009: [android] Change the default search engines
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 74a1ef5e by cypherpunks1 at 2024-09-18T19:15:44+00:00 fixup! Bug 40009: [android] Change the default search engines Bug 43146: Update the icon of DuckDuckGo onion search engine - - - - - 1 changed file: - mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml Changes: ===================================== mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml ===================================== @@ -2,7 +2,7 @@ <ShortName>DuckDuckGo (.onion)</ShortName> <Description>Duck Duck Go Onion</Description> <InputEncoding>UTF-8</InputEncoding> -<Image height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamqJDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> +<Image width="32" height="32">data:image/png;base64,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</Image> <Url type="text/html" method="GET" template="https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/"> <Param name="q" value="{searchTerms}"/> </Url> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/74a1ef5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/74a1ef5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] Bug 43098: Year End Campaign 2024.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 7833a99f by Henry Wilkes at 2024-09-18T18:32:37+00:00 Bug 43098: Year End Campaign 2024. Implements YEC 2024 for about:tor. - - - - - 14 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/AboutTorParent.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/yec-2024-browse.svg - + browser/components/abouttor/content/yec-2024-fonts.css - + browser/components/abouttor/content/yec-2024-heart.svg - + browser/components/abouttor/content/yec-2024-search.svg - + browser/components/abouttor/content/yec-2024-speak.svg - browser/components/abouttor/jar.mn - toolkit/content/license.html - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -515,6 +515,7 @@ let JSWINDOWACTORS = { DOMContentLoaded: {}, L10nMutationsFinished: {}, SubmitSearchOnionize: { wantUntrusted: true }, + YECHidden: { wantUntrusted: true }, }, }, ===================================== browser/components/abouttor/AboutTorChild.sys.mjs ===================================== @@ -22,6 +22,11 @@ export class AboutTorChild extends JSWindowActorChild { new this.contentWindow.CustomEvent("L10nMutationsFinished") ); break; + case "YECHidden": + // YEC 2024 banner was closed. Persist this for the rest of this + // session. See tor-browser#43098 and tor-browser#42188. + this.sendAsyncMessage("AboutTor:HideYEC"); + break; } } } ===================================== browser/components/abouttor/AboutTorParent.sys.mjs ===================================== @@ -7,23 +7,69 @@ ChromeUtils.defineESModuleGetters(lazy, { TorConnect: "resource://gre/modules/TorConnect.sys.mjs", }); +/** + * Whether we should hide the Year end campaign (YEC) 2024 donation banner for + * new about:tor pages. Applied to all future about:tor pages within this + * session (i.e. new tabs, new windows, and after new identity). + * + * Will reset at the next full restart. + * + * See tor-browser#43098 and tor-browser#42188. + * + * @type {boolean} + */ +let hideYEC = AppConstants.MOZ_UPDATE_CHANNEL !== "release"; + +/** + * The YEC 2024 start date. + * + * @type {integer} + */ +const yecStart = Date.UTC(2024, 9, 14, 15); // 2024 October 14th 15:00. + +/** + * The YEC 2024 end date. + * + * @type {integer} + */ +const yecEnd = Date.UTC(2025, 0, 2); // 2025 January 2nd 00:00. + /** * Actor parent class for the about:tor page. */ export class AboutTorParent extends JSWindowActorParent { receiveMessage(message) { const onionizePref = "torbrowser.homepage.search.onionize"; + const yecMessagePref = "torbrowser.homepage.yec2024.message"; + let yecMessageNumber = null; + let now; switch (message.name) { case "AboutTor:GetInitialData": + now = Date.now(); + if (!hideYEC && now >= yecStart && now < yecEnd) { + // Will show the banner. + yecMessageNumber = Services.prefs.getIntPref(yecMessagePref, 0); + // Increase the preference for the next about:tor load. + Services.prefs.setIntPref(yecMessagePref, (yecMessageNumber + 1) % 3); + } return Promise.resolve({ torConnectEnabled: lazy.TorConnect.enabled, messageData: lazy.AboutTorMessage.getNext(), isStable: AppConstants.MOZ_UPDATE_CHANNEL === "release", searchOnionize: Services.prefs.getBoolPref(onionizePref, false), + // Locale for YEC 2024. See tor-browser#43098. + yecMessageNumber, + appLocale: + Services.locale.appLocaleAsBCP47 === "ja-JP-macos" + ? "ja" + : Services.locale.appLocaleAsBCP47, }); case "AboutTor:SetSearchOnionize": Services.prefs.setBoolPref(onionizePref, message.data); break; + case "AboutTor:HideYEC": + hideYEC = true; + break; } return undefined; } ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -235,3 +235,297 @@ body:not(.show-tor-check) #tor-check { color: var(--tor-link-color-light); } } + +/* YEC 2024. + * See tor-browser#43098 */ +body:not([yec-2024-message-number]) #yec-2024-banner { + display: none; +} + +body { + --yec-heading-font-size: 32px; +} + +body[yec-2024-message-number] h1 { + /* Text of heading is still available to screen readers, but it does not + * contribute visually to the page or the body grid layout. */ + position: absolute; + clip-path: inset(50%); +} + +body:not([yec-2024-message-number="0"]) .yec-2024-message-0 { + display: none; +} + +body:not([yec-2024-message-number="1"]) .yec-2024-message-1 { + display: none; +} + +body:not([yec-2024-message-number="2"]) .yec-2024-message-2 { + display: none; +} + +#yec-2024-banner { + grid-area: heading; + border-radius: 8px; + border: 1px solid var(--in-content-box-border-color); + display: grid; + grid-template: + "yec-heading yec-image" auto + "yec-body yec-image" auto + "yec-matching yec-image" auto + "yec-donate yec-image" min-content + / 1fr min-content; + --yec-image-background: #1f0333; + /* Remove 1px from padding for border. */ + padding-block: 55px 55px; + padding-inline: 47px 47px; + box-sizing: border-box; + max-width: 850px; + margin-block-end: 40px; + /* Position for the close button. */ + position: relative; + gap: 0 24px; +} + +.yec-2024-image { + grid-area: yec-image; + align-self: center; + /* Center horizontally for small width layout. */ + justify-self: center; + /* background color and border radius only stands out when using a high + * contrast theme. */ + -moz-context-properties: fill; + fill: var(--yec-image-background); + border-radius: 8px; + height: 216px; + border: 1px solid transparent; + /* Remove border from layout size. */ + margin: -1px; +} + +.yec-2024-heading { + grid-area: yec-heading; + margin-block: 0 32px; + /* We want to draw a background block of color behind the text in the child + * <span> element. If this was en-US only text, we could just set a fixed + * line-height that works. However, this can cause problems for some scripts, + * like Burmese, where the normal line height is larger. + * Instead, in javascript we measure the "normal" line height of the + * .yec-2024-heading element using a copy .yec-2024-heading-measure element. + * The line height is recorded in `--yec-heading-line-height` and we set the + * line-height using this value, plus the amount of padding we would like. */ + --yec-heading-block-padding: calc(0.1 * var(--yec-heading-font-size)); + --yec-heading-inline-padding: calc(0.25 * var(--yec-heading-font-size)); + margin-inline: calc(-1 * var(--yec-heading-inline-padding)); + line-height: calc(var(--yec-heading-line-height) + 4 * var(--yec-heading-block-padding)); +} + +.yec-2024-heading, +.yec-2024-heading-measure { + font-family: "Space Grotesk", sans-serif; + font-size: var(--yec-heading-font-size); + font-weight: 700; +} + +/* Element used to measure the line height for .yec-2024-heading. + * Not visually shown, but should mimic the font size of the corresponding + * .yec-2024-heading. */ +.yec-2024-heading-measure { + position: absolute; + visibility: hidden; + /* Measure a single line height. */ + white-space: nowrap; +} + +.yec-2024-heading > * { + /* Paint a block of color behind the text. + * NOTE: For some scripts, like Burmese, the background of the inline element + * is smaller than the actual script height. + * So in javascript we measure the difference as `--yec-heading-gap-top` and + * `--yec-heading-gap-bottom` and add this to the block padding, so that the + * padding matches the highest and lowest points of the script. */ + border-radius: 2px; + background: transparent; + padding-inline: var(--yec-heading-inline-padding); + padding-block-start: calc( + var(--yec-heading-gap-top) + + var(--yec-heading-block-padding) + ); + padding-block-end: calc( + var(--yec-heading-gap-bottom) + + var(--yec-heading-block-padding) + ); + /* Each line has the padding applied separately. */ + box-decoration-break: clone; +} + +#yec-2024-body { + grid-area: yec-body; + margin-block: 0 8px; +} + +#yec-2024-matching { + grid-area: yec-matching; + font-weight: 600; + margin-block: 0 32px; +} + +#yec-2024-body, #yec-2024-matching { + font-size: 1.2em; +} + +#yec-2024-donate-link { + grid-area: yec-donate; + justify-self: start; + font-weight: 700; + /* Style like a button. */ + color: var(--in-content-button-text-color); + border: 1px solid var(--in-content-button-border-color); + border-radius: 4px; + background-color: var(--in-content-button-background); + padding-block: 12px; + padding-inline: 16px; + text-decoration: none; + display: flex; + align-items: center; + gap: 10px; +} + +#yec-2024-donate-link > * { + flex: 0 0 auto; +} + +#yec-2024-donate-link:hover { + background-color: var(--in-content-button-background-hover); + color: var(--in-content-button-text-color-hover); + border-color: var(--in-content-button-border-color-hover); +} + +#yec-2024-donate-link:hover:active { + background-color: var(--in-content-button-background-active); + color: var(--in-content-button-text-color-active); + border-color: var(--in-content-button-border-color-active); +} + +#yec-2024-close { + position: absolute; + inset-block-start: 16px; + inset-inline-end: 16px; + padding: 8px; + min-width: auto; + min-height: auto; + width: 16px; + height: 16px; + box-sizing: content-box; + /* Transparent background when neither hover nor active. */ + background-color: transparent; + border-color: transparent; +} + +#yec-2024-close:hover { + background-color: var(--in-content-button-background-hover); + border-color: var(--in-content-button-border-color-hover); +} + +#yec-2024-close:hover:active { + background-color: var(--in-content-button-background-active); + border-color: var(--in-content-button-border-color-active); +} + +.yec-2024-icon { + -moz-context-properties: fill; + fill: currentColor; +} + +@media (max-width: 768px) { + body { + --yec-heading-font-size: 1.45rem; + } + + /* Small width layout. */ + #yec-2024-banner { + grid-template: + "yec-image" min-content + "yec-heading" auto + "yec-body" auto + "yec-matching" auto + "yec-donate" min-content + / 1fr; + padding: 31px; + /* Match max-width of the form. */ + max-width: 600px; + margin-block-end: 32px; + } + + .yec-2024-image { + height: 168px; + } + + .yec-2024-heading { + margin-block: 16px 24px; + text-align: center; + /* stylelint-disable-next-line property-no-unknown */ + text-wrap-style: balance; + } + + #yec-2024-body, #yec-2024-matching { + font-size: 1.05em; + } + + #yec-2024-donate-link { + justify-self: center; + } +} + +@media ((prefers-contrast) or (forced-colors)) and (prefers-color-scheme: dark) { + .yec-2024-image { + /* Give the dark image a light border to separate from background. */ + border-color: var(--in-content-box-border-color); + } +} + +@media not ((prefers-contrast) or (forced-colors)) { + #yec-2024-banner { + background-color: var(--yec-image-background); + border-color: transparent; + --acorn-yellow-40: #ffbd4f; + --acorn-yellow-50: #ffa436; + --acorn-yellow-60: #e27f2e; + } + + .yec-2024-heading { + color: var(--color-gray-100); + } + + .yec-2024-heading.yec-2024-message-0 > * { + /* YEC purple */ + background: #d898fa; + } + + .yec-2024-heading.yec-2024-message-1 > * { + /* YEC green */ + background: #c1ed75; + } + + .yec-2024-heading.yec-2024-message-2 > * { + /* YEC red */ + background: #ff6a75; + } + + #yec-2024-donate-link { + --in-content-button-text-color: var(--color-gray-100); + --in-content-button-text-color-hover: var(--color-gray-100); + --in-content-button-text-color-active: var(--color-gray-100); + --in-content-button-background: var(--acorn-yellow-40); + --in-content-button-background-hover: var(--acorn-yellow-50); + --in-content-button-background-active: var(--acorn-yellow-60); + } + + #yec-2024-close { + /* Rules for #yec-2024-close */ + --in-content-button-text-color: var(--color-gray-05); + --in-content-button-text-color-hover: var(--color-gray-05); + --in-content-button-text-color-active: var(--color-gray-05); + } +} ===================================== browser/components/abouttor/content/aboutTor.html ===================================== @@ -4,7 +4,7 @@ <head> <meta http-equiv="Content-Security-Policy" - content="default-src chrome:; object-src 'none'" + content="default-src chrome:; font-src data:; object-src 'none'" /> <title data-l10n-id="newtab-page-title"></title> <link @@ -18,6 +18,10 @@ rel="stylesheet" href="chrome://browser/content/abouttor/aboutTor.css" /> + <link + rel="stylesheet" + href="chrome://browser/content/abouttor/yec-2024-fonts.css" + /> <link rel="localization" href="browser/newtab/newtab.ftl" /> <link rel="localization" href="toolkit/global/tor-browser.ftl" /> @@ -29,6 +33,50 @@ <script src="chrome://browser/content/abouttor/aboutTor.js"></script> </head> <body class="onion-pattern-background"> +  + <article id="yec-2024-banner"> + <img + class="yec-2024-image yec-2024-message-0" + alt="" + src="chrome://browser/content/abouttor/yec-2024-speak.svg" + /> + <img + class="yec-2024-image yec-2024-message-1" + alt="" + src="chrome://browser/content/abouttor/yec-2024-browse.svg" + /> + <img + class="yec-2024-image yec-2024-message-2" + alt="" + src="chrome://browser/content/abouttor/yec-2024-search.svg" + /> + <h2 class="yec-2024-heading yec-2024-message-0"> + <span data-l10n-id="yec-2024-introduction-0"></span> + </h2> + <h2 class="yec-2024-heading yec-2024-message-1"> + <span data-l10n-id="yec-2024-introduction-1"></span> + </h2> + <h2 class="yec-2024-heading yec-2024-message-2"> + <span data-l10n-id="yec-2024-introduction-2"></span> + </h2> + <p id="yec-2024-body" data-l10n-id="yec-2024-please-donate"></p> + <p id="yec-2024-matching" data-l10n-id="yec-2024-matched-donation"></p> + <a id="yec-2024-donate-link"> + <span data-l10n-id="yec-2024-donate-button"></span> + <img + class="yec-2024-icon" + alt="" + src="chrome://browser/content/abouttor/yec-2024-heart.svg" + /> + </a> + <button id="yec-2024-close" data-l10n-id="yec-2024-close-button"> + <img + class="yec-2024-icon" + alt="" + src="chrome://global/skin/icons/close.svg" + /> + </button> + </article> <h1> <img id="tor-browser-logo" ===================================== browser/components/abouttor/content/aboutTor.js ===================================== @@ -190,3 +190,123 @@ window.addEventListener("InitialData", event => { SearchWidget.setOnionizeState(!!searchOnionize); MessageArea.setMessageData(messageData, !!isStable, !!torConnectEnabled); }); + +// YEC 2024 (year end campaign). +// See tor-browser#42072 +const YecWidget = { + _initialized: false, + _locale: null, + + /** + * Initialize the widget. + */ + init() { + this._initialized = true; + + document.getElementById("yec-2024-close").addEventListener("click", () => { + dispatchEvent(new CustomEvent("YECHidden", { bubbles: true })); + this.messageNumber = null; + }); + + // Create mimics of the .yec-2024-heading elements to measure a single line + // and pass on the measurements to be used in CSS. + for (const heading of document.querySelectorAll(".yec-2024-heading")) { + const measureEl = heading.cloneNode(true); + measureEl.classList.add("yec-2024-heading-measure"); + // Remove classes that would style or hide the mimic. + measureEl.classList.remove( + "yec-2024-heading", + "yec-2024-message-0", + "yec-2024-message-1", + "yec-2024-message-2" + ); + measureEl.setAttribute("aria-hidden", "true"); + + const sizeObserver = new ResizeObserver(() => { + // The parent block rect measures the space that the single line + // occupies. + const blockRect = measureEl.getBoundingClientRect(); + // The child span measures the space that the inline element occupies. + // I.e. the space that would be coloured if we set a `background`. This + // may be smaller than the parent block, and not center-aligned if the + // text content contains certain non-ascii characters. E.g. Burmese. + const inlineRect = measureEl.firstElementChild.getBoundingClientRect(); + heading.style.setProperty( + "--yec-heading-line-height", + `${blockRect.height}px` + ); + heading.style.setProperty( + "--yec-heading-gap-top", + `${inlineRect.top - blockRect.top}px` + ); + heading.style.setProperty( + "--yec-heading-gap-bottom", + `${blockRect.bottom - inlineRect.bottom}px` + ); + }); + sizeObserver.observe(measureEl); + document.body.append(measureEl); + } + + this._updateDonateLocale(); + }, + + _messageNumber: null, + + /** + * The version of the YEC message to show, or null if no version should be + * shown. + * + * @type {?integer} + */ + get messageNumber() { + return this._messageNumber; + }, + + set messageNumber(number) { + this._messageNumber = number; + this._updateShown(); + }, + + _updateShown() { + if (!this._initialized) { + return; + } + + if (this.messageNumber === null) { + document.body.removeAttribute("yec-2024-message-number"); + } else { + document.body.setAttribute("yec-2024-message-number", this.messageNumber); + } + }, + + _updateDonateLocale() { + if (!this._initialized) { + return; + } + const donateLink = document.getElementById("yec-2024-donate-link"); + const base = "https://www.torproject.org/donate"; + // TODO: Updated link for YEC (using _locale?). + donateLink.href = base; + }, + + /** + * Set the locale to use for the donation link. + * + * @param {string} locale - The new locale, as BCP47. + */ + setDonateLocale(locale) { + this._locale = locale; + this._updateDonateLocale(); + }, +}; + +window.addEventListener("DOMContentLoaded", () => { + YecWidget.init(); +}); + +window.addEventListener("InitialData", event => { + const { appLocale, yecMessageNumber } = event.detail; + YecWidget.messageNumber = yecMessageNumber; + YecWidget.setDonateLocale(appLocale); +}); ===================================== browser/components/abouttor/content/yec-2024-browse.svg ===================================== @@ -0,0 +1,29 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<g opacity="0.7"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M79.8497 128.5C81.3358 128.5 82.5406 129.705 82.5406 131.191V144.208H174.099C175.584 144.208 176.789 145.412 176.789 146.898V159.916H176.791V175.624H192.071V160.345H192.068V146.898C192.068 145.412 193.273 144.208 194.758 144.208H268.346C269.295 144.208 270.129 144.699 270.608 145.441V144.208H346.888C348.373 144.208 349.577 145.412 349.577 146.897V157.654C349.577 158.603 349.086 159.437 348.344 159.916H349.579V176.053H348.344C349.086 176.532 349.577 177.366 349.577 178.315V207.054H378.313C379.799 207.054 381.003 208.258 381.003 209.744V220.499C381.003 221.985 379.799 223.19 378.313 223.19H349.582V236.17C349.582 237.656 348.378 238.86 346.893 238.86H318.16V251.877C318.16 253.363 316.956 254.568 315.47 254.568H304.715C303.229 254.568 302.024 253.363 302.024 251.877V238.86H271.036V251.877C271.036 253.363 269.832 254.568 268.346 254.568H257.591C256.105 254.568 254.9 253.363 254.9 251.877V238.86L37.6824 238.86C36.1971 238.86 34.993 237.656 34.993 236.17L34.993 222.723H66.4142V207.469H21.9709C20.4848 207.469 19.2801 206.264 19.2801 204.778V191.761H6.26293C4.77683 191.761 3.57211 190.556 3.57211 189.07V178.315C3.57211 176.829 4.77683 175.624 6.26293 175.624H19.2823V162.607C19.2823 161.121 20.487 159.916 21.9731 159.916H34.988V146.897C34.988 145.412 36.1921 144.208 37.6774 144.208H66.4041V131.191C66.4041 129.705 67.6088 128.5 69.0949 128.5H79.8497ZM69.0949 128.928H79.8497C81.0992 128.928 82.1121 129.941 82.1121 131.191V144.208H66.8325V131.191C66.8325 129.941 67.8454 128.928 69.0949 128.928ZM333.446 238.431V223.19H318.166L318.166 238.431H333.446ZM333.451 222.723V207.482H318.171V222.723H333.451ZM349.159 222.723H333.879V207.482H349.159V222.723ZM333.874 238.431H346.893C348.141 238.431 349.154 237.419 349.154 236.17V223.19H333.874L333.874 238.431ZM317.743 207.482V222.723H302.463V207.482H317.743ZM317.737 223.19V238.431H302.458V223.19H317.737ZM302.029 223.19V238.431H286.75L286.75 223.19H302.029ZM302.035 222.723V207.482H286.755V222.723H302.035ZM270.613 238.431V223.19H255.334L255.334 238.431H270.613ZM270.613 222.723L270.619 222.723V207.482H255.339V222.723L270.613 222.723ZM286.327 222.723H271.047V207.482H286.327V222.723ZM271.042 238.431H286.321V223.19H271.042L271.042 238.431ZM254.911 207.482V222.723H239.631V207.482H254.911ZM254.905 223.19V238.431H239.626L239.626 223.19H254.905ZM239.197 238.431V223.19H223.918L223.918 238.431H239.197ZM239.197 222.723L239.203 222.723V207.482H223.923V222.723L239.197 222.723ZM223.49 223.19V238.431H208.21V223.19L223.49 223.19ZM207.781 222.723L207.787 222.723V207.482H192.507V222.723L207.781 222.723ZM223.495 222.723H208.215V207.482H223.495V222.723ZM207.781 238.431H192.502L192.502 223.19L207.781 223.19V238.431ZM176.794 223.19H192.073V238.431H176.794L176.794 223.19ZM176.365 238.431V223.19H161.086L161.086 238.431H176.365ZM176.371 222.723V207.482H161.091V222.723H176.371ZM192.079 222.723H176.799V207.482H192.079V222.723ZM160.663 207.482V222.723H145.383V207.482H160.663ZM160.657 223.19V238.431H145.378V223.19H160.657ZM144.949 222.723L144.955 222.723V207.482H129.675V222.723L144.949 222.723ZM129.67 223.19V238.431H144.949V223.19H129.67ZM129.246 207.482V222.723H113.967V207.482H129.246ZM129.241 223.19V238.431H113.962V223.19H129.241ZM113.538 222.723V207.482H98.2591V222.723H113.538ZM98.2539 223.19V238.431H113.533V223.19H98.2539ZM97.8305 207.482V222.723H82.5509V207.482H97.8305ZM97.8251 223.19V238.431H82.5458V223.19L97.8251 223.19ZM82.1222 222.723V207.482H66.8427V222.723H82.1222ZM82.1171 238.431H66.8376L66.8376 223.19H82.1171V238.431ZM66.4092 223.152V238.431H51.1296V223.152H66.4092ZM364.867 207.482H349.587V222.762H364.867V207.482ZM365.295 222.762H378.313C379.562 222.762 380.575 221.749 380.575 220.499V209.744C380.575 208.495 379.562 207.482 378.313 207.482H365.295V222.762ZM35.4165 207.04L35.4166 191.761H50.696L50.6961 207.04H35.4165ZM34.9881 191.761H19.7086V204.778C19.7086 206.027 20.7214 207.04 21.9709 207.04H34.9881L34.9881 191.761ZM66.4041 207.04H51.1245L51.1246 191.761H66.4041V207.04ZM66.8325 207.04H82.1121L82.112 191.761L66.8325 191.761V207.04ZM97.8201 207.04H82.5405V191.761H97.8201V207.04ZM129.236 207.04H113.957V191.761L129.236 191.761L129.236 207.04ZM113.528 207.04H98.2487V191.761L113.528 191.761L113.528 207.04ZM129.665 207.04H144.944L144.944 191.761L129.665 191.761V207.04ZM160.652 207.04H145.373V191.761L160.652 191.761L160.652 207.04ZM161.081 207.04H176.36L176.36 191.761L161.081 191.761V207.04ZM192.068 207.04H176.789V191.761H192.068V207.04ZM223.484 207.04H208.205V191.761L223.484 191.761L223.484 207.04ZM207.776 207.04H192.497V191.761L207.776 191.761L207.776 207.04ZM223.913 207.04H239.192L239.192 191.761L223.913 191.761V207.04ZM254.9 207.04H239.621V191.761L254.9 191.761L254.9 207.04ZM255.329 207.04H270.608V191.761H255.329V207.04ZM286.745 207.04H302.025L302.025 191.761L286.745 191.761V207.04ZM286.317 191.761L271.037 191.761V207.04H286.317L286.317 191.761ZM317.733 207.04H302.453V191.761L317.732 191.761L317.733 207.04ZM318.161 207.04H333.44L333.44 191.761L318.161 191.761V207.04ZM349.148 207.04H333.869V191.761H349.148V207.04ZM34.9881 191.332H19.7086V176.053H34.9881V191.332ZM19.2801 191.332V176.052H6.26293C5.01347 176.052 4.00059 177.065 4.00059 178.315V189.07C4.00059 190.319 5.01347 191.332 6.26293 191.332H19.2801ZM19.7108 175.624V162.607C19.7108 161.357 20.7237 160.345 21.9731 160.345H34.9903V175.624H19.7108ZM35.4166 191.332V176.053H50.696V191.332H35.4166ZM66.4041 191.332H51.1246V176.053H66.4041L66.4041 191.332ZM50.6984 160.345V175.624H35.4188V160.345H50.6984ZM51.1269 175.624V160.345H66.4064V175.624H51.1269ZM66.8325 176.053V191.332H82.1121L82.112 176.053H66.8325ZM97.8201 191.332H82.5405V176.053H97.8201V191.332ZM82.1145 160.345V175.624H66.8349V160.345H82.1145ZM82.5429 175.624V160.345L97.8225 160.345L97.8225 175.624H82.5429ZM129.236 191.332H113.957V176.053H129.236L129.236 191.332ZM113.53 160.345L113.531 175.624H98.251V160.345L113.53 160.345ZM98.2487 176.053V191.332H113.528L113.528 176.053H98.2487ZM113.959 175.624V160.345H129.239V175.624H113.959ZM129.665 191.332H144.944L144.944 176.053H129.665V191.332ZM160.652 191.332H145.373V176.052L145.375 176.053H160.652L160.652 191.332ZM144.947 160.345V175.624L144.944 175.624H129.667V160.345L144.947 160.345ZM145.375 175.624L160.652 175.624L160.655 175.624L160.655 160.345L145.375 160.345V175.624ZM161.081 191.332H176.36L176.36 176.053H161.083L161.081 176.052V191.332ZM192.068 191.332H176.789V176.052L176.791 176.053L192.068 176.052V191.332ZM176.363 160.345V175.624L176.36 175.624L161.083 175.624V160.345H176.363ZM97.8201 144.637H82.5406V159.916H97.8201V144.637ZM98.2486 159.916H113.528V144.637H98.2486V159.916ZM333.869 144.637H346.888C348.136 144.637 349.148 145.649 349.148 146.897V157.654C349.148 158.903 348.136 159.916 346.886 159.916H333.869V144.637ZM223.484 191.332H208.205V176.052L208.207 176.053H223.484L223.484 191.332ZM207.779 160.345L207.779 175.624L207.776 175.624L192.499 175.624V160.345L207.779 160.345ZM207.776 176.053L192.497 176.052V191.332H207.776L207.776 176.053ZM208.207 175.624L223.484 175.624L223.487 175.624L223.487 160.345L208.207 160.345V175.624ZM223.913 191.332H239.192L239.192 176.053H223.915L223.913 176.052V191.332ZM254.9 191.332H239.621V176.052L239.623 176.053H254.9L254.9 191.332ZM239.195 160.345V175.624L239.192 175.624L223.915 175.624V160.345H239.195ZM239.623 175.624L254.9 175.624L254.903 175.624V160.345L239.623 160.345V175.624ZM255.329 191.332H270.608L270.609 176.053H255.331L255.329 176.052V191.332ZM270.611 160.345V175.624L270.609 175.624L255.331 175.624V160.345H270.611ZM271.039 175.624L286.317 175.624L286.319 175.624L286.319 160.345L271.039 160.345V175.624ZM286.745 191.332H302.025L302.025 176.053H286.747L286.745 176.052V191.332ZM271.037 191.332H286.317L286.317 176.053H271.039L271.037 176.052V191.332ZM317.733 191.332H302.453V176.052L302.455 176.053H317.732L317.733 191.332ZM302.027 160.345L302.027 175.624L302.025 175.624L286.747 175.624V160.345L302.027 160.345ZM302.455 175.624L317.732 175.624L317.735 175.624L317.735 160.345L302.455 160.345V175.624ZM318.163 176.053L318.161 176.052V191.332H333.44L333.44 176.053H318.163ZM349.148 191.332H333.869V176.052L333.871 176.053H346.905C348.146 176.063 349.148 177.072 349.148 178.315V191.332ZM333.443 160.345L333.443 175.624L333.44 175.624L318.163 175.624V160.345L333.443 160.345ZM346.907 175.624L346.886 175.624L333.871 175.624V160.345H349.151V175.624H346.907ZM317.733 159.916L302.455 159.916L302.453 159.916V144.637H317.733V159.916ZM223.484 144.637H208.205V159.916H223.484V144.637ZM207.776 144.637H194.758C193.509 144.637 192.497 145.649 192.497 146.898V159.916H207.776V144.637ZM239.192 159.916H223.913V144.637H239.192V159.916ZM270.608 159.916H255.329V144.637H268.346C269.592 144.637 270.602 145.643 270.608 146.887L270.608 146.899V159.916ZM239.621 144.637H254.9V159.916H239.621V144.637ZM286.316 144.637H271.037V146.886L271.037 146.899L271.037 159.916H286.316V144.637ZM302.024 159.916H286.745V144.637H302.024V159.916ZM333.44 159.916H318.161V144.637H333.44V159.916ZM161.081 144.637H174.099C175.348 144.637 176.36 145.649 176.36 146.898V159.916H161.081V144.637ZM129.236 159.916H113.957V144.637H129.236V159.916ZM160.652 159.916H145.373V144.637H160.652V159.916ZM129.665 144.637H144.944V159.916H129.665V144.637ZM66.8325 144.637H82.1121V159.916H66.8325V144.637ZM66.404 144.637H51.1245V159.916H66.404V144.637ZM37.6774 144.637H50.696V159.916H35.4165V146.897C35.4165 145.649 36.4287 144.637 37.6774 144.637ZM50.7011 238.431H37.6824C36.4338 238.431 35.4215 237.419 35.4215 236.17L35.4215 223.152H50.7011V238.431ZM255.328 238.86V251.877C255.328 253.127 256.341 254.139 257.591 254.139H268.346C269.595 254.139 270.608 253.127 270.608 251.877V238.86H255.328ZM302.452 251.877V238.86H317.732V251.877C317.732 253.127 316.719 254.139 315.47 254.139H304.715C303.465 254.139 302.452 253.127 302.452 251.877Z" fill="white"/> +</g> +<ellipse cx="45.5158" cy="13.3261" rx="45.5158" ry="13.3261" transform="matrix(0.999984 -0.00561916 0.00560665 0.999984 53.6995 182.94)" fill="white"/> +<ellipse cx="45.5158" cy="13.3261" rx="45.5158" ry="13.3261" transform="matrix(0.999984 -0.00561916 0.00560665 0.999984 235.763 182.94)" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M280.849 28.1858C280.849 29.6103 279.696 30.7651 278.273 30.7651C276.85 30.7651 275.696 29.6103 275.696 28.1858C275.696 26.7614 276.85 25.6066 278.273 25.6066C279.696 25.6066 280.849 26.7614 280.849 28.1858ZM279.843 28.1858C279.843 29.0539 279.14 29.7576 278.273 29.7576C277.406 29.7576 276.703 29.0539 276.703 28.1858C276.703 27.3178 277.406 26.6141 278.273 26.6141C279.14 26.6141 279.843 27.3178 279.843 28.1858Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278.273 32.6995C280.763 32.6995 282.781 30.6787 282.781 28.1858C282.781 25.693 280.763 23.6722 278.273 23.6722C275.783 23.6722 273.764 25.693 273.764 28.1858C273.764 30.6787 275.783 32.6995 278.273 32.6995ZM278.273 31.692C280.207 31.692 281.775 30.1222 281.775 28.1858C281.775 26.2494 280.207 24.6797 278.273 24.6797C276.339 24.6797 274.771 26.2494 274.771 28.1858C274.771 30.1222 276.339 31.692 278.273 31.692Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278.273 34.6339C281.83 34.6339 284.714 31.747 284.714 28.1858C284.714 24.6246 281.83 21.7377 278.273 21.7377C274.716 21.7377 271.832 24.6246 271.832 28.1858C271.832 31.747 274.716 34.6339 278.273 34.6339ZM278.273 33.6264C281.274 33.6264 283.707 31.1906 283.707 28.1858C283.707 25.1811 281.274 22.7452 278.273 22.7452C275.271 22.7452 272.838 25.1811 272.838 28.1858C272.838 31.1906 275.271 33.6264 278.273 33.6264Z" fill="#C1ED75"/> +<path d="M244.935 87.9729C247.499 89.2993 250.664 88.7757 252.38 86.4549C253.648 84.7404 254.785 83.047 255.675 81.6637C256.923 79.7247 256.861 77.257 255.518 75.3827C248.133 65.0756 222.339 32.4846 191.438 32.4846C160.917 32.4846 135.023 64.279 127.164 74.9925C125.643 77.067 125.728 79.8408 127.306 81.8725C128.137 82.9415 129.116 84.1806 130.166 85.4659C131.99 87.6988 135.142 88.2303 137.713 86.9272C154.397 78.4741 171.659 73.7524 191.106 73.7524C210.688 73.7524 228.146 79.2859 244.935 87.9729Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M251.914 86.1097C253.172 84.408 254.302 82.7255 255.187 81.3496C256.306 79.6108 256.25 77.4016 255.046 75.7208C251.367 70.5867 243.105 59.9053 231.923 50.513C220.731 41.1125 206.688 33.0651 191.438 33.0651C176.375 33.0651 162.401 40.9162 151.172 50.169C139.953 59.4138 131.548 69.9984 127.633 75.3358C126.27 77.1937 126.34 79.682 127.765 81.5163C128.593 82.5825 129.569 83.8177 130.616 85.0987C132.252 87.102 135.101 87.6002 137.451 86.4093C154.206 77.92 171.557 73.1719 191.106 73.1719C210.805 73.1719 228.355 78.7399 245.202 87.4573C247.547 88.671 250.39 88.1708 251.914 86.1097ZM252.38 86.4549C250.664 88.7757 247.499 89.2993 244.935 87.9729C228.146 79.2859 210.688 73.7524 191.106 73.7524C171.659 73.7524 154.397 78.4741 137.713 86.9272C135.142 88.2303 131.99 87.6988 130.166 85.4659C129.116 84.1806 128.137 82.9415 127.306 81.8725C125.728 79.8408 125.643 77.067 127.164 74.9925C135.023 64.279 160.917 32.4846 191.438 32.4846C222.339 32.4846 248.133 65.0756 255.518 75.3827C256.861 77.257 256.923 79.7247 255.675 81.6637C254.785 83.047 253.648 84.7404 252.38 86.4549Z" fill="white"/> +<path d="M208.117 67.9359C211.7 67.9359 214.779 65.8397 216.221 62.8083C218.184 66.4209 219.388 70.5052 219.623 74.8486C210.328 72.6581 200.713 71.5323 190.925 71.5323C181.319 71.5323 171.88 72.6165 162.747 74.7272C163.619 59.7645 176.017 47.8983 191.181 47.8983C195.795 47.8983 200.152 49.0029 204.007 50.9553C201.117 52.4504 199.136 55.4612 199.136 58.9447C199.136 63.913 203.155 67.9359 208.117 67.9359Z" fill="#212529"/> +<path d="M255.956 199.49C251.706 199.49 248.258 196.038 248.258 191.784C248.258 160.052 222.474 134.24 190.778 134.24C159.082 134.24 133.299 160.052 133.299 191.784C133.299 196.038 129.85 199.49 125.6 199.49C121.351 199.49 117.902 196.038 117.902 191.784C117.902 151.554 150.594 118.826 190.778 118.826C230.963 118.826 263.654 151.554 263.654 191.784C263.654 196.038 260.205 199.49 255.956 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M248.838 191.784C248.838 195.718 252.028 198.91 255.956 198.91C259.884 198.91 263.073 195.718 263.073 191.784C263.073 151.874 230.641 119.407 190.778 119.407C150.915 119.407 118.483 151.874 118.483 191.784C118.483 195.718 121.672 198.91 125.6 198.91C129.529 198.91 132.718 195.718 132.718 191.784C132.718 159.732 158.761 133.659 190.778 133.659C222.795 133.659 248.838 159.732 248.838 191.784ZM248.258 191.784C248.258 196.038 251.706 199.49 255.956 199.49C260.205 199.49 263.654 196.038 263.654 191.784C263.654 151.554 230.963 118.826 190.778 118.826C150.594 118.826 117.902 151.554 117.902 191.784C117.902 196.038 121.351 199.49 125.6 199.49C129.85 199.49 133.299 196.038 133.299 191.784C133.299 160.052 159.082 134.24 190.778 134.24C222.474 134.24 248.258 160.052 248.258 191.784Z" fill="#C1ED75"/> +<path d="M307.277 199.49C303.028 199.49 299.579 196.038 299.579 191.784C299.579 131.722 250.773 82.8617 190.778 82.8617C130.784 82.8617 81.9776 131.722 81.9776 191.784C81.9776 196.038 78.5289 199.49 74.2795 199.49C70.0301 199.49 66.5813 196.038 66.5813 191.784C66.5813 158.573 79.4988 127.35 102.958 103.865C126.417 80.3801 157.604 67.4482 190.778 67.4482C223.952 67.4482 255.14 80.3801 278.599 103.865C302.058 127.35 314.975 158.573 314.975 191.784C314.975 196.038 311.526 199.49 307.277 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M300.159 191.784C300.159 195.718 303.349 198.91 307.277 198.91C311.205 198.91 314.395 195.718 314.395 191.784C314.395 158.726 301.538 127.651 278.188 104.275C254.838 80.8993 223.798 68.0287 190.778 68.0287C157.758 68.0287 126.718 80.8993 103.368 104.275C80.0184 127.651 67.1619 158.726 67.1619 191.784C67.1619 195.718 70.3513 198.91 74.2795 198.91C78.2076 198.91 81.3971 195.718 81.3971 191.784C81.3971 131.402 130.463 82.2812 190.778 82.2812C251.094 82.2812 300.159 131.402 300.159 191.784ZM299.579 191.784C299.579 196.038 303.028 199.49 307.277 199.49C311.526 199.49 314.975 196.038 314.975 191.784C314.975 158.573 302.058 127.35 278.599 103.865C255.14 80.3801 223.952 67.4482 190.778 67.4482C157.604 67.4482 126.417 80.3801 102.958 103.865C79.4988 127.35 66.5813 158.573 66.5813 191.784C66.5813 196.038 70.0301 199.49 74.2795 199.49C78.5289 199.49 81.9776 196.038 81.9776 191.784C81.9776 131.722 130.784 82.8617 190.778 82.8617C250.773 82.8617 299.579 131.722 299.579 191.784Z" fill="#C1ED75"/> +<path d="M281.616 199.49C277.367 199.49 273.918 196.038 273.918 191.784C273.918 145.887 236.623 108.551 190.778 108.551C144.933 108.551 107.638 145.887 107.638 191.784C107.638 196.038 104.189 199.49 99.9399 199.49C95.6905 199.49 92.2418 196.038 92.2418 191.784C92.2418 137.389 136.445 93.1374 190.778 93.1374C245.112 93.1374 289.314 137.389 289.314 191.784C289.314 196.038 285.866 199.49 281.616 199.49Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M274.499 191.784C274.499 195.718 277.688 198.91 281.616 198.91C285.544 198.91 288.734 195.718 288.734 191.784C288.734 137.709 244.79 93.7179 190.778 93.7179C136.766 93.7179 92.8223 137.709 92.8223 191.784C92.8223 195.718 96.0118 198.91 99.9399 198.91C103.868 198.91 107.058 195.718 107.058 191.784C107.058 145.567 144.612 107.97 190.778 107.97C236.944 107.97 274.499 145.567 274.499 191.784ZM273.918 191.784C273.918 196.038 277.367 199.49 281.616 199.49C285.866 199.49 289.314 196.038 289.314 191.784C289.314 137.389 245.112 93.1374 190.778 93.1374C136.445 93.1374 92.2418 137.389 92.2418 191.784C92.2418 196.038 95.6905 199.49 99.9399 199.49C104.189 199.49 107.638 196.038 107.638 191.784C107.638 145.887 144.933 108.551 190.778 108.551C236.623 108.551 273.918 145.887 273.918 191.784Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M323.181 129.206V108.572H323.762V129.206H323.181Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M331.946 119.186L314.77 119.141L314.772 118.56L331.948 118.606L331.946 119.186Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.732 60.6413V14H73.3125V60.6413H72.732Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M92.3442 37.8212L53.6987 37.7184L53.7002 37.1378L92.3458 37.2407L92.3442 37.8212Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M80.8209 45.6462L64.6586 29.4659L65.0689 29.0551L81.2312 45.2355L80.8209 45.6462Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M65.0689 45.6462L81.2312 29.4659L80.8209 29.0551L64.6586 45.2355L65.0689 45.6462Z" fill="#C1ED75"/> +<path d="M325.935 83.6395C325.935 85.064 324.782 86.2187 323.359 86.2187C321.936 86.2187 320.783 85.064 320.783 83.6395C320.783 82.215 321.936 81.0602 323.359 81.0602C324.782 81.0602 325.935 82.215 325.935 83.6395Z" fill="#C1ED75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M304.466 99.9747C307.074 99.9747 309.189 97.8576 309.189 95.2461C309.189 92.6345 307.074 90.5175 304.466 90.5175C301.857 90.5175 299.742 92.6345 299.742 95.2461C299.742 97.8576 301.857 99.9747 304.466 99.9747ZM304.466 99.3941C306.753 99.3941 308.609 97.5376 308.609 95.2461C308.609 92.9545 306.753 91.098 304.466 91.098C302.178 91.098 300.323 92.9545 300.323 95.2461C300.323 97.5376 302.178 99.3941 304.466 99.3941Z" fill="#C1ED75"/> +<path d="M64.8637 121.468C64.8637 122.893 63.7103 124.048 62.2874 124.048C60.8645 124.048 59.711 122.893 59.711 121.468C59.711 120.044 60.8645 118.889 62.2874 118.889C63.7103 118.889 64.8637 120.044 64.8637 121.468Z" fill="#C1ED75"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-fonts.css ===================================== @@ -0,0 +1,105 @@ +/** + * The embedded "Space Grotesk" font is under the following copyright: + * + * Copyright 2020 The Space Grotesk Project Authors (https://github.com/floriankarsten/space-grotesk) + * + * This Font Software is licensed under the SIL Open Font License, Version 1.1. + * This license is copied below, and is also available with a FAQ at: + * https://openfontlicense.org + * + * + * ----------------------------------------------------------- + * SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + * ----------------------------------------------------------- + * + * PREAMBLE + * The goals of the Open Font License (OFL) are to stimulate worldwide + * development of collaborative font projects, to support the font creation + * efforts of academic and linguistic communities, and to provide a free and + * open framework in which fonts may be shared and improved in partnership + * with others. + * + * The OFL allows the licensed fonts to be used, studied, modified and + * redistributed freely as long as they are not sold by themselves. The + * fonts, including any derivative works, can be bundled, embedded, + * redistributed and/or sold with any software provided that any reserved + * names are not used by derivative works. The fonts and derivatives, + * however, cannot be released under any other type of license. The + * requirement for fonts to remain under this license does not apply + * to any document created using the fonts or their derivatives. + * + * DEFINITIONS + * "Font Software" refers to the set of files released by the Copyright + * Holder(s) under this license and clearly marked as such. This may + * include source files, build scripts and documentation. + * + * "Reserved Font Name" refers to any names specified as such after the + * copyright statement(s). + * + * "Original Version" refers to the collection of Font Software components as + * distributed by the Copyright Holder(s). + * + * "Modified Version" refers to any derivative made by adding to, deleting, + * or substituting -- in part or in whole -- any of the components of the + * Original Version, by changing formats or by porting the Font Software to a + * new environment. + * + * "Author" refers to any designer, engineer, programmer, technical + * writer or other person who contributed to the Font Software. + * + * PERMISSION & CONDITIONS + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of the Font Software, to use, study, copy, merge, embed, modify, + * redistribute, and sell modified and unmodified copies of the Font + * Software, subject to the following conditions: + * + * 1) Neither the Font Software nor any of its individual components, + * in Original or Modified Versions, may be sold by itself. + * + * 2) Original or Modified Versions of the Font Software may be bundled, + * redistributed and/or sold with any software, provided that each copy + * contains the above copyright notice and this license. These can be + * included either as stand-alone text files, human-readable headers or + * in the appropriate machine-readable metadata fields within text or + * binary files as long as those fields can be easily viewed by the user. + * + * 3) No Modified Version of the Font Software may use the Reserved Font + * Name(s) unless explicit written permission is granted by the corresponding + * Copyright Holder. This restriction only applies to the primary font name as + * presented to the users. + * + * 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + * Software shall not be used to promote, endorse or advertise any + * Modified Version, except to acknowledge the contribution(s) of the + * Copyright Holder(s) and the Author(s) or with their explicit written + * permission. + * + * 5) The Font Software, modified or unmodified, in part or in whole, + * must be distributed entirely under this license, and must not be + * distributed under any other license. The requirement for fonts to + * remain under this license does not apply to any document created + * using the Font Software. + * + * TERMINATION + * This license becomes null and void if any of the above conditions are + * not met. + * + * DISCLAIMER + * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT + * OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL + * DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM + * OTHER DEALINGS IN THE FONT SOFTWARE. + */ + +@font-face { + font-family: "Space Grotesk"; + font-weight: 700 700; + font-style: normal; + /* woff2 stream */ + src: url("data:font/woff2;base64,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"); +} ===================================== browser/components/abouttor/content/yec-2024-heart.svg ===================================== @@ -0,0 +1,4 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg"> + <path d="M8 6C8 6 8 2 11.5 2C15 2 15 5 15 6C15 10.5 8 15 8 15V6Z"/> + <path d="M8 6C8 6 8 2 4.5 2C1 2 1 5 1 6C1 10.5 8 15 8 15L9 9L8 6Z"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-search.svg ===================================== @@ -0,0 +1,33 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M297.41 64.935V44.301H297.99V64.935H297.41Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M306.175 54.9151L288.999 54.8694L289.001 54.2889L306.176 54.3346L306.175 54.9151Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M77.0325 243.942V197.301H77.613V243.942H77.0325Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M96.6447 221.122L57.9992 221.019L58.0007 220.439L96.6463 220.542L96.6447 221.122Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M85.1215 228.947L68.9591 212.767L69.3694 212.356L85.5317 228.537L85.1215 228.947Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M69.3694 228.947L85.5317 212.767L85.1215 212.356L68.9591 228.537L69.3694 228.947Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M278 34.3099C280.209 34.3099 282 32.5171 282 30.3055C282 28.0939 280.209 26.301 278 26.301C275.791 26.301 274 28.0939 274 30.3055C274 32.5171 275.791 34.3099 278 34.3099ZM278 33.7294C279.888 33.7294 281.419 32.1971 281.419 30.3055C281.419 28.4139 279.888 26.8816 278 26.8816C276.112 26.8816 274.581 28.4139 274.581 30.3055C274.581 32.1971 276.112 33.7294 278 33.7294Z" fill="white"/> +<path d="M95.1527 187.88C95.1527 189.305 93.9993 190.46 92.5764 190.46C91.1535 190.46 90 189.305 90 187.88C90 186.456 91.1535 185.301 92.5764 185.301C93.9993 185.301 95.1527 186.456 95.1527 187.88Z" fill="white"/> +<path d="M109.829 99.4117C109.829 51.8944 148.349 13.3738 195.867 13.3738C243.384 13.3738 281.905 51.8943 281.905 99.4117V261.743C281.905 263.731 280.293 265.342 278.306 265.342H113.427C111.44 265.342 109.829 263.731 109.829 261.743V99.4117Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M282.468 99.4117V261.743C282.468 264.042 280.604 265.905 278.306 265.905H113.427C111.129 265.905 109.266 264.042 109.266 261.743V99.4117C109.266 51.5832 148.038 12.8105 195.867 12.8105C243.695 12.8105 282.468 51.5831 282.468 99.4117ZM195.867 13.3738C148.349 13.3738 109.829 51.8943 109.829 99.4117V261.743C109.829 263.731 111.44 265.342 113.427 265.342H278.306C280.293 265.342 281.904 263.731 281.904 261.743V99.4117C281.904 51.8943 243.384 13.3738 195.867 13.3738Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M197.16 164.041C208.629 164.041 217.925 154.744 217.925 143.277C217.925 131.809 208.629 122.513 197.16 122.513C185.692 122.513 176.396 131.809 176.396 143.277C176.396 154.744 185.692 164.041 197.16 164.041ZM197.16 170.962C212.451 170.962 224.847 158.567 224.847 143.277C224.847 127.986 212.451 115.591 197.16 115.591C181.87 115.591 169.474 127.986 169.474 143.277C169.474 158.567 181.87 170.962 197.16 170.962Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M197.16 150.198C200.983 150.198 204.082 147.099 204.082 143.277C204.082 139.454 200.983 136.355 197.16 136.355C193.338 136.355 190.239 139.454 190.239 143.277C190.239 147.099 193.338 150.198 197.16 150.198ZM197.16 157.119C204.806 157.119 211.004 150.922 211.004 143.277C211.004 135.631 204.806 129.434 197.16 129.434C189.515 129.434 183.317 135.631 183.317 143.277C183.317 150.922 189.515 157.119 197.16 157.119Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M224.847 112.323C233.343 119.927 238.69 130.977 238.69 143.277C238.69 166.212 220.096 184.805 197.16 184.805C174.224 184.805 155.631 166.212 155.631 143.277C155.631 130.977 160.978 119.927 169.474 112.323V101.749C169.474 86.4583 181.87 74.0631 197.16 74.0631C212.451 74.0631 224.847 86.4583 224.847 101.749V112.323ZM178.126 106.357C183.828 103.412 190.3 101.749 197.16 101.749C204.021 101.749 210.493 103.412 216.195 106.357V101.749C216.195 91.2365 207.673 82.7148 197.16 82.7148C186.648 82.7148 178.126 91.2365 178.126 101.749V106.357ZM231.768 143.277C231.768 162.389 216.274 177.883 197.16 177.883C178.047 177.883 162.553 162.389 162.553 143.277C162.553 124.164 178.047 108.67 197.16 108.67C216.274 108.67 231.768 124.164 231.768 143.277Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M222.638 66.3009V29.5596H223.201V66.3009H222.638Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M238.327 48.3784L207.51 48.2965L207.511 47.7332L238.329 47.815L238.327 48.3784Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M229.102 54.5249L216.213 41.779L216.614 41.3828L229.502 54.1288L229.102 54.5249Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M216.614 54.5249L229.502 41.779L229.102 41.3828L216.213 54.1288L216.614 54.5249Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M265.939 152.721V127.881H266.503V152.721H265.939Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M276.531 140.592L255.637 140.536L255.639 139.973L276.532 140.028L276.531 140.592Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M127.685 177.042V160.483H128.249V177.042H127.685Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M134.668 169.049L121.087 169.013L121.089 168.45L134.669 168.486L134.668 169.049Z" fill="#212529"/> +<path d="M184.58 54.3988C184.58 56.2413 183.071 57.7395 181.205 57.7395C179.339 57.7395 177.83 56.2413 177.83 54.3988C177.83 52.5562 179.339 51.058 181.205 51.058C183.071 51.058 184.58 52.5562 184.58 54.3988ZM272.855 103.56C272.855 105.402 271.346 106.9 269.48 106.9C267.614 106.9 266.105 105.402 266.105 103.56C266.105 101.717 267.614 100.219 269.48 100.219C271.346 100.219 272.855 101.717 272.855 103.56ZM145.714 185.063C145.714 186.906 144.206 188.404 142.339 188.404C140.473 188.404 138.965 186.906 138.965 185.063C138.965 183.221 140.473 181.723 142.339 181.723C144.206 181.723 145.714 183.221 145.714 185.063Z" fill="#212529" stroke="#212529" stroke-width="0.563343"/> +<path d="M109.317 230.101H282.417V262.352C282.417 264.339 280.806 265.95 278.818 265.95H112.915C110.928 265.95 109.317 264.339 109.317 262.352V230.101Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 230.664H109.88V262.352C109.88 264.028 111.239 265.387 112.915 265.387H278.818C280.494 265.387 281.853 264.028 281.853 262.352V230.664ZM109.317 230.101V262.352C109.317 264.339 110.928 265.95 112.915 265.95H278.818C280.806 265.95 282.417 264.339 282.417 262.352V230.101H109.317Z" fill="#FF6A75"/> +<path d="M141.33 197.038C141.33 196.044 142.136 195.239 143.13 195.239H282.417V230.486H141.33V197.038Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 195.802H143.13C142.447 195.802 141.894 196.355 141.894 197.038V229.922H281.853V195.802ZM143.13 195.239C142.136 195.239 141.33 196.044 141.33 197.038V230.486H282.417V195.239H143.13Z" fill="#FF6A75"/> +<path d="M171.983 162.499C171.983 161.505 172.789 160.699 173.782 160.699H282.417V195.72H171.983V162.499Z" fill="#212529"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M281.853 161.263H173.782C173.1 161.263 172.546 161.816 172.546 162.499V195.157H281.853V161.263ZM173.782 160.699C172.789 160.699 171.983 161.505 171.983 162.499V195.72H282.417V160.699H173.782Z" fill="#FF6A75"/> +<path d="M249.543 161.476H282.417V261.279C282.417 263.902 280.88 265.95 278.308 265.438H183.797V230.081H216.67V195.264H249.543V161.476Z" fill="#FF6A75"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M174.269 161.26L282.44 161.001L282.442 161.565L174.27 161.823L174.269 161.26Z" fill="#212529"/> +</svg> ===================================== browser/components/abouttor/content/yec-2024-speak.svg ===================================== @@ -0,0 +1,49 @@ +<svg width="384" height="280" viewBox="0 0 384 280" fill="none" xmlns="http://www.w3.org/2000/svg"> +<rect width="384" height="280" fill="context-fill"/> +<path d="M158.29 127.451C162.136 132.416 164.939 136.917 166.704 140.911C169.175 146.505 168.181 152.767 167.862 158.874C167.33 169.051 169.58 182.987 188.087 182.987C218.89 182.987 239.158 89.6662 204.553 64.9086C181.745 48.591 165.499 57.436 154.095 75.7638C141.871 95.4101 149.508 116.111 158.29 127.451Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M166.652 79.6356C172.385 73.3614 181.295 69.8973 192.326 73.324C204.374 77.0667 210.343 89.0084 212.244 102.449C214.143 115.881 211.958 130.703 207.804 140.031C207.742 140.169 207.804 140.332 207.943 140.394C208.082 140.456 208.244 140.393 208.306 140.254C212.507 130.824 214.7 115.896 212.788 102.372C210.877 88.8569 204.845 76.6371 192.489 72.7988C181.245 69.306 172.116 72.84 166.246 79.2647C160.387 85.6761 157.775 94.9658 159.53 103C160.371 106.847 161.69 109.33 163.301 110.959C164.914 112.59 166.795 113.339 168.711 113.764C169.667 113.976 170.635 114.108 171.581 114.227C171.718 114.244 171.854 114.261 171.99 114.278C172.797 114.379 173.585 114.477 174.346 114.615C176.122 114.938 177.706 115.473 178.948 116.72C180.076 117.854 180.623 119.615 180.645 121.512C180.668 123.406 180.165 125.393 179.244 126.94C178.323 128.487 177.005 129.561 175.402 129.713C173.798 129.865 171.821 129.104 169.564 126.784C169.458 126.675 169.284 126.673 169.175 126.779C169.066 126.885 169.064 127.059 169.17 127.168C171.488 129.55 173.619 130.435 175.454 130.26C177.289 130.086 178.74 128.861 179.717 127.221C180.694 125.58 181.219 123.492 181.195 121.506C181.172 119.524 180.601 117.602 179.338 116.332C177.979 114.967 176.262 114.404 174.444 114.074C173.667 113.933 172.862 113.832 172.055 113.732C171.92 113.715 171.785 113.699 171.65 113.682C170.705 113.562 169.759 113.433 168.83 113.227C166.976 112.816 165.205 112.102 163.692 110.572C162.176 109.04 160.893 106.663 160.067 102.883C158.352 95.033 160.907 85.9231 166.652 79.6356Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M173.841 101.974C171.138 103.815 168.875 107.31 167.643 112.703C167.609 112.851 167.701 112.998 167.849 113.032C167.998 113.066 168.145 112.973 168.179 112.825C169.392 107.517 171.599 104.166 174.151 102.428C176.695 100.696 179.615 100.542 182.329 101.691C187.769 103.996 192.41 111.579 191.216 122.222C190.843 125.543 189.409 127.507 188.045 129.159C187.914 129.317 187.783 129.473 187.653 129.628C186.441 131.074 185.321 132.409 185.321 134.339C185.321 134.574 185.433 134.796 185.576 134.998C185.723 135.205 185.928 135.424 186.169 135.658C186.41 135.893 186.697 136.152 187.012 136.436L187.024 136.447C187.337 136.729 187.679 137.038 188.04 137.379C189.501 138.76 191.259 140.667 192.492 143.39C193.07 144.667 192.825 146.699 191.913 148.675C191.007 150.64 189.479 152.466 187.612 153.335C185.767 154.194 183.558 154.137 181.206 152.284C178.836 150.417 176.319 146.719 173.944 140.286C173.892 140.144 173.733 140.071 173.591 140.123C173.448 140.176 173.376 140.334 173.428 140.477C175.817 146.947 178.378 150.756 180.866 152.717C183.372 154.691 185.802 154.784 187.844 153.834C189.863 152.893 191.47 150.95 192.412 148.906C193.35 146.873 193.669 144.656 192.993 143.164C191.719 140.348 189.903 138.383 188.418 136.979C188.052 136.634 187.706 136.321 187.394 136.04L187.381 136.028C187.064 135.742 186.785 135.49 186.552 135.264C186.318 135.037 186.142 134.845 186.025 134.68C185.905 134.511 185.871 134.403 185.871 134.339C185.871 132.62 186.855 131.443 188.087 129.968C188.212 129.818 188.34 129.666 188.469 129.51C189.859 127.826 191.372 125.761 191.762 122.284C192.975 111.475 188.272 103.612 182.543 101.185C179.672 99.9687 176.553 100.127 173.841 101.974Z" fill="white"/> +<path d="M151.507 161.263L152.377 165.048L165.435 202.294L129.506 226.859L73.4887 188.917L81.671 169.254L142.327 148.108L151.507 161.263Z" fill="#D898FA"/> +<path d="M81.6991 171.289C120.352 174.169 140.738 158.127 146.099 149.746L132.44 138.152L94.6338 150.196L81.6991 171.289Z" fill="white"/> +<path d="M140.098 201.039C143.158 199.971 152.688 189.325 157.07 184.136L161.06 198.237L146.953 215.831L112.114 209.668C120.167 207.236 137.037 202.106 140.098 201.039Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M73.3169 188.905C75.1248 178.002 77.8246 156.239 77.8068 151.065C77.7842 144.485 87.4513 133.619 101.395 136.254C110.096 137.898 115.492 134.68 120.435 131.731C123.414 129.955 126.228 128.276 129.503 127.818C137.042 126.762 154.128 130.054 152.322 163.715C152.671 164.015 152.92 164.605 153.474 165.925C154.662 168.751 157.255 174.919 165.248 188.729C180.892 215.759 166.312 226.294 141.054 233.737C115.796 241.18 90.4176 211.815 87.7094 206.675C85.07 201.666 77.1996 193.102 73.3893 189.238C73.3667 189.215 73.3505 189.19 73.3402 189.163C73.3091 189.084 73.3029 188.99 73.3169 188.905ZM73.8543 188.933C77.0432 186.19 80.4408 182.312 84.0316 177.29C85.2053 175.649 86.2758 173.117 87.4648 170.304C90.0024 164.301 93.0795 157.022 98.8505 154.405C101.518 153.196 104.265 153.765 107.111 154.353C111.415 155.244 115.943 156.181 120.757 151.084C128.752 142.618 137.031 144.729 139.335 148.696C141.004 151.569 148.021 159.758 151.903 163.764C150.57 165.661 149.646 176.081 156.699 191.71C165.912 212.123 120.443 217.298 105.128 204.237C99.6978 199.606 80.7279 189.908 73.8543 188.933Z" fill="#8C3EB2"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M84.532 140.421C88.6336 137.254 94.4579 135.223 101.344 136.524C110.148 138.188 115.621 134.924 120.568 131.973L120.577 131.967C123.564 130.185 126.331 128.539 129.541 128.09C133.254 127.57 139.314 128.122 144.224 132.944C149.117 137.748 152.922 146.847 152.057 163.528C150.125 161.531 147.427 158.511 145 155.628C142.548 152.718 140.393 149.97 139.573 148.559C137.139 144.369 128.623 142.354 120.556 150.896C118.19 153.402 115.911 154.409 113.707 154.691C111.489 154.976 109.326 154.531 107.167 154.084L107.126 154.076C104.311 153.493 101.485 152.909 98.7364 154.155C95.7806 155.495 93.5327 158.021 91.7116 160.939C89.8922 163.855 88.4816 167.192 87.2155 170.187L87.2113 170.197C86.0174 173.021 84.9595 175.52 83.8077 177.13C80.2245 182.141 76.8413 186 73.6746 188.725C73.6494 188.747 73.6288 188.772 73.6133 188.8C74.5138 183.344 75.6289 175.255 76.5197 167.87C77.4177 160.426 78.0909 153.672 78.082 151.065C78.0711 147.889 80.4157 143.6 84.532 140.421ZM73.585 188.989C73.5865 188.996 73.5883 189.003 73.5904 189.01C73.5986 189.038 73.6109 189.064 73.6268 189.087C73.6154 189.076 73.6042 189.064 73.5929 189.053C73.5878 189.036 73.5847 189.013 73.585 188.989ZM73.696 189.158C73.731 189.182 73.7719 189.199 73.816 189.205C75.5004 189.444 77.9495 190.223 80.7761 191.34C83.5969 192.455 86.7749 193.9 89.9101 195.46C96.1892 198.584 102.262 202.154 104.95 204.446C108.831 207.756 114.6 209.894 120.898 210.931C127.202 211.969 134.065 211.908 140.161 210.796C146.25 209.686 151.612 207.519 154.875 204.311C156.51 202.704 157.623 200.83 158.027 198.696C158.431 196.561 158.121 194.19 156.95 191.597C153.435 183.807 151.911 177.324 151.43 172.56C151.19 170.178 151.21 168.229 151.371 166.763C151.535 165.283 151.837 164.336 152.128 163.922C152.13 163.92 152.132 163.917 152.133 163.914C152.136 163.918 152.14 163.921 152.143 163.923C152.275 164.037 152.405 164.219 152.575 164.56C152.745 164.9 152.942 165.367 153.221 166.031C154.413 168.867 157.011 175.046 165.01 188.866C172.81 202.343 173.02 211.607 168.263 218.421C163.477 225.277 153.607 229.751 140.976 233.473C128.47 237.158 115.903 231.738 106.086 224.701C101.183 221.187 96.9805 217.279 93.8357 213.93C90.6847 210.575 88.6119 207.798 87.9529 206.547C86.6175 204.013 83.9718 200.599 81.1977 197.349C78.4722 194.155 75.6062 191.101 73.696 189.158ZM84.1951 139.986C79.9975 143.227 77.52 147.661 77.5317 151.066C77.5405 153.632 76.8727 160.347 75.9733 167.804C75.0749 175.252 73.9485 183.414 73.0455 188.86C73.0247 188.985 73.032 189.13 73.084 189.263C73.1082 189.325 73.1451 189.382 73.1934 189.431C75.0947 191.359 78.0103 194.461 80.7792 197.705C83.5527 200.955 86.1619 204.328 87.466 206.803C88.161 208.122 90.2762 210.943 93.4346 214.306C96.5991 217.676 100.828 221.609 105.765 225.148C115.629 232.218 128.38 237.758 141.132 234.001C153.759 230.28 163.808 225.765 168.715 218.736C173.652 211.664 173.33 202.145 165.486 188.592C157.502 174.796 154.913 168.638 153.729 165.822L153.724 165.808C153.45 165.157 153.246 164.673 153.067 164.315C152.917 164.014 152.774 163.781 152.604 163.604C153.483 146.812 149.664 137.515 144.61 132.552C139.543 127.576 133.291 127.01 129.464 127.546C126.134 128.012 123.279 129.715 120.319 131.481L120.294 131.495C115.356 134.441 110.039 137.608 101.446 135.984C94.3886 134.65 88.4073 136.734 84.1951 139.986ZM98.9645 154.656C101.537 153.489 104.193 154.03 107.056 154.623L107.076 154.627C109.215 155.069 111.461 155.534 113.778 155.237C116.118 154.936 118.51 153.864 120.957 151.273C128.882 142.881 136.922 145.09 139.097 148.834C139.946 150.295 142.134 153.078 144.579 155.982C146.968 158.819 149.621 161.792 151.556 163.801C151.235 164.38 150.971 165.372 150.824 166.703C150.658 168.213 150.639 170.201 150.883 172.615C151.37 177.442 152.911 183.983 156.449 191.822C157.581 194.332 157.865 196.588 157.486 198.593C157.107 200.598 156.06 202.375 154.488 203.919C151.338 207.016 146.103 209.154 140.062 210.256C134.028 211.356 127.229 211.416 120.987 210.389C114.741 209.361 109.083 207.248 105.307 204.028C102.564 201.688 96.4368 198.094 90.1549 194.968C87.0095 193.403 83.8168 191.951 80.9779 190.829C78.4442 189.827 76.1771 189.082 74.4728 188.758C77.5555 186.023 80.8206 182.254 84.2556 177.45C85.447 175.784 86.5268 173.23 87.706 170.44L87.7183 170.411C88.9887 167.406 90.3843 164.106 92.1787 161.23C93.9732 158.355 96.1494 155.932 98.9645 154.656Z" fill="#D898FA"/> +<path d="M279.26 62.9004C260.943 62.9004 244.295 78.6326 237.256 87.6944C236.666 88.4547 236.848 89.5374 237.637 90.0892C246.531 96.3121 261.617 105.831 279.26 105.831C296.948 105.831 310.597 96.2644 318.637 90.0427C319.339 89.4992 319.513 88.5195 319.014 87.7852C312.86 78.7381 297.639 62.9004 279.26 62.9004Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M254.185 72.1255C246.88 77.1728 240.978 83.3507 237.474 87.8631C236.983 88.4948 237.13 89.3991 237.794 89.8639C246.684 96.084 261.709 105.556 279.26 105.556C296.85 105.556 310.435 96.042 318.469 89.8252C319.06 89.3673 319.201 88.5494 318.786 87.9399C315.724 83.4377 310.401 77.2403 303.558 72.1711C296.714 67.1013 288.37 63.1754 279.26 63.1754C270.179 63.1754 261.492 67.0767 254.185 72.1255ZM253.872 71.673C261.229 66.5901 270.025 62.6254 279.26 62.6254C288.529 62.6254 296.986 66.6183 303.885 71.7291C310.786 76.8406 316.15 83.0857 319.241 87.6306C319.825 88.4896 319.618 89.6312 318.805 90.2602C310.759 96.4869 297.046 106.106 279.26 106.106C261.525 106.106 246.377 96.5402 237.479 90.3146C236.566 89.6758 236.349 88.4145 237.039 87.5258C240.573 82.9764 246.514 76.7572 253.872 71.673Z" fill="#D898FA"/> +<path d="M277.887 96.5447C289.774 96.5447 299.41 86.9343 299.41 75.0793C299.41 72.7566 299.04 70.52 298.356 68.425C292.648 65.1441 286.178 62.9004 279.26 62.9004C271.299 62.9004 263.653 65.8722 256.975 69.9765C256.575 71.6121 256.363 73.321 256.363 75.0793C256.363 86.9343 265.999 96.5447 277.887 96.5447Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M279.108 35.6794C279.26 35.6794 279.383 35.8026 279.383 35.9544V57.2676C279.383 57.4195 279.26 57.5426 279.108 57.5426C278.956 57.5426 278.833 57.4195 278.833 57.2676V35.9544C278.833 35.8026 278.956 35.6794 279.108 35.6794Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M226.859 60.1946C226.966 60.0874 227.141 60.0874 227.248 60.1946L242.36 75.2653C242.468 75.3726 242.468 75.5464 242.36 75.6537C242.252 75.7609 242.078 75.7609 241.971 75.6537L226.859 60.583C226.751 60.4758 226.751 60.3019 226.859 60.1946Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M330.898 60.1946C330.79 60.0874 330.616 60.0874 330.508 60.1946L315.397 75.2653C315.289 75.3726 315.289 75.5464 315.397 75.6537C315.504 75.7609 315.679 75.7609 315.786 75.6537L330.898 60.583C331.005 60.4758 331.005 60.3019 330.898 60.1946Z" fill="white"/> +<path d="M271.336 219.866C271.336 242.378 253.035 260.627 230.46 260.627C207.885 260.627 189.584 242.378 189.584 219.866C189.584 197.354 207.885 179.105 230.46 179.105C253.035 179.105 271.336 197.354 271.336 219.866Z" fill="#D898FA"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M271.886 219.866C271.886 242.683 253.337 261.177 230.46 261.177C207.582 261.177 189.034 242.683 189.034 219.866C189.034 197.049 207.582 178.555 230.46 178.555C253.337 178.555 271.886 197.049 271.886 219.866ZM230.46 260.627C253.035 260.627 271.336 242.378 271.336 219.866C271.336 197.354 253.035 179.105 230.46 179.105C207.885 179.105 189.584 197.354 189.584 219.866C189.584 242.378 207.885 260.627 230.46 260.627Z" fill="#D898FA"/> +<mask id="mask0_219_16308" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="189" y="179" width="83" height="82"> +<path d="M271.336 219.866C271.336 242.378 253.035 260.627 230.46 260.627C207.885 260.627 189.584 242.378 189.584 219.866C189.584 197.354 207.885 179.105 230.46 179.105C253.035 179.105 271.336 197.354 271.336 219.866Z" fill="black"/> +</mask> +<g mask="url(#mask0_219_16308)"> +<path d="M280.419 220.063C280.419 247.686 257.963 270.079 230.262 270.079C202.561 270.079 180.105 247.686 180.105 220.063C180.105 192.44 202.561 170.047 230.262 170.047C257.963 170.047 280.419 192.44 280.419 220.063Z" fill="#D898FA"/> +<path d="M280.419 220.063C280.419 247.686 257.963 270.079 230.262 270.079C202.561 270.079 180.105 247.686 180.105 220.063C180.105 192.44 202.561 170.047 230.262 170.047C257.963 170.047 280.419 192.44 280.419 220.063Z" fill="#D898FA"/> +<path d="M242.924 205.893C252.813 205.893 258.951 202.333 261.871 199.502C262.733 198.667 264.232 198.608 264.977 199.549L274.642 211.758C275.541 212.893 274.733 214.634 273.297 214.824C268.179 215.498 260.812 217.635 256.342 222.843C249.238 231.122 237.99 220.347 229.9 220.347C221.809 220.347 220.625 228.362 213.916 235.064C207.206 241.765 200.102 224.814 196.156 218.376C192.209 211.937 207.206 214.565 216.481 214.565C225.756 214.565 220.625 210.36 211.153 209.178C201.681 207.995 198.524 203.002 203.852 200.768C209.18 198.534 227.532 205.893 242.924 205.893Z" fill="#8C3EB2"/> +<path d="M220.389 248.813C217.525 248.813 212.756 251.83 209.446 254.298C208.392 255.083 208.646 256.685 209.868 257.166L231.079 265.524C231.445 265.669 231.85 265.684 232.226 265.568L260.096 256.948C261.343 256.563 261.714 255.007 260.705 254.178C257.732 251.733 253.214 248.813 249.417 248.813C243.295 248.813 236.976 252.16 231.645 252.16C226.313 252.16 224.931 248.813 220.389 248.813Z" fill="#8C3EB2"/> +<path d="M241.545 232.871C245.336 235.846 242.248 242.268 239.084 243.924C238.86 244.042 238.605 244.092 238.356 244.044C236.185 243.627 230.271 240.232 226.98 238.654C222.593 236.551 229.261 237.077 231.894 235.675C234.526 234.273 236.631 229.016 241.545 232.871Z" fill="#8C3EB2"/> +<path d="M230.065 190.132C223.01 192.016 212.808 190.269 206.027 188.485C204.482 188.079 204.395 186.029 205.87 185.416L229.529 175.586C229.877 175.441 230.256 175.413 230.621 175.507C241.147 178.235 260.039 183.226 255.538 182.452C249.812 181.468 241.123 187.178 230.065 190.132Z" fill="#8C3EB2"/> +</g> +<path d="M230.46 145.137C230.46 131.201 241.757 119.904 255.693 119.904H329.314C343.25 119.904 354.547 131.201 354.547 145.137V145.137C354.547 159.073 343.25 170.37 329.314 170.37H255.693C241.757 170.37 230.46 159.073 230.46 145.137V145.137Z" fill="#D898FA"/> +<path d="M285.92 156.847L286.866 152.554C288.709 152.554 290.407 152.542 291.959 152.518C293.511 152.469 294.869 152.409 296.033 152.336C297.222 152.263 298.204 152.154 298.98 152.009C299.78 151.839 300.326 151.621 300.617 151.354C301.102 150.966 301.442 150.359 301.636 149.535C301.83 148.686 301.927 147.473 301.927 145.897C301.927 145.048 301.866 144.284 301.745 143.605C301.624 142.926 301.43 142.344 301.163 141.859C300.92 141.349 300.629 140.973 300.29 140.731C299.95 140.464 299.562 140.331 299.126 140.331C298.689 140.331 298.277 140.488 297.889 140.804C297.501 141.119 297.185 141.543 296.943 142.077C296.725 142.586 296.615 143.132 296.615 143.714C296.615 144.102 296.7 144.442 296.87 144.733C297.064 145.024 297.367 145.254 297.78 145.424C298.192 145.569 298.713 145.642 299.344 145.642C299.95 145.642 300.569 145.569 301.199 145.424C301.854 145.278 302.436 145.084 302.945 144.842L303.091 148.516C302.703 148.783 302.254 149.013 301.745 149.207C301.26 149.401 300.738 149.547 300.181 149.644C299.623 149.741 299.065 149.789 298.507 149.789C297.222 149.789 296.13 149.62 295.233 149.28C294.336 148.941 293.632 148.395 293.123 147.643C292.638 146.867 292.395 145.86 292.395 144.624C292.395 143.605 292.565 142.598 292.905 141.604C293.244 140.585 293.729 139.664 294.36 138.839C294.99 137.99 295.73 137.323 296.579 136.838C297.428 136.329 298.374 136.074 299.417 136.074C300.945 136.074 302.206 136.535 303.2 137.457C304.194 138.354 304.934 139.567 305.419 141.095C305.904 142.623 306.147 144.284 306.147 146.079C306.147 147.243 306.05 148.359 305.856 149.426C305.686 150.493 305.431 151.439 305.092 152.263C304.752 153.088 304.328 153.767 303.819 154.301C303.358 154.81 302.594 155.234 301.527 155.574C300.484 155.913 299.186 156.168 297.634 156.338C296.082 156.532 294.311 156.665 292.323 156.738C290.358 156.811 288.224 156.847 285.92 156.847ZM285.92 156.847C283.47 156.847 281.372 156.665 279.626 156.301C277.904 155.962 276.485 155.453 275.37 154.773C274.254 154.094 273.429 153.27 272.896 152.3C272.362 151.33 272.096 150.214 272.096 148.953C272.096 148.249 272.156 147.534 272.277 146.806C272.399 146.054 272.556 145.327 272.75 144.624C272.944 143.896 273.126 143.229 273.296 142.623L277.152 143.569C277.055 143.981 276.946 144.442 276.825 144.951C276.704 145.436 276.594 145.921 276.497 146.406C276.425 146.891 276.388 147.34 276.388 147.752C276.388 148.771 276.704 149.644 277.334 150.372C277.989 151.099 279.08 151.645 280.608 152.009C282.136 152.372 284.222 152.554 286.866 152.554L287.593 155.683L285.92 156.847ZM299.089 132.546C298.434 132.546 297.877 132.327 297.416 131.891C296.955 131.43 296.725 130.872 296.725 130.217C296.725 129.562 296.955 129.005 297.416 128.544C297.877 128.059 298.434 127.816 299.089 127.816C299.72 127.816 300.265 128.059 300.726 128.544C301.187 129.005 301.417 129.562 301.417 130.217C301.417 130.872 301.187 131.43 300.726 131.891C300.265 132.327 299.72 132.546 299.089 132.546Z" fill="white"/> +<path d="M182.55 46.0718C143.053 44.8138 129.465 80.3323 138.762 112.336C138.965 113.033 138.713 113.803 138.124 114.226C115.576 130.397 96.2419 108.391 88.4924 93.4759C77.5036 72.3258 77.9269 38.5583 101.814 25.382C131.918 8.77654 174.059 22.4791 184.198 43.7736C184.734 44.8993 183.796 46.1115 182.55 46.0718Z" fill="#8C3EB2"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M150.561 20.099C166.169 24.1215 179.328 32.9058 184.446 43.6554C185.087 45.0017 183.954 46.3916 182.542 46.3466C162.89 45.7207 149.717 54.2368 142.598 66.8658C135.47 79.5108 134.394 96.3123 139.026 112.26C139.26 113.064 138.972 113.956 138.284 114.449C132.606 118.522 127.114 120.201 121.945 120.178C116.779 120.156 111.957 118.434 107.614 115.742C98.9357 110.362 92.1357 101.085 88.2483 93.6027C82.7286 82.9788 80.0763 69.1924 81.8022 56.402C83.5287 43.6078 89.6419 31.7822 101.681 25.1412C116.808 16.7973 134.944 16.0739 150.561 20.099ZM150.424 20.6316C134.91 16.6332 116.924 17.3612 101.947 25.6228C90.0991 32.1581 84.0571 43.8044 82.3473 56.4756C80.6369 69.1505 83.2674 82.823 88.7364 93.3491C92.5985 100.783 99.3406 109.966 107.904 115.275C112.182 117.927 116.905 119.607 121.948 119.628C126.987 119.65 132.368 118.016 137.963 114.002C138.455 113.65 138.669 113.002 138.498 112.413C133.834 96.3563 134.903 79.3964 142.119 66.5957C149.344 53.779 162.713 45.1648 182.559 45.7969C183.639 45.8313 184.38 44.7968 183.95 43.8918C178.929 33.3469 165.948 24.6327 150.424 20.6316Z" fill="#D898FA"/> +<path d="M124.117 63.1457C124.1 63.5382 124.139 63.9161 124.234 64.2793C124.314 64.5867 124.425 64.841 124.567 65.0425C124.702 65.216 124.83 65.3616 124.95 65.4792C125.091 65.5616 125.182 65.627 125.225 65.6756C125.577 65.8815 125.789 66.1241 125.862 66.4035C125.877 66.4594 125.885 66.6064 125.888 66.8446C125.878 67.2651 125.7 67.6107 125.352 67.8812C125.026 68.1164 124.472 68.3369 123.69 68.5427L113.764 71.1553C113.177 71.3097 112.691 71.3331 112.305 71.2258C111.947 71.111 111.724 70.8861 111.637 70.5508C111.593 70.3832 111.588 70.1905 111.62 69.9729C111.646 69.7274 111.714 69.5304 111.824 69.3819C111.955 69.1981 112.139 68.9856 112.374 68.7445C112.755 68.3755 113.045 68.0005 113.244 67.6197C113.444 67.2389 113.55 66.6736 113.563 65.9237L113.712 62.033L107.178 63.7527L106.671 66.4391C106.465 67.5977 106.439 68.4704 106.592 69.0571C106.68 69.3924 106.809 69.6571 106.979 69.8512C107.141 70.0173 107.363 70.1828 107.645 70.3475C107.899 70.5196 108.075 70.682 108.175 70.835C108.295 70.9526 108.36 71.1445 108.37 71.4107C108.368 71.8591 108.207 72.2149 107.887 72.4781C107.589 72.706 107.063 72.9192 106.309 73.1176L100.068 74.7601C99.4259 74.9292 98.9082 74.946 98.5148 74.8107C98.1142 74.6475 97.8629 74.3703 97.7609 73.9791C97.6443 73.5321 97.7207 73.1388 97.9902 72.7992C98.2245 72.4389 98.6227 72.0206 99.1847 71.5443C99.9131 70.9047 100.478 70.3233 100.878 69.7998C101.271 69.2485 101.555 68.5618 101.728 67.7399L105.151 50.3139C105.669 47.6099 106.557 45.5249 107.816 44.0591C109.095 42.5579 111.006 41.473 113.547 40.8042C116.395 40.0546 118.753 40.0607 120.623 40.8225C122.485 41.5564 123.686 42.9571 124.225 45.0245C124.451 45.8906 124.545 46.8214 124.506 47.8168L124.117 63.1457ZM113.876 57.5116L114.172 49.5516C114.196 49.187 114.161 48.823 114.066 48.4598C113.928 47.929 113.672 47.5783 113.299 47.4077C112.947 47.2018 112.506 47.1687 111.975 47.3083C111.305 47.4847 110.784 47.8309 110.411 48.347C110.039 48.8631 109.746 49.6865 109.534 50.8172L108.012 59.0549L113.876 57.5116Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M307.557 231.755V179.105H308.107V231.755H307.557Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M329.729 205.942L285.934 205.826L285.935 205.276L329.731 205.392L329.729 205.942Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M316.708 214.79L298.392 196.525L298.781 196.137L317.097 214.402L316.708 214.79Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M298.781 214.79L317.097 196.525L316.708 196.137L298.392 214.402L298.781 214.79Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M50.6228 167.216V114.566H51.1728V167.216H50.6228Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.7949 141.403L28.9993 141.287L29.0007 140.737L72.7964 140.853L72.7949 141.403Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M59.7736 150.251L41.4573 131.986L41.8468 131.598L60.163 149.863L59.7736 150.251Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M41.8468 150.251L60.163 131.986L59.7736 131.598L41.4573 149.863L41.8468 150.251Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M56.0073 104.375C58.0229 104.375 59.6569 102.637 59.6569 100.493C59.6569 98.3493 58.0229 96.6113 56.0073 96.6113C53.9917 96.6113 52.3577 98.3493 52.3577 100.493C52.3577 102.637 53.9917 104.375 56.0073 104.375ZM56.0073 103.825C57.6877 103.825 59.1069 102.366 59.1069 100.493C59.1069 98.6206 57.6877 97.1613 56.0073 97.1613C54.3269 97.1613 52.9077 98.6206 52.9077 100.493C52.9077 102.366 54.3269 103.825 56.0073 103.825Z" fill="white"/> +<path d="M36.2993 114.566C36.2993 116.71 34.6653 118.448 32.6496 118.448C30.634 118.448 29 116.71 29 114.566C29 112.422 30.634 110.684 32.6496 110.684C34.6653 110.684 36.2993 112.422 36.2993 114.566Z" fill="white"/> +<path d="M328.513 225.689C330.529 225.689 332.163 223.951 332.163 221.807C332.163 219.663 330.529 217.925 328.513 217.925C326.498 217.925 324.864 219.663 324.864 221.807C324.864 223.951 326.498 225.689 328.513 225.689Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M323.891 246.07C323.891 249.018 321.494 251.408 318.538 251.408C315.581 251.408 313.185 249.018 313.185 246.07C313.185 243.122 315.581 240.732 318.538 240.732C321.494 240.732 323.891 243.122 323.891 246.07ZM323.341 246.07C323.341 248.713 321.192 250.858 318.538 250.858C315.884 250.858 313.735 248.713 313.735 246.07C313.735 243.427 315.884 241.282 318.538 241.282C321.192 241.282 323.341 243.427 323.341 246.07Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M72.6351 121.845V100.493H73.1851V121.845H72.6351Z" fill="white"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M81.554 111.451L64.0358 111.404L64.0372 110.854L81.5555 110.901L81.554 111.451Z" fill="white"/> +</svg> ===================================== browser/components/abouttor/jar.mn ===================================== @@ -7,3 +7,8 @@ browser.jar: content/browser/abouttor/26a1-high-voltage.svg (content/26a1-high-voltage.svg) content/browser/abouttor/2728-sparkles.svg (content/2728-sparkles.svg) content/browser/abouttor/2764-red-heart.svg (content/2764-red-heart.svg) + content/browser/abouttor/yec-2024-browse.svg (content/yec-2024-browse.svg) + content/browser/abouttor/yec-2024-fonts.css (content/yec-2024-fonts.css) + content/browser/abouttor/yec-2024-heart.svg (content/yec-2024-heart.svg) + content/browser/abouttor/yec-2024-search.svg (content/yec-2024-search.svg) + content/browser/abouttor/yec-2024-speak.svg (content/yec-2024-speak.svg) ===================================== toolkit/content/license.html ===================================== @@ -141,6 +141,7 @@ <li><a href="about:license#sctp">SCTP Licenses</a></li> <li><a href="about:license#skia">Skia License</a></li> <li><a href="about:license#snappy">Snappy License</a></li> + <li><a href="about:license#spacegrotesk">Space Grotesk Font License</a></li> <li><a href="about:license#sprintf.js">sprintf.js License</a></li> <li><a href="about:license#sunsoft">SunSoft License</a></li> <li><a href="about:license#superfasthash">SuperFastHash License</a></li> @@ -4537,6 +4538,110 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </pre> + + <hr> + + <h1><a id="spacegrotesk"></a>Space Grotesk Font License</h1> + + <p>This license applies to embedded "Space Grotesk" font in <code>browser/components/abouttor/content/yec-2024-fonts.css</code>.</p> + +<pre> +Copyright 2020 The Space Grotesk Project Authors (https://github.com/floriankarsten/space-grotesk) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. +</pre> + + <hr> <h1><a id="sprintf.js"></a>sprintf.js License</h1> ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -700,3 +700,23 @@ onion-site-saved-keys-dialog-remove-button = Remove onion-site-saved-keys-dialog-remove-all-button = Remove all onion-site-saved-keys-dialog-fetch-keys-error-message = Unable to retrieve keys from Tor onion-site-saved-keys-dialog-remove-keys-error-message = Unable to remove key + +## Year end campaign 2024. + +# In English the "SPEAK" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-0 = You have a right to SPEAK without uninvited listeners. +# In English the "BROWSE" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-1 = You have a right to BROWSE without being watched. +# In English the "SEARCH" is in all-capitals. If your locale does not use capitals, or all-capitals does not work, you may ignore this. +yec-2024-introduction-2 = You have a right to SEARCH without being followed. + +yec-2024-please-donate = Join the thousands of Tor supporters building an internet powered by privacy. Make a donation today. + +# The end date should match the end of the year 2024. +# The "$300,000" should be localised: it should be shown as USD (United States dollar) currency, but you may use numbers and formatting appropriate to your locale. +yec-2024-matched-donation = Through December 31, your gift will be matched, up to $300,000! + +yec-2024-donate-button = Donate now +# Here "Close" is a verb, referring to closing the banner. +yec-2024-close-button = + .title = Close View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7833a99… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7833a99… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 64b4b81e by Henry Wilkes at 2024-09-18T18:16:55+00:00 fixup! Firefox preference overrides. Bug 42718: Drop unused browser.tabs.firefox-view preference. - - - - - 7414b290 by Henry Wilkes at 2024-09-18T18:16:56+00:00 fixup! Bug 42037: Disable about:firefoxview page Bug 42718: Always hide the firefox view button. Also, ensure that `FirefoxViewHandler.openTab` returns early rather than throwing. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,9 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Disable the Firefox View tab (tor-browser#41876) -pref("browser.tabs.firefox-view", false, locked); - #if MOZ_UPDATE_CHANNEL == release // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity pref("browser.privatebrowsing.resetPBM.enabled", false, locked); ===================================== browser/base/content/browser.js ===================================== @@ -8079,6 +8079,11 @@ var FirefoxViewHandler = { } }, openTab(section) { + if (AppConstants.BASE_BROWSER_VERSION) { + // about:firefoxview is disabled. tor-browser#42037. + return; + } + if (!CustomizableUI.getPlacementOfWidget(this.BUTTON_ID)) { CustomizableUI.addWidgetToArea( this.BUTTON_ID, ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -747,17 +747,28 @@ /* Firefox View button and menu item */ -:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, -:root[privatebrowsingmode]:not([firefoxviewhidden]) :is( +/* about:firefoxview is disabled in Base Browser. See tor-browser#42037. + * Therefore we always hide #firefox-view-button, regardless of private + * browsing. Here we only want to draw the border if there is a non-hidden + * toolbar item before the tabs. + * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +:root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) -) + #tabbrowser-tabs { +) ~ #tabbrowser-tabs { border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent); padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px); margin-inline-start: 2px; } -:root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) { +/* about:firefoxview is disabled in Base Browser. Always hide the toolbar button + * and menu item regardless of private browsing. See tor-browser#42037. + * NOTE: We also hide #wrapper-firefox-view-button, which is used during + * customization. + * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +#firefox-view-button, #wrapper-firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/a6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 1de422d9 by Henry Wilkes at 2024-09-18T18:16:06+00:00 fixup! Firefox preference overrides. Bug 42718: Drop unused browser.tabs.firefox-view preference. - - - - - 9507b27a by Henry Wilkes at 2024-09-18T18:16:06+00:00 fixup! Bug 42037: Disable about:firefoxview page Bug 42718: Always hide the firefox view button. Also, ensure that `FirefoxViewHandler.openTab` returns early rather than throwing. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,9 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Disable the Firefox View tab (tor-browser#41876) -pref("browser.tabs.firefox-view", false, locked); - #if MOZ_UPDATE_CHANNEL == release // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity pref("browser.privatebrowsing.resetPBM.enabled", false, locked); ===================================== browser/base/content/browser.js ===================================== @@ -8077,6 +8077,11 @@ var FirefoxViewHandler = { } }, openTab(section) { + if (AppConstants.BASE_BROWSER_VERSION) { + // about:firefoxview is disabled. tor-browser#42037. + return; + } + if (!CustomizableUI.getPlacementOfWidget(this.BUTTON_ID)) { CustomizableUI.addWidgetToArea( this.BUTTON_ID, ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -747,17 +747,28 @@ /* Firefox View button and menu item */ -:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, -:root[privatebrowsingmode]:not([firefoxviewhidden]) :is( +/* about:firefoxview is disabled in Base Browser. See tor-browser#42037. + * Therefore we always hide #firefox-view-button, regardless of private + * browsing. Here we only want to draw the border if there is a non-hidden + * toolbar item before the tabs. + * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +:root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) -) + #tabbrowser-tabs { +) ~ #tabbrowser-tabs { border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent); padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px); margin-inline-start: 2px; } -:root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) { +/* about:firefoxview is disabled in Base Browser. Always hide the toolbar button + * and menu item regardless of private browsing. See tor-browser#42037. + * NOTE: We also hide #wrapper-firefox-view-button, which is used during + * customization. + * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +#firefox-view-button, #wrapper-firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d72c29… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d72c29… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Firefox preference overrides.
by morgan (＠morgan) 18 Sep '24

18 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: c28ee632 by Henry Wilkes at 2024-09-18T18:05:17+00:00 fixup! Firefox preference overrides. Bug 42718: Drop unused browser.tabs.firefox-view preference. - - - - - 4869b835 by Henry Wilkes at 2024-09-18T18:05:17+00:00 fixup! Bug 42037: Disable about:firefoxview page Bug 42718: Always hide the firefox view button. Also, ensure that `FirefoxViewHandler.openTab` returns early rather than throwing. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/themes/shared/tabbrowser/tabs.css Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,9 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Disable the Firefox View tab (tor-browser#41876) -pref("browser.tabs.firefox-view", false, locked); - #if MOZ_UPDATE_CHANNEL == release // tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity pref("browser.privatebrowsing.resetPBM.enabled", false, locked); ===================================== browser/base/content/browser.js ===================================== @@ -8121,6 +8121,11 @@ var FirefoxViewHandler = { } }, openTab(section) { + if (AppConstants.BASE_BROWSER_VERSION) { + // about:firefoxview is disabled. tor-browser#42037. + return; + } + if (!CustomizableUI.getPlacementOfWidget(this.BUTTON_ID)) { CustomizableUI.addWidgetToArea( this.BUTTON_ID, ===================================== browser/themes/shared/tabbrowser/tabs.css ===================================== @@ -747,17 +747,28 @@ /* Firefox View button and menu item */ -:root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, -:root[privatebrowsingmode]:not([firefoxviewhidden]) :is( +/* about:firefoxview is disabled in Base Browser. See tor-browser#42037. + * Therefore we always hide #firefox-view-button, regardless of private + * browsing. Here we only want to draw the border if there is a non-hidden + * toolbar item before the tabs. + * NOTE: Expect merge conflict from bugzilla bug 1917595 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +:root :is( toolbarbutton:not(#firefox-view-button), toolbarpaletteitem:not(#wrapper-firefox-view-button) -) + #tabbrowser-tabs { +) ~ #tabbrowser-tabs { border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent); padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px); margin-inline-start: 2px; } -:root[privatebrowsingmode] :is(#firefox-view-button, #menu_openFirefoxView) { +/* about:firefoxview is disabled in Base Browser. Always hide the toolbar button + * and menu item regardless of private browsing. See tor-browser#42037. + * NOTE: We also hide #wrapper-firefox-view-button, which is used during + * customization. + * NOTE: Expect merge conflict from bugzilla bug 1903812 and bug 1917599. In + * these cases we want to keep our selector as-is. */ +#firefox-view-button, #wrapper-firefox-view-button, #menu_openFirefoxView { display: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/06801c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/06801c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 42220: Allow for more file types to be forced-inline.
by Pier Angelo Vendrame (＠pierov) 18 Sep '24

18 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: a64e84bc by Pier Angelo Vendrame at 2024-09-18T15:37:35+02:00 Bug 42220: Allow for more file types to be forced-inline. Firefox allows to open some files in the browser without any confirmation, but this will result in a disk leak, because the file will be downloaded to the temporary directory first (and not deleted, in some cases). A preference allows PDFs to be opened without being downloaded to disk. So, we introduce a similar one to do the same for all the files that are set to be opened automatically in the browser. - - - - - 2 changed files: - modules/libpref/init/StaticPrefList.yaml - uriloader/base/nsURILoader.cpp Changes: ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -1446,6 +1446,12 @@ value: false mirror: always +# tor-browser#42220 +- name: browser.download.ignore_content_disposition + type: bool + value: true + mirror: always + # See bug 1811830 - name: browser.download.force_save_internally_handled_attachments type: bool ===================================== uriloader/base/nsURILoader.cpp ===================================== @@ -292,34 +292,42 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) { LOG((" forceExternalHandling: %s", forceExternalHandling ? "yes" : "no")); if (forceExternalHandling && - mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline()) { + (mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline() || + mozilla::StaticPrefs::browser_download_ignore_content_disposition())) { // Check if this is a PDF which should be opened internally. We also handle // octet-streams that look like they might be PDFs based on their extension. bool isPDF = mContentType.LowerCaseEqualsASCII(APPLICATION_PDF); - if (!isPDF && - (mContentType.LowerCaseEqualsASCII(APPLICATION_OCTET_STREAM) || - mContentType.IsEmpty())) { + nsAutoCString ext; + if (mContentType.LowerCaseEqualsASCII(APPLICATION_OCTET_STREAM) || + mContentType.IsEmpty()) { nsAutoString flname; aChannel->GetContentDispositionFilename(flname); - isPDF = StringEndsWith(flname, u".pdf"_ns); - if (!isPDF) { + if (!flname.IsEmpty()) { + int32_t extStart = flname.RFindChar(u'.'); + if (extStart != kNotFound) { + CopyUTF16toUTF8(Substring(flname, extStart + 1), ext); + } + } + if (ext.IsEmpty() || (!mozilla::StaticPrefs:: + browser_download_ignore_content_disposition() && + !ext.EqualsLiteral("pdf"))) { nsCOMPtr<nsIURI> uri; aChannel->GetURI(getter_AddRefs(uri)); nsCOMPtr<nsIURL> url(do_QueryInterface(uri)); if (url) { - nsAutoCString ext; url->GetFileExtension(ext); - isPDF = ext.EqualsLiteral("pdf"); } } + isPDF = ext.EqualsLiteral("pdf"); } - // For a PDF, check if the preference is set that forces attachments to be - // opened inline. If so, treat it as a non-attachment by clearing - // 'forceExternalHandling' again. This allows it open a PDF directly - // instead of downloading it first. It may still end up being handled by - // a helper app depending anyway on the later checks. - if (isPDF) { + // One of the preferences to forces attachments to be opened inline is set. + // If so, treat it as a non-attachment by clearing 'forceExternalHandling' + // again. This allows it open a file directly instead of downloading it + // first. It may still end up being handled by a helper app depending anyway + // on the later checks. + if (mozilla::StaticPrefs::browser_download_ignore_content_disposition() || + isPDF) { nsCOMPtr<nsILoadInfo> loadInfo; aChannel->GetLoadInfo(getter_AddRefs(loadInfo)); @@ -328,8 +336,13 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) { nsCOMPtr<nsIMIMEService> mimeSvc( do_GetService(NS_MIMESERVICE_CONTRACTID)); NS_ENSURE_TRUE(mimeSvc, NS_ERROR_FAILURE); - mimeSvc->GetFromTypeAndExtension(nsLiteralCString(APPLICATION_PDF), ""_ns, - getter_AddRefs(mimeInfo)); + if (isPDF) { + mimeSvc->GetFromTypeAndExtension(nsLiteralCString(APPLICATION_PDF), + ""_ns, getter_AddRefs(mimeInfo)); + } else { + mimeSvc->GetFromTypeAndExtension(mContentType, ext, + getter_AddRefs(mimeInfo)); + } if (mimeInfo) { int32_t action = nsIMIMEInfo::saveToDisk; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a64… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/a64… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] Bug 42220: Allow for more file types to be forced-inline.
by Pier Angelo Vendrame (＠pierov) 18 Sep '24

18 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: d72c2984 by Pier Angelo Vendrame at 2024-09-18T15:36:07+02:00 Bug 42220: Allow for more file types to be forced-inline. Firefox allows to open some files in the browser without any confirmation, but this will result in a disk leak, because the file will be downloaded to the temporary directory first (and not deleted, in some cases). A preference allows PDFs to be opened without being downloaded to disk. So, we introduce a similar one to do the same for all the files that are set to be opened automatically in the browser. - - - - - 2 changed files: - modules/libpref/init/StaticPrefList.yaml - uriloader/base/nsURILoader.cpp Changes: ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -1446,6 +1446,12 @@ value: false mirror: always +# tor-browser#42220 +- name: browser.download.ignore_content_disposition + type: bool + value: true + mirror: always + # See bug 1811830 - name: browser.download.force_save_internally_handled_attachments type: bool ===================================== uriloader/base/nsURILoader.cpp ===================================== @@ -292,34 +292,42 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) { LOG((" forceExternalHandling: %s", forceExternalHandling ? "yes" : "no")); if (forceExternalHandling && - mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline()) { + (mozilla::StaticPrefs::browser_download_open_pdf_attachments_inline() || + mozilla::StaticPrefs::browser_download_ignore_content_disposition())) { // Check if this is a PDF which should be opened internally. We also handle // octet-streams that look like they might be PDFs based on their extension. bool isPDF = mContentType.LowerCaseEqualsASCII(APPLICATION_PDF); - if (!isPDF && - (mContentType.LowerCaseEqualsASCII(APPLICATION_OCTET_STREAM) || - mContentType.IsEmpty())) { + nsAutoCString ext; + if (mContentType.LowerCaseEqualsASCII(APPLICATION_OCTET_STREAM) || + mContentType.IsEmpty()) { nsAutoString flname; aChannel->GetContentDispositionFilename(flname); - isPDF = StringEndsWith(flname, u".pdf"_ns); - if (!isPDF) { + if (!flname.IsEmpty()) { + int32_t extStart = flname.RFindChar(u'.'); + if (extStart != kNotFound) { + CopyUTF16toUTF8(Substring(flname, extStart + 1), ext); + } + } + if (ext.IsEmpty() || (!mozilla::StaticPrefs:: + browser_download_ignore_content_disposition() && + !ext.EqualsLiteral("pdf"))) { nsCOMPtr<nsIURI> uri; aChannel->GetURI(getter_AddRefs(uri)); nsCOMPtr<nsIURL> url(do_QueryInterface(uri)); if (url) { - nsAutoCString ext; url->GetFileExtension(ext); - isPDF = ext.EqualsLiteral("pdf"); } } + isPDF = ext.EqualsLiteral("pdf"); } - // For a PDF, check if the preference is set that forces attachments to be - // opened inline. If so, treat it as a non-attachment by clearing - // 'forceExternalHandling' again. This allows it open a PDF directly - // instead of downloading it first. It may still end up being handled by - // a helper app depending anyway on the later checks. - if (isPDF) { + // One of the preferences to forces attachments to be opened inline is set. + // If so, treat it as a non-attachment by clearing 'forceExternalHandling' + // again. This allows it open a file directly instead of downloading it + // first. It may still end up being handled by a helper app depending anyway + // on the later checks. + if (mozilla::StaticPrefs::browser_download_ignore_content_disposition() || + isPDF) { nsCOMPtr<nsILoadInfo> loadInfo; aChannel->GetLoadInfo(getter_AddRefs(loadInfo)); @@ -328,8 +336,13 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest* request) { nsCOMPtr<nsIMIMEService> mimeSvc( do_GetService(NS_MIMESERVICE_CONTRACTID)); NS_ENSURE_TRUE(mimeSvc, NS_ERROR_FAILURE); - mimeSvc->GetFromTypeAndExtension(nsLiteralCString(APPLICATION_PDF), ""_ns, - getter_AddRefs(mimeInfo)); + if (isPDF) { + mimeSvc->GetFromTypeAndExtension(nsLiteralCString(APPLICATION_PDF), + ""_ns, getter_AddRefs(mimeInfo)); + } else { + mimeSvc->GetFromTypeAndExtension(mContentType, ext, + getter_AddRefs(mimeInfo)); + } if (mimeInfo) { int32_t action = nsIMIMEInfo::saveToDisk; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d72c298… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d72c298… You're receiving this email because of your account on gitlab.torproject.org.

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2024