Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser

Commits: 05861e0d by Henry Wilkes at 2024-08-20T15:59:58+01:00 fixup! Bug 30237: Add v3 onion services client authentication prompt

Bug 43067: Use html:link instead of xml-stylesheet

- - - - - 57cc4697 by Henry Wilkes at 2024-08-20T16:00:44+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 43067: Use html:link instead of xml-stylesheet

- - - - -

8 changed files:

- browser/components/onionservices/content/savedKeysDialog.xhtml - browser/components/torpreferences/content/bridgeQrDialog.xhtml - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionSettingsDialog.xhtml - browser/components/torpreferences/content/loxInviteDialog.xhtml - browser/components/torpreferences/content/provideBridgeDialog.xhtml - browser/components/torpreferences/content/requestBridgeDialog.xhtml - browser/components/torpreferences/content/torLogDialog.xhtml

Changes:

===================================== browser/components/onionservices/content/savedKeysDialog.xhtml ===================================== @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!-- Copyright (c) 2020, The Tor Project, Inc. -->

-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> -<?xml-stylesheet href="chrome://browser/content/onionservices/authPreferences.css" type="text/css"?> - <window id="onionservices-savedkeys-dialog" windowtype="OnionServices:SavedKeys" @@ -13,6 +9,16 @@ data-l10n-id="onion-site-saved-keys-dialog-title"

<linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/onionservices/authPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/bridgeQrDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -11,6 +8,16 @@

<dialog id="bridgeQr-dialog" buttons="accept"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -11,6 +8,16 @@

<dialog id="torPreferences-builtinBridge-dialog" buttons="accept,cancel"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/connectionSettingsDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -11,6 +8,16 @@

<dialog id="torPreferences-connection-dialog" buttons="accept,cancel"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/loxInviteDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -19,6 +16,16 @@ </menupopup> <dialog id="lox-invite-dialog" buttons="accept"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> <html:link rel="localization"

===================================== browser/components/torpreferences/content/provideBridgeDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -14,6 +11,16 @@ class="show-entry-page"

<linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/requestBridgeDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -11,6 +8,16 @@

<dialog id="torPreferences-requestBridge-dialog" buttons="accept,cancel"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

===================================== browser/components/torpreferences/content/torLogDialog.xhtml ===================================== @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> -<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>

<window type="child" @@ -11,6 +8,16 @@

<dialog id="torPreferences-torLog-dialog" buttons="accept,extra1"> <linkset> + <html:link rel="stylesheet" href="chrome://global/skin/global.css" /> + <html:link + rel="stylesheet" + href="chrome://browser/skin/preferences/preferences.css" + /> + <html:link + rel="stylesheet" + href="chrome://browser/content/torpreferences/torPreferences.css" + /> + <html:link rel="localization" href="toolkit/global/tor-browser.ftl" /> </linkset>

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7143db9...