tor-browser

commit 38abe2ffc40925308b153380d4c5444ce4d5e3c0
parent 07d4cb82dbf8e95ee0fafb4bc372f5b285526c2e
Author: Henry Wilkes <henry@torproject.org>
Date:   Wed, 21 Jan 2026 10:21:29 +0000

BB 44522: Modify the about dialog.

We hide the Firefox-specific elements and apply some common styling
rules.

Diffstat:
M
browser/base/content/aboutDialog.css
 | 
39
+++++++++++++++++++++++++++++++++++++++
M
browser/base/content/aboutDialog.xhtml
 | 
7
++++++-

2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
@@ -119,6 +119,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;
 }
@@ -168,3 +172,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;
+}
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
@@ -14,7 +14,7 @@
         data-l10n-id="aboutDialog-title"
 #endif
         role="dialog"
-        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"
+        aria-describedby="version distribution distributionId trademark"
         >
 #ifdef XP_MACOSX
 #include macWindow.inc.xhtml
@@ -104,6 +104,11 @@
                 <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
               </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.
+                   - 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"/>
                 <label id="submit-feedback" is="text-link" data-l10n-id="aboutdialog-submit-feedback"/>
               </description>