[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 3 commits: dropme! TB 2176: Rebrand Firefox to TorBrowser

Title: GitLab

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:

Changes:

  • browser/base/content/aboutDialog.css
    ... ... @@ -120,6 +120,10 @@
    120 120 
       }
    121 121 
     }
    122 122
    123 
    +/* #releasenotes is moved to the same line as #aboutDialogHelpLink and
    124 
    + * #submit-feedback, so we also want #aboutDialogHelpLink to have a starting
    125 
    + * margin. */
    126 
    +#releasenotes:not([hidden]) ~ #aboutDialogHelpLink,
    123 127 
     #submit-feedback {
    124 128 
       margin-inline-start: 0.9em;
    125 129 
     }
    ... ... @@ -169,3 +173,38 @@
    169 173 
         content: url("chrome://global/skin/icons/loading.svg");
    170 174 
       }
    171 175 
     }
    176 
    +
    177 
    +/* Common Base Browser rules. */
    178 
    +
    179 
    +/* Hide Firefox elements. */
    180 
    +#communityExperimentalDesc,
    181 
    +#communityDesc,
    182 
    +#contributeDesc,
    183 
    +.bottom-link:not(.visible-bottom-link) {
    184 
    +  /* NOTE: Anything hidden here should also be removed from the aria-describedby
    185 
    +   * of the dialog element. */
    186 
    +  display: none;
    187 
    +}
    188 
    +
    189 
    +#aboutDialogContainer {
    190 
    +  background-color: var(--about-dialog-background-color);
    191 
    +  color: var(--about-dialog-text-color);
    192 
    +  color-scheme: var(--about-dialog-color-scheme);
    193 
    +}
    194 
    +
    195 
    +#rightBox {
    196 
    +  background-size: auto;
    197 
    +  margin-inline: 30px;
    198 
    +}
    199 
    +
    200 
    +#bottomBox {
    201 
    +  background-color: var(--about-dialog-background-color-bottom);
    202 
    +  padding: 15px 10px 15px;
    203 
    +}
    204 
    +
    205 
    +#trademark {
    206 
    +  font-size: xx-small;
    207 
    +  text-align: center;
    208 
    +  color: var(--about-dialog-text-color-trademark);
    209 
    +  margin-block: 10px;
    210 
    +}

  • browser/base/content/aboutDialog.xhtml
    ... ... @@ -32,10 +32,6 @@
    32 32 
           rel="stylesheet"
    33 33 
           href="chrome://branding/content/aboutDialog.css"
    34 34 
         />
    35 
    -    <html:link
    36 
    -      rel="stylesheet"
    37 
    -      href="chrome://browser/content/aboutDialogTor.css"
    38 
    -    />
    39 35
    40 36 
         <html:link rel="localization" href="branding/brand.ftl"/>
    41 37 
         <html:link rel="localization" href="browser/aboutDialog.ftl"/>
    ... ... @@ -108,8 +104,9 @@
    108 104 
                     <label id="version" class="update"/>
    109 105 
                   </hbox>
    110 106 
                   <description class="text-blurb">
    111 
    -                <!-- Place release notes on the same line as the help and feedback links.
    112 
    -                   - We do not want the release notes on the same line as the version because it may overflow.
    107 
    +                <!-- Place release notes on the same line as the help and
    108 
    +                   - feedback links. We do not want the release notes on the
    109 
    +                   - same line as the version because it may overflow.
    113 110 
                        - See tor-browerr#42720. -->
    114 111 
                     <label id="releasenotes" is="text-link" hidden="true" data-l10n-id="releaseNotes-link"/>
    115 112 
                     <label id="aboutDialogHelpLink" is="text-link" data-l10n-id="aboutdialog-help-user"/>
    ... ... @@ -133,9 +130,14 @@
    133 130 
                   <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>
    134 131 
                 </description>
    135 132 
               </vbox>
    136 
    -          <!-- Keep communityDesc and contributeDesc to avoid JS errors trying to hide them -->
    137 
    -          <description class="text-blurb" id="communityDesc" hidden="true"></description>
    138 
    -          <description class="text-blurb" id="contributeDesc" hidden="true"></description>
    133 
    +          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
    134 
    +            <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"/>
    135 
    +            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
    136 
    +          </description>
    137 
    +          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
    138 
    +            <label is="text-link" href="https://foundation.mozilla.org/?form=firefox-about" data-l10n-name="helpus-donateLink"/>
    139 
    +            <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"/>
    140 
    +          </description>
    139 141 
               <description class="text-blurb" id="projectDesc" data-l10n-id="about-dialog-tor-project">
    140 142 
                 <label is="text-link" href="https://www.torproject.org/" data-l10n-name="project-link"></label>
    141 143 
               </description>
    ... ... @@ -147,10 +149,14 @@
    147 149 
           </vbox>
    148 150 
         </hbox>
    149 151 
         <vbox id="bottomBox">
    150 
    -      <hbox id="newBottom" pack="center" position="1">
    151 
    -        <label is="text-link" class="bottom-link" href="https://support.torproject.org/" data-l10n-id="about-dialog-questions-link"></label>
    152 
    -        <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/" data-l10n-id="about-dialog-grow-tor-network-link"></label>
    153 
    -        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label>
    152 
    +      <hbox pack="center">
    153 
    +        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
    154 
    +        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
    155 
    +        <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"/>
    156 
    +        <label is="text-link" class="bottom-link visible-bottom-link" href="https://support.torproject.org/" data-l10n-id="about-dialog-questions-link"></label>
    157 
    +        <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>
    158 
    +        <label is="text-link" class="bottom-link visible-bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="about-dialog-browser-license-link"></label>
    159 
    +
    154 160 
           </hbox>
    155 161 
           <description id="trademark" data-l10n-id="trademarkInfo"></description>
    156 162 
         </vbox>

  • browser/base/content/aboutDialogTor.css deleted
    1 
    -#aboutDialogContainer {
    2 
    -  background-color: #20123a;
    3 
    -  color: #fff;
    4 
    -  color-scheme: dark;
    5 
    -}
    6 
    -
    7 
    -#leftBox {
    8 
    -  background-image: url("chrome://branding/content/icon256.png");
    9 
    -  background-position-y: 0;
    10 
    -}
    11 
    -
    12 
    -#rightBox {
    13 
    -  background-size: auto;
    14 
    -  margin-inline: 30px;
    15 
    -}
    16 
    -
    17 
    -#bottomBox {
    18 
    -  background-color: hsla(235, 43%, 10%, 0.5);
    19 
    -  padding: 15px 10px 15px;
    20 
    -}
    21 
    -
    22 
    -#trademark {
    23 
    -  font-size: xx-small;
    24 
    -  text-align: center;
    25 
    -  color: #999999;
    26 
    -  margin-block: 10px;
    27 
    -}
    28 
    -
    29 
    -#releasenotes {
    30 
    -  margin-inline-end: 0.9em; /* Same as #submit-feedback */
    31 
    -}
    32 
    -
    33 
    -#contributeDesc {
    34 
    -  display: none;
    35 
    -}
    36 
    -
    37 
    -#communityDesc {
    38 
    -  display: none;
    39 
    -}
    40 
    -
    41 
    -#bottomBox > hbox:not(#newBottom) {
    42 
    -  display: none;
    43 
    -}

  • browser/base/jar.mn
    ... ... @@ -8,7 +8,6 @@ browser.jar:
    8 8 
     *       content/browser/aboutDialog.xhtml                    (content/aboutDialog.xhtml)
    9 9 
             content/browser/aboutDialog.js                (content/aboutDialog.js)
    10 10 
             content/browser/aboutDialog.css               (content/aboutDialog.css)
    11 
    -        content/browser/aboutDialogTor.css            (content/aboutDialogTor.css)
    12 11 
             content/browser/aboutRestartRequired.js       (content/aboutRestartRequired.js)
    13 12 
             content/browser/aboutRestartRequired.xhtml    (content/aboutRestartRequired.xhtml)
    14 13 
             content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)

  • browser/branding/tb-alpha/content/aboutDialog.css
    1 1 
     /* This Source Code Form is subject to the terms of the Mozilla Public
    2 2 
      * License, v. 2.0. If a copy of the MPL was not distributed with this
    3 3 
      * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    4 
    +
    5 
    +:root {
    6 
    +  --about-dialog-background-color: #20123a;
    7 
    +  --about-dialog-text-color: #fff;
    8 
    +  --about-dialog-color-scheme: dark;
    9 
    +  --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5);
    10 
    +  --about-dialog-text-color-trademark: #999999;
    11 
    +}
    12 
    +
    13 
    +#leftBox {
    14 
    +  background-image: url("chrome://branding/content/icon256.png");
    15 
    +  background-position-y: 0;
    16 
    +}

  • browser/branding/tb-nightly/content/aboutDialog.css
    1 1 
     /* This Source Code Form is subject to the terms of the Mozilla Public
    2 2 
      * License, v. 2.0. If a copy of the MPL was not distributed with this
    3 3 
      * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    4 
    +
    5 
    +:root {
    6 
    +  --about-dialog-background-color: #20123a;
    7 
    +  --about-dialog-text-color: #fff;
    8 
    +  --about-dialog-color-scheme: dark;
    9 
    +  --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5);
    10 
    +  --about-dialog-text-color-trademark: #999999;
    11 
    +}
    12 
    +
    13 
    +#leftBox {
    14 
    +  background-image: url("chrome://branding/content/icon256.png");
    15 
    +  background-position-y: 0;
    16 
    +}

  • browser/branding/tb-release/content/aboutDialog.css
    1 1 
     /* This Source Code Form is subject to the terms of the Mozilla Public
    2 2 
      * License, v. 2.0. If a copy of the MPL was not distributed with this
    3 3 
      * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
    4 
    +
    5 
    +:root {
    6 
    +  --about-dialog-background-color: #20123a;
    7 
    +  --about-dialog-text-color: #fff;
    8 
    +  --about-dialog-color-scheme: dark;
    9 
    +  --about-dialog-background-color-bottom: hsla(235, 43%, 10%, 0.5);
    10 
    +  --about-dialog-text-color-trademark: #999999;
    11 
    +}
    12 
    +
    13 
    +#leftBox {
    14 
    +  background-image: url("chrome://branding/content/icon256.png");
    15 
    +  background-position-y: 0;
    16 
    +}

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d9ea46270a195730339bbe16506dfe3bcbe999ba...71e62679f52a3c1fa963858d7df107ce868751ee at 1769535420 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx