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

Commits: fa8b538b by Henry Wilkes at 2024-08-26T15:20:44+01:00 fixup! Bug 16940: After update, load local change notes.

Bug 43081: Remove line-height for non-ASCII text.

- - - - - 157546b7 by Henry Wilkes at 2024-08-26T15:21:29+01:00 fixup! Bug 7494: Create local home page for TBB.

Bug 43081: Remove line-height.

- - - - - 6e3fb7df by Henry Wilkes at 2024-08-26T15:22:56+01:00 fixup! Bug 40458: Implement .tor.onion aliases

Bug 43081: Remove line-height for non-ASCII text.

- - - - - 60fc8a13 by Henry Wilkes at 2024-08-26T15:23:05+01:00 fixup! Bug 41600: Add a tor circuit display panel.

Bug 43081: Remove line-height.

- - - - - d9faa5a2 by Henry Wilkes at 2024-08-26T15:23:06+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 43081: Remove line-height for non-ASCII text.

- - - - -

6 changed files:

- browser/base/content/abouttbupdate/aboutTBUpdate.css - browser/base/content/abouttbupdate/aboutTBUpdate.js - browser/components/abouttor/content/aboutTor.css - browser/components/rulesets/content/aboutRulesets.css - browser/components/torcircuit/content/torCircuitPanel.css - browser/components/torpreferences/content/torPreferences.css

Changes:

===================================== browser/base/content/abouttbupdate/aboutTBUpdate.css ===================================== @@ -32,6 +32,9 @@ body > *:not([hidden]) {

.content { grid-column: 2; +} + +.content.en-US-content { font-family: monospace; line-height: 1.4; }

===================================== browser/base/content/abouttbupdate/aboutTBUpdate.js ===================================== @@ -77,6 +77,7 @@ function setContent(containerId, content, fillContent) { // Release notes are only in English. contentEl.setAttribute("lang", "en-US"); contentEl.setAttribute("dir", "ltr"); + contentEl.classList.add("en-US-content"); if (fillContent) { fillContent(contentEl, content); } else {

===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -35,7 +35,6 @@ h1 { align-items: center; gap: 16px; font-size: 40px; - line-height: 1.3; /* Used when wrapping. */ margin-block-start: 0; margin-block-end: 40px; margin-inline: 20px; @@ -79,8 +78,6 @@ body:not(.show-tor-check) #tor-check { .home-message { grid-area: message; font-weight: 400; - /* line-height and text-align are used when wrapping. */ - line-height: 1.5; text-align: center; margin-block-start: 1.6em; margin-block-end: 1em;

===================================== browser/components/rulesets/content/aboutRulesets.css ===================================== @@ -52,7 +52,6 @@ dd { padding: 0; max-width: 600px; box-sizing: border-box; - line-height: 1.4; }

hr { @@ -140,10 +139,10 @@ section { padding-inline-start: 35px; font-size: 20px; font-weight: 700; - line-height: 30px; background-image: url("chrome://browser/content/rulesets/securedrop.svg"); - background-position: 0 4px; + background-position: 0 center; background-size: 22px; + min-height: 22px; background-repeat: no-repeat; }

@@ -256,6 +255,8 @@ aside { background-color: var(--in-content-box-background); font-size: 85%; line-break: anywhere; + /* ASCII-only text, so can set line-height. */ + line-height: 1.4; }

#ruleset-edit {

===================================== browser/components/torcircuit/content/torCircuitPanel.css ===================================== @@ -95,7 +95,6 @@ }

#tor-circuit-node-list { - line-height: 2; list-style: none; padding-inline-start: var(--arrowpanel-menuitem-margin-inline); /* Do not allow an item to wrap since this would break the circuit diagram. */ @@ -104,11 +103,12 @@

.tor-circuit-node-item { /* We want the "bullets" of the list to act as the circuit diagram, and we - * also want them to be vertically aligned and scaled to the line-height of - * the list so that the different parts visually connect. + * also want them to be vertically aligned and scaled to the height of the + * list item so that the different parts visually connect. * Using list-style-image does not give us enough control over sizing the * image. So instead we use a background-image. */ padding-inline-start: 1.5em; + padding-block: 6px; background-image: url("chrome://browser/content/tor-circuit-node-middle.svg"); -moz-context-properties: fill; /* Light Gray 50 */

===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -510,7 +510,6 @@ button.spoof-button-disabled { margin: 0; /* Match the QR height if it is higher than ours. */ min-height: auto; - line-height: 1; align-self: stretch; }

@@ -694,7 +693,6 @@ button.spoof-button-disabled { .tor-bridges-lox-button { grid-area: button; margin: 0; - line-height: 1; align-self: center; }

@@ -781,7 +779,6 @@ button.spoof-button-disabled {

#tor-bridges-open-request-dialog-button { margin: 0; - line-height: 1; }

#torPreferences-bridges-location { @@ -1021,6 +1018,7 @@ groupbox#torPreferences-bridges-group textarea { #user-provide-bridge-textarea { flex: 1 0 auto; align-self: stretch; + /* Only expect ASCII input, so can set a line-height. */ line-height: 1.3; margin: 0; }

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