richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits: e5dc109a by Dan Ballard at 2023-06-07T20:49:28+00:00 fixup! fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 41809: restore onion glyph in locations outside location bar
- - - - - 082bb93a by Dan Ballard at 2023-06-07T20:49:28+00:00 fixup! Bug 23247: Communicating security expectations for .onion
Bug 41809: restore onion glyph in locations outside location bar
- - - - - 1dd00f22 by Dan Ballard at 2023-06-07T20:49:28+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 41809: restore onion glyph in locations outside location bar
- - - - -
6 changed files:
- + browser/components/torpreferences/content/bridge-qr-onion-mask.svg - browser/components/torpreferences/content/torPreferences.css - browser/components/torpreferences/jar.mn - browser/themes/shared/identity-block/identity-block.css - browser/themes/shared/identity-block/onion.svg → browser/themes/shared/identity-block/onion-site.svg - browser/themes/shared/jar.inc.mn
Changes:
===================================== browser/components/torpreferences/content/bridge-qr-onion-mask.svg ===================================== @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> + <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="#000000"/> +</svg>
===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -291,7 +291,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { top: calc(50% - 8px); inset-inline-start: calc(50% - 8px);
- mask: url("chrome://browser/skin/onion.svg"); + mask: url("chrome://browser/content/torpreferences/bridge-qr-onion-mask.svg"); mask-repeat: no-repeat; mask-size: 16px; background: var(--qr-one); @@ -436,7 +436,7 @@ dialog#torPreferences-requestBridge-dialog > hbox { height: 38px; top: calc(50% - 19px); left: calc(50% - 19px); - mask: url("chrome://browser/skin/onion.svg"); + mask: url("chrome://browser/content/torpreferences/bridge-qr-onion-mask.svg"); mask-repeat: no-repeat; mask-size: 38px; background: var(--qr-one);
===================================== browser/components/torpreferences/jar.mn ===================================== @@ -17,6 +17,7 @@ browser.jar: content/browser/torpreferences/connectionPane.js (content/connectionPane.js) content/browser/torpreferences/connectionPane.xhtml (content/connectionPane.xhtml) content/browser/torpreferences/torPreferences.css (content/torPreferences.css) + content/browser/torpreferences/bridge-qr-onion-mask.svg (content/bridge-qr-onion-mask.svg) content/browser/torpreferences/bridgemoji/bridge-emojis.json (content/bridgemoji/bridge-emojis.json) content/browser/torpreferences/bridgemoji/annotations.json (content/bridgemoji/annotations.json) content/browser/torpreferences/bridgemoji/svgs/ (content/bridgemoji/svgs/*.svg)
===================================== browser/themes/shared/identity-block/identity-block.css ===================================== @@ -196,7 +196,7 @@ #identity-box[pageproxystate="valid"].onionUnknownIdentity #identity-icon, #identity-box[pageproxystate="valid"].onionVerifiedDomain #identity-icon, #identity-box[pageproxystate="valid"].onionMixedActiveBlocked #identity-icon { - list-style-image: url(chrome://browser/skin/onion.svg); + list-style-image: url(chrome://browser/skin/onion-site.svg); visibility: visible; }
===================================== browser/themes/shared/identity-block/onion.svg → browser/themes/shared/identity-block/onion-site.svg =====================================
===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -71,7 +71,7 @@ skin/classic/browser/downloads/progressmeter.css (../shared/downloads/progressmeter.css) skin/classic/browser/drm-icon.svg (../shared/drm-icon.svg) skin/classic/browser/identity-block/identity-block.css (../shared/identity-block/identity-block.css) - skin/classic/browser/onion.svg (../shared/identity-block/onion.svg) + skin/classic/browser/onion-site.svg (../shared/identity-block/onion-site.svg) skin/classic/browser/onion-slash.svg (../shared/identity-block/onion-slash.svg) skin/classic/browser/onion-warning.svg (../shared/identity-block/onion-warning.svg) skin/classic/browser/permissions.svg (../shared/identity-block/permissions.svg)
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/338b331...