This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser.

The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 36cc3d000b90 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 36cc3d000b90 is described below

commit 36cc3d000b9044a299b683bf115dff9c77569594 Author: Henry Wilkes henry@torproject.org AuthorDate: Thu Oct 6 12:54:24 2022 +0100

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Make the connection settings button markup more consistent with each other and the mozilla-central settings. --- .../torpreferences/content/connectionPane.js | 20 ++++----- .../torpreferences/content/connectionPane.xhtml | 48 +++++++++++----------- .../torpreferences/content/torPreferences.css | 12 ------ 3 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index ff2593b57fb4..d89f42ca7613 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -821,9 +821,8 @@ const gConnectionPane = (function() { // Add a new bridge prefpane.querySelector(selectors.bridges.addHeader).textContent = TorStrings.settings.bridgeAdd; - prefpane - .querySelector(selectors.bridges.addBuiltinLabel) - .setAttribute("value", TorStrings.settings.bridgeSelectBrowserBuiltin); + prefpane.querySelector(selectors.bridges.addBuiltinLabel).textContent = + TorStrings.settings.bridgeSelectBrowserBuiltin; { const button = prefpane.querySelector( selectors.bridges.addBuiltinButton @@ -833,9 +832,8 @@ const gConnectionPane = (function() { this.onAddBuiltinBridge(); }); } - prefpane - .querySelector(selectors.bridges.requestLabel) - .setAttribute("value", TorStrings.settings.bridgeRequestFromTorProject); + prefpane.querySelector(selectors.bridges.requestLabel).textContent = + TorStrings.settings.bridgeRequestFromTorProject; { const button = prefpane.querySelector(selectors.bridges.requestButton); button.setAttribute("label", TorStrings.settings.bridgeRequest); @@ -843,9 +841,8 @@ const gConnectionPane = (function() { this.onRequestBridge(); }); } - prefpane - .querySelector(selectors.bridges.enterLabel) - .setAttribute("value", TorStrings.settings.bridgeEnterKnown); + prefpane.querySelector(selectors.bridges.enterLabel).textContent = + TorStrings.settings.bridgeEnterKnown; { const button = prefpane.querySelector(selectors.bridges.enterButton); button.setAttribute("label", TorStrings.settings.bridgeAddManually); @@ -905,9 +902,8 @@ const gConnectionPane = (function() { }

// Tor logs - prefpane - .querySelector(selectors.advanced.torLogsLabel) - .setAttribute("value", TorStrings.settings.showTorDaemonLogs); + prefpane.querySelector(selectors.advanced.torLogsLabel).textContent = + TorStrings.settings.showTorDaemonLogs; const torLogsButton = prefpane.querySelector( selectors.advanced.torLogsButton ); diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml index 82738723ae21..dded590fe0e7 100644 --- a/browser/components/torpreferences/content/connectionPane.xhtml +++ b/browser/components/torpreferences/content/connectionPane.xhtml @@ -88,7 +88,7 @@ <menulist id="torPreferences-bridges-location"> <menupopup id="torPreferences-bridges-locationEntries"/> </menulist> - <button id="torPreferences-bridges-buttonChooseBridgeForMe" class="torMarginFix primary"/> + <button id="torPreferences-bridges-buttonChooseBridgeForMe" class="primary"/> </hbox> <html:h2 id="torPreferences-currentBridges-header"> <html:span id="torPreferences-currentBridges-headerText"/> @@ -120,7 +120,7 @@ </box> <description class="torPreferences-bridgeCard-share"></description> <hbox class="torPreferences-bridgeCard-addrBox"> - <html:input class="torPreferences-bridgeCard-addr torMarginFix stop-click" type="text" readonly="readonly"/> + <html:input class="torPreferences-bridgeCard-addr stop-click" type="text" readonly="readonly"/> </hbox> <hbox class="torPreferences-bridgeCard-learnMoreBox" align="center"> <label class="torPreferences-bridgeCard-learnMore learnMore text-link stop-click" is="text-link"/> @@ -137,19 +137,19 @@ </vbox> <html:h2 id="torPreferences-addBridge-header"></html:h2> <hbox align="center"> - <label id="torPreferences-addBridge-labelBuiltinBridge"/> - <space flex="1"/> - <button id="torPreferences-addBridge-buttonBuiltinBridge" class="torMarginFix"/> + <label id="torPreferences-addBridge-labelBuiltinBridge" flex="1"/> + <button id="torPreferences-addBridge-buttonBuiltinBridge" + class="accessory-button"/> </hbox> <hbox align="center"> - <label id="torPreferences-addBridge-labelRequestBridge"/> - <space flex="1"/> - <button id="torPreferences-addBridge-buttonRequestBridge" class="torMarginFix"/> + <label id="torPreferences-addBridge-labelRequestBridge" flex="1"/> + <button id="torPreferences-addBridge-buttonRequestBridge" + class="accessory-button"/> </hbox> <hbox align="center"> - <label id="torPreferences-addBridge-labelEnterBridge"/> - <space flex="1"/> - <button id="torPreferences-addBridge-buttonEnterBridge" class="torMarginFix"/> + <label id="torPreferences-addBridge-labelEnterBridge" flex="1"/> + <button id="torPreferences-addBridge-buttonEnterBridge" + class="accessory-button"/> </hbox> </groupbox>

@@ -162,20 +162,18 @@ <groupbox id="torPreferences-advanced-group" data-category="paneConnection" hidden="true"> - <box id="torPreferences-advanced-grid"> - <hbox id="torPreferences-advanced-hbox" align="center"> - <label id="torPreferences-advanced-label"/> - </hbox> - <hbox align="center"> - <button id="torPreferences-advanced-button"/> - </hbox> - <hbox id="torPreferences-torDaemon-hbox" align="center"> - <label id="torPreferences-torLogs"/> - </hbox> - <hbox align="center" data-subcategory="viewlogs"> - <button id="torPreferences-buttonTorLogs"/> - </hbox> - </box> + <hbox align="center"> + <label id="torPreferences-advanced-label" flex="1"/> + <button id="torPreferences-advanced-button" + class="accessory-button"/> + </hbox> + <hbox align="center"> + <label id="torPreferences-torLogs" flex="1"/> + <vbox data-subcategory="viewlogs"> + <button id="torPreferences-buttonTorLogs" + class="accessory-button"/> + </vbox> + </hbox> </groupbox>

<html:div id="bridge-remove-overlay" class="hidden"> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 388d8bb4c152..a9ab8543c01e 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -434,18 +434,6 @@ input.torPreferences-bridgeCard-addr { }

/* Advanced Settings */ -#torPreferences-advanced-grid { - display: grid; - grid-template-columns: 1fr auto; -} - -#torPreferences-advanced-group button { - min-width: 150px; -} - -#torPreferences-advanced-hbox, #torPreferences-torDaemon-hbox { - padding-inline-end: 15px; -}

h3#torPreferences-requestBridge-header { margin: 0;