Commit bd7eea78 authored by henry's avatar henry Committed by Dan Ballard
Browse files

fixup! TB 2176: Rebrand Firefox to TorBrowser 

TB 44522: Restore Tor Browser styling.
parent 1b1ebde7

browser/base/content/aboutDialog.xhtml

+13 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
        data-l10n-id="aboutDialog-title"

#endif

        role="dialog"

        aria-describedby="version distribution distributionId trademark"

        aria-describedby="version distribution distributionId projectDesc helpDesc trademark"

        >

#ifdef XP_MACOSX

#include macWindow.inc.xhtml
@@ -36,6 +36,7 @@ 
    <html:link rel="localization" href="branding/brand.ftl"/>

    <html:link rel="localization" href="browser/aboutDialog.ftl"/>

    <html:link rel="localization" href="toolkit/global/base-browser.ftl"/>

    <html:link rel="localization" href="toolkit/global/tor-browser.ftl"/>

  </linkset>



  <html:div id="aboutDialogContainer">
@@ -137,6 +138,13 @@ 
            <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="projectDesc" data-l10n-id="about-dialog-tor-project">

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

          </description>

          <description class="text-blurb" id="helpDesc" data-l10n-id="about-dialog-help-out">

            <label is="text-link" href="https://donate.torproject.org/" data-l10n-name="donate-link"></label>

            <label is="text-link" href="https://community.torproject.org/" data-l10n-name="community-link"></label>

          </description>

        </vbox>

      </vbox>

    </hbox>
@@ -145,6 +153,10 @@ 
        <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&#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://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

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
#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

+0 −1
Original line number Diff line number Diff line
@@ -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

+13 −0
Original line number Diff line number Diff line 
/* 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

+13 −0
Original line number Diff line number Diff line 
/* 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;

}