GitLab

at 2026-01-27T17:42:31+00:00

dropme! MB 37: Customization for the about dialog

TB 44522: Revert mullvad-browser changes to aboutDialog.xhtml.

BB 44522: Modify the about dialog.

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

(cherry picked from commit 06d6d7b068b6d6d9346567e3ddb44982e1aae9ca)

Co-authored-by: Henry Wilkes <henry@torproject.org>
fixup! MB 37: Customization for the about dialog

TB 44522: Reapply the mullvad-browser changes.

Also fixes mullvad-browser#502.

fixup! MB 1: Mullvad Browser branding

TB 44522: Simplify branding aboutDialog.css since most changes were
moved to Base Browser.

fixup! Mullvad Browser strings

MB 502: Add missing "Privacy Policy" string.

   }

 }

+/* #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;

 }

     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;

+}
         data-l10n-id="aboutDialog-title"

 #endif

         role="dialog"

-        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"

+        aria-describedby="version distribution distributionId mullvadBrowserDesc trademark"

         >

 #ifdef XP_MACOSX

 #include macWindow.inc.xhtml

               <!-- This HBOX is duplicated above without class="update" -->

               <hbox align="baseline">

                 <label id="version" class="update"/>

-                <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>

               </hbox>

-              <description class="text-blurb" hidden="true">

-                <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 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" hidden="true" data-l10n-id="aboutdialog-help-user"/>

+                <label id="submit-feedback" is="text-link" hidden="true" data-l10n-id="aboutdialog-submit-feedback"/>

               </description>

             </vbox>

 #endif

               <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>

             </description>

           </vbox>

-          <description class="text-blurb" data-l10n-id="mullvad-about-desc">

+          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">

+            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;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&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>

+          </description>

+          <description class="text-blurb" id="mullvadBrowserDesc" data-l10n-id="mullvad-about-desc">

             <label is="text-link" href="https://mullvad.net" data-l10n-name="mullvad-about-mullvadLink"/>

             <label is="text-link" href="https://www.torproject.org" data-l10n-name="mullvad-about-torProjectLink"/>

           </description>

     </hbox>

     <vbox id="bottomBox">

       <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" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>

-        <label is="text-link" class="bottom-link" href="https://mullvad.net/en/help/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>

-        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:telemetry" data-l10n-id="mullvad-about-telemetryLink"/>

+        <label is="text-link" class="bottom-link visible-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&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>

+        <label is="text-link" class="bottom-link visible-bottom-link" href="https://mullvad.net/en/help/privacy-policy/" data-l10n-id="mullvad-about-privacy-policy"/>

+        <label is="text-link" class="bottom-link visible-bottom-link" useoriginprincipal="true" href="about:telemetry" data-l10n-id="mullvad-about-telemetryLink"/>

       </hbox>

       <description id="trademark" data-l10n-id="trademarkInfo"></description>

     </vbox>

  * 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/. */

-#aboutDialogContainer {

-  background-color: #0b2138;

-  color: #fff;

-  color-scheme: dark;

+:root {

+  --about-dialog-background-color: #0b2138;

+  --about-dialog-text-color: #fff;

+  --about-dialog-color-scheme: dark;

+  --about-dialog-background-color-bottom: rgba(0, 0, 0, 0.2);

+  --about-dialog-text-color-trademark: #999999;

 }

 #rightBox {

-  margin-inline: 30px;

-  background-size: auto;

   /* Increase the default width to fit the about-wordmark.svg width. */

   width: 559px;

 }
-

-#bottomBox {

-  background-color: rgba(0, 0, 0, 0.2);

-  padding: 15px 10px 15px;

-}

-

-#trademark {

-  font-size: xx-small;

-  text-align: center;

-  color: #999999;

-  margin-block: 10px;

-}
  * 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/. */

-#aboutDialogContainer {

-  background-color: #0b2138;

-  color: #fff;

-  color-scheme: dark;

+:root {

+  --about-dialog-background-color: #0b2138;

+  --about-dialog-text-color: #fff;

+  --about-dialog-color-scheme: dark;

+  --about-dialog-background-color-bottom: rgba(0, 0, 0, 0.2);

+  --about-dialog-text-color-trademark: #999999;

 }

 #rightBox {

-  margin-inline: 30px;

-  background-size: auto;

   /* Increase the default width to fit the about-wordmark.svg width. */

   width: 601px;

 }
-

-#bottomBox {

-  background-color: rgba(0, 0, 0, 0.2);

-  padding: 15px 10px 15px;

-}

-

-#trademark {

-  font-size: xx-small;

-  text-align: center;

-  color: #999999;

-  margin-block: 10px;

-}
  * 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/. */

-#aboutDialogContainer {

-  background-color: #0b2138;

-  color: #fff;

-  color-scheme: dark;

-}

-

-#rightBox {

-  margin-inline: 30px;

-  background-size: auto;

-}

-

-#bottomBox {

-  background-color: rgba(0, 0, 0, 0.2);

-  padding: 15px 10px 15px;

-}

-

-#trademark {

-  font-size: xx-small;

-  text-align: center;

-  color: #999999;

-  margin-block: 10px;

+:root {

+  --about-dialog-background-color: #0b2138;

+  --about-dialog-text-color: #fff;

+  --about-dialog-color-scheme: dark;

+  --about-dialog-background-color-bottom: rgba(0, 0, 0, 0.2);

+  --about-dialog-text-color-trademark: #999999;

 }
 #   $emailAddress (String) - The email address of Mullvad's support

 mullvad-about-feedback2 = Help & feedback: { $emailAddress }

 mullvad-about-telemetryLink = Telemetry

+mullvad-about-privacy-policy = Privacy Policy

 ## Mullvad browser home page.

henry pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

6 changed files:

Changes: