henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 586c93eb by Henry Wilkes at 2026-01-27T17:36:17+00:00 dropme! TB 2176: Rebrand Firefox to TorBrowser TB 44522: Revert tor-browser changes to aboutDialog.xhtml. - - - - - 06d6d7b0 by Henry Wilkes at 2026-01-27T17:36:17+00:00 BB 44522: Modify the about dialog. We hide the Firefox-specific elements and apply some common styling rules. - - - - - 71e62679 by Henry Wilkes at 2026-01-27T17:36:17+00:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 44522: Restore Tor Browser styling. - - - - - 7 changed files: - browser/base/content/aboutDialog.css - browser/base/content/aboutDialog.xhtml - − browser/base/content/aboutDialogTor.css - browser/base/jar.mn - browser/branding/tb-alpha/content/aboutDialog.css - browser/branding/tb-nightly/content/aboutDialog.css - browser/branding/tb-release/content/aboutDialog.css Changes: ===================================== browser/base/content/aboutDialog.css ===================================== @@ -120,6 +120,10 @@ } } +/* #releasenotes is moved to the same line as #aboutDialogHelpLink and + * #submit-feedback, so we also want #aboutDialogHelpLink to have a starting + * margin. */ +#releasenotes:not([hidden]) ~ #aboutDialogHelpLink, #submit-feedback { margin-inline-start: 0.9em; } @@ -169,3 +173,38 @@ content: url("chrome://global/skin/icons/loading.svg"); } } + +/* Common Base Browser rules. */ + +/* Hide Firefox elements. */ +#communityExperimentalDesc, +#communityDesc, +#contributeDesc, +.bottom-link:not(.visible-bottom-link) { + /* NOTE: Anything hidden here should also be removed from the aria-describedby + * of the dialog element. */ + display: none; +} + +#aboutDialogContainer { + background-color: var(--about-dialog-background-color); + color: var(--about-dialog-text-color); + color-scheme: var(--about-dialog-color-scheme); +} + +#rightBox { + background-size: auto; + margin-inline: 30px; +} + +#bottomBox { + background-color: var(--about-dialog-background-color-bottom); + padding: 15px 10px 15px; +} + +#trademark { + font-size: xx-small; + text-align: center; + color: var(--about-dialog-text-color-trademark); + margin-block: 10px; +} ===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -32,10 +32,6 @@ rel="stylesheet" href="chrome://branding/content/aboutDialog.css" /> - <html:link - rel="stylesheet" - href="chrome://browser/content/aboutDialogTor.css" - /> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> @@ -108,8 +104,9 @@ <label id="version" class="update"/> </hbox> <description class="text-blurb"> - <!-- Place release notes on the same line as the help and feedback links. - - We do not want the release notes on the same line as the version because it may overflow. + <!-- Place release notes on the same line as the help and + - feedback links. We do not want the release notes on the + - same line as the version because it may overflow. - See tor-browerr#42720. --> <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/> <label id="aboutDialogHelpLink" is="text-link" data-l10n-id="aboutdialog-help-user"/> @@ -133,9 +130,14 @@ <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/> </description> </vbox> - <!-- Keep communityDesc and contributeDesc to avoid JS errors trying to hide them --> - <description class="text-blurb" id="communityDesc" hidden="true"></description> - <description class="text-blurb" id="contributeDesc" hidden="true"></description> + <description class="text-blurb" id="communityDesc" data-l10n-id="community-2"> + <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/> + <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/> + </description> + <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus"> + <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/> + <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/> + </description> <description class="text-blurb" id="projectDesc" data-l10n-id="about-dialog-tor-project"> <label is="text-link" href="https://www.torproject.org/" data-l10n-name="project-link"></label> </description> @@ -147,10 +149,14 @@ </vbox> </hbox> <vbox id="bottomBox"> - <hbox id="newBottom" pack="center" position="1"> - <label is="text-link" class="bottom-link" href="https://support.torproject.org/" data-l10n-id="about-dialog-questions-link"></label> - <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/" data-l10n-id="about-dialog-grow-tor-network-link"></label> - <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label> + <hbox pack="center"> + <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/> + <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/> + <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/> + <label is="text-link" class="bottom-link visible-bottom-link" href="https://support.torproject.org/" data-l10n-id="about-dialog-questions-link"></label> + <label is="text-link" class="bottom-link visible-bottom-link" href="https://community.torproject.org/relay/" data-l10n-id="about-dialog-grow-tor-network-link"></label> + <label is="text-link" class="bottom-link visible-bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label> + </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description> </vbox> ===================================== browser/base/content/aboutDialogTor.css deleted ===================================== @@ -1,43 +0,0 @@ -#aboutDialogContainer { - background-color: #20123a; - color: #fff; - color-scheme: dark; -} - -#leftBox { - background-image: url("chrome://branding/content/icon256.png"); - background-position-y: 0; -} - -#rightBox { - background-size: auto; - margin-inline: 30px; -} - -#bottomBox { - background-color: hsla(235, 43%, 10%, 0.5); - padding: 15px 10px 15px; -} - -#trademark { - font-size: xx-small; - text-align: center; - color: #999999; - margin-block: 10px; -} - -#releasenotes { - margin-inline-end: 0.9em; /* Same as #submit-feedback */ -} - -#contributeDesc { - display: none; -} - -#communityDesc { - display: none; -} - -#bottomBox > hbox:not(#newBottom) { - display: none; -} ===================================== browser/base/jar.mn ===================================== @@ -8,7 +8,6 @@ browser.jar: * content/browser/aboutDialog.xhtml (content/aboutDialog.xhtml) content/browser/aboutDialog.js (content/aboutDialog.js) content/browser/aboutDialog.css (content/aboutDialog.css) - content/browser/aboutDialogTor.css (content/aboutDialogTor.css) content/browser/aboutRestartRequired.js (content/aboutRestartRequired.js) content/browser/aboutRestartRequired.xhtml (content/aboutRestartRequired.xhtml) content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) ===================================== browser/branding/tb-alpha/content/aboutDialog.css ===================================== @@ -1,3 +1,16 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +:root { + --about-dialog-background-color: #20123a; + --about-dialog-text-color: #fff; + --about-dialog-color-scheme: dark; + --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); + --about-dialog-text-color-trademark: #999999; +} + +#leftBox { + background-image: url("chrome://branding/content/icon256.png"); + background-position-y: 0; +} ===================================== browser/branding/tb-nightly/content/aboutDialog.css ===================================== @@ -1,3 +1,16 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +:root { + --about-dialog-background-color: #20123a; + --about-dialog-text-color: #fff; + --about-dialog-color-scheme: dark; + --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); + --about-dialog-text-color-trademark: #999999; +} + +#leftBox { + background-image: url("chrome://branding/content/icon256.png"); + background-position-y: 0; +} ===================================== browser/branding/tb-release/content/aboutDialog.css ===================================== @@ -1,3 +1,16 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +:root { + --about-dialog-background-color: #20123a; + --about-dialog-text-color: #fff; + --about-dialog-color-scheme: dark; + --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5); + --about-dialog-text-color-trademark: #999999; +} + +#leftBox { + background-image: url("chrome://branding/content/icon256.png"); + background-position-y: 0; +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d9ea462... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d9ea462... You're receiving this email because of your account on gitlab.torproject.org.