morgan pushed to branch tor-browser-153.5.0esr-16.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
32c5d8ee
by Henry Wilkes at 2026-10-21T17:56:24+01:00
2 changed files:
- browser/base/content/navigator-toolbox.inc.xhtml
- browser/themes/shared/identity-block/identity-block.css
Changes:
| ... | ... | @@ -214,19 +214,6 @@ |
| 214 | 214 | <image id="remote-control-icon"/>
|
| 215 | 215 | </box>
|
| 216 | 216 | |
| 217 | - <!-- We follow the surrounding code and use a
|
|
| 218 | - - <xul:box role="button"> rather than a more semantic
|
|
| 219 | - - <html:button>, <xul:button> or <xul:toolbarbutton> -->
|
|
| 220 | - <box id="tor-circuit-button"
|
|
| 221 | - role="button"
|
|
| 222 | - class="identity-box-button"
|
|
| 223 | - align="center"
|
|
| 224 | - data-l10n-id="tor-circuit-urlbar-button"
|
|
| 225 | - urlbar-slot="site-info"
|
|
| 226 | - hidden="true">
|
|
| 227 | - <image id="tor-circuit-button-icon"/>
|
|
| 228 | - </box>
|
|
| 229 | - |
|
| 230 | 217 | <box id="trust-icon-container" align="center" role="button" data-l10n-id="urlbar-identity-button" urlbar-slot="site-info">
|
| 231 | 218 | <image id="trust-icon"/>
|
| 232 | 219 | <label id="trust-label" crop="center" flex="1" data-l10n-id="urlbar-trust-icon-notsecure-label" />
|
| ... | ... | @@ -250,6 +237,17 @@ |
| 250 | 237 | class="identity-box"
|
| 251 | 238 | pageproxystate="invalid"
|
| 252 | 239 | urlbar-slot="site-info">
|
| 240 | + <!-- We follow the surrounding code and use a
|
|
| 241 | + - <xul:box role="button"> rather than a more semantic
|
|
| 242 | + - <html:button>, <xul:button> or <xul:toolbarbutton> -->
|
|
| 243 | + <box id="tor-circuit-button"
|
|
| 244 | + role="button"
|
|
| 245 | + class="identity-box-button"
|
|
| 246 | + align="center"
|
|
| 247 | + data-l10n-id="tor-circuit-urlbar-button"
|
|
| 248 | + hidden="true">
|
|
| 249 | + <image id="tor-circuit-button-icon"/>
|
|
| 250 | + </box>
|
|
| 253 | 251 | <box id="identity-icon-box"
|
| 254 | 252 | role="button"
|
| 255 | 253 | align="center"
|
| ... | ... | @@ -7,7 +7,6 @@ |
| 7 | 7 | #tracking-protection-icon-container,
|
| 8 | 8 | #identity-box,
|
| 9 | 9 | #trust-icon-container,
|
| 10 | -#tor-circuit-button,
|
|
| 11 | 10 | #urlbar-label-box {
|
| 12 | 11 | height: var(--urlbar-basic-component-size);
|
| 13 | 12 | }
|
| ... | ... | @@ -33,7 +32,9 @@ |
| 33 | 32 | |
| 34 | 33 | /* And don't show the identity icon box in this case,
|
| 35 | 34 | just permissions indication */
|
| 36 | - > #identity-icon-box {
|
|
| 35 | + /* Hide the tor circuit when the identity box is also hidden.
|
|
| 36 | + * tor-browser#45398. */
|
|
| 37 | + > :is(#identity-icon-box, #tor-circuit-button) {
|
|
| 37 | 38 | display: none;
|
| 38 | 39 | }
|
| 39 | 40 | }
|