diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index 115a67c96217..8498a5cfb70f 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -266,12 +266,6 @@ function init_all() { }); gotoPref().then(() => { - let helpButton = document.getElementById("helpButton"); - let helpUrl = - Services.urlFormatter.formatURLPref("app.support.baseURL") + - "preferences"; - helpButton.setAttribute("href", helpUrl); - document.getElementById("addonsButton").addEventListener("click", e => { e.preventDefault(); if (e.button >= 2) { diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml index a355a63d6474..2976864c8009 100644 --- a/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml @@ -175,7 +175,8 @@ - + diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css index 61fb985c607f..1bc1bd52f4ba 100644 --- a/browser/themes/shared/preferences/preferences.css +++ b/browser/themes/shared/preferences/preferences.css @@ -479,7 +479,7 @@ richlistitem[selected] .actionsMenu:focus-visible { margin-inline-start: 0; } -a[is="moz-support-link"] { +a[is="moz-support-link"]:not(.sidebar-footer-link) { display: inline-block; white-space: initial; } diff --git a/toolkit/content/widgets/moz-support-link/moz-support-link.mjs b/toolkit/content/widgets/moz-support-link/moz-support-link.mjs index c344bd56a40e..5fe9292cd572 100644 --- a/toolkit/content/widgets/moz-support-link/moz-support-link.mjs +++ b/toolkit/content/widgets/moz-support-link/moz-support-link.mjs @@ -51,7 +51,7 @@ export default class MozSupportLink extends HTMLAnchorElement { this.#setHref(); this.setAttribute("target", "_blank"); this.addEventListener("click", this); - if (!this.getAttribute("data-l10n-id")) { + if (!this.getAttribute("data-l10n-id") && !this.childElementCount) { document.l10n.setAttributes(this, "moz-support-link-text"); } document.l10n.translateFragment(this);