Commit cc80f468 authored by henry's avatar henry
Browse files

TB 43901: Modify about:license for Tor Browser. 

We also drop about:rights.
parent a0915340

browser/base/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"] 
DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]

DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]



DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR

# Do not include the Firefox app-license.html in about:license.

# tor-browser#43901.



if CONFIG["BASE_BROWSER_UPDATE"]:

    DEFINES["BASE_BROWSER_UPDATE"] = True

browser/components/about/AboutRedirector.cpp

+1 −3
Original line number Diff line number Diff line
@@ -95,9 +95,7 @@ static const RedirEntry kRedirMap[] = { 
    {"profiling",

     "chrome://devtools/content/performance-new/aboutprofiling/index.html",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

    {"rights", "https://www.mozilla.org/about/legal/terms/firefox/",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},

// Drop about:rights. tor-browser#43901.

#ifndef BASE_BROWSER_VERSION

    {"robots", "chrome://browser/content/aboutRobots.xhtml",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

browser/components/about/components.conf

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ pages = [ 
    'reader',

    'restartrequired',

    'rights',

    # Removed 'rights'. tor-browser#43901.

    # Removed 'robots'. tor-browser#42831.

    'sessionrestore',

    'settings',

toolkit/themes/shared/aboutLicense.css

+3 −7
Original line number Diff line number Diff line
@@ -5,13 +5,9 @@ 
/* License Illustration */



.license-header {

  background-image: url("chrome://global/skin/illustrations/about-license.svg");

  background-repeat: no-repeat;

  background-position: right center;

  min-height: 300px;

  display: flex;

  align-items: center;

  padding-inline-end: 320px;

  /* Adjust the header to remove the background, which is out of place without

   * the app-license.html content. */

  align-self: start;

}



td:nth-child(1),