morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

4 changed files:

Changes:

  • browser/base/moz.build
    ... ... @@ -79,7 +79,8 @@ PERFTESTS_MANIFESTS += ["content/test/perftest.toml"]
    79 79
     DEFINES["MOZ_APP_VERSION"] = CONFIG["MOZ_APP_VERSION"]
    
    80 80
     DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
    
    81 81
     
    
    82
    -DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
    
    82
    +# Do not include the Firefox app-license.html in about:license.
    
    83
    +# tor-browser#43901.
    
    83 84
     
    
    84 85
     if CONFIG["BASE_BROWSER_UPDATE"]:
    
    85 86
         DEFINES["BASE_BROWSER_UPDATE"] = True
    

  • browser/components/about/AboutRedirector.cpp
    ... ... @@ -103,9 +103,7 @@ static const RedirEntry kRedirMap[] = {
    103 103
         {"profiling",
    
    104 104
          "chrome://devtools/content/performance-new/aboutprofiling/index.html",
    
    105 105
          nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},
    
    106
    -    {"rights", "https://www.mozilla.org/about/legal/terms/firefox/",
    
    107
    -     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    
    108
    -         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},
    
    106
    +    // Drop about:rights. tor-browser#43901.
    
    109 107
     #ifndef BASE_BROWSER_VERSION
    
    110 108
         {"robots", "chrome://browser/content/aboutRobots.xhtml",
    
    111 109
          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
    

  • browser/components/about/components.conf
    ... ... @@ -23,6 +23,7 @@ pages = [
    23 23
         'reader',
    
    24 24
         'restartrequired',
    
    25 25
         'rights',
    
    26
    +    # Removed 'rights'. tor-browser#43901.
    
    26 27
         # Removed 'robots'. tor-browser#42831.
    
    27 28
         'rulesets',
    
    28 29
         'sessionrestore',
    

  • toolkit/themes/shared/aboutLicense.css
    ... ... @@ -5,13 +5,9 @@
    5 5
     /* License Illustration */
    
    6 6
     
    
    7 7
     .license-header {
    
    8
    -  background-image: url("chrome://global/skin/illustrations/about-license.svg");
    
    9
    -  background-repeat: no-repeat;
    
    10
    -  background-position: right center;
    
    11
    -  min-height: 300px;
    
    12
    -  display: flex;
    
    13
    -  align-items: center;
    
    14
    -  padding-inline-end: 320px;
    
    8
    +  /* Adjust the header to remove the background, which is out of place without
    
    9
    +   * the app-license.html content. */
    
    10
    +  align-self: start;
    
    15 11
     }
    
    16 12
     
    
    17 13
     td:nth-child(1),