September 2020 - tbb-commits - lists.torproject.org

[rbm/master] OSX -> macOS renaming
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 197c4c8681cd8df14ae21ce513458396583559f7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 10:54:46 2020 +0000 OSX -> macOS renaming --- lib/RBM/DefaultConfig.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 974a0e1..a4c1e5c 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -42,7 +42,7 @@ sub lsb_release { my $res = {}; if (-f '/usr/bin/sw_vers') { - # If sw_vers exists, we assume we are on OSX and use it + # If sw_vers exists, we assume we are on macOS and use it my ($stdout, $stderr, $success, $exit_code) = capture_exec('/usr/bin/sw_vers', '-productName'); RBM::exit_error("sw_vers: unknown ProductName")

1 0

[rbm/master] Bug 33289: Optimize the get_target function
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit dab4ae35aeb84ae5273a30f1fbcdcb6b6530f8ad Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 10 13:11:28 2020 +0200 Bug 33289: Optimize the get_target function We also change the behavior of the function: we stop looking after the first definition of a target. This means for example that if a target is defined as an array in rbm.conf, and also defined as a hash in the project's config, then the definition from rbm.conf will be ignored. --- lib/RBM.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b9ad1ad..c4d5a82 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -102,21 +102,17 @@ sub as_array { sub get_target { my ($project, $options, $paths, $target) = @_; - my @res; foreach my $path (@$paths) { foreach my $step ([ 'steps', $config->{step} ], []) { my $z = config_p($config, $project, $options, @$path, @$step, 'targets', $target); next unless $z; - if (ref $z eq 'HASH') { - push @res, $target unless grep { $_ eq $target } @res; - next; - } + return [ $target ] if ref $z eq 'HASH'; my @z = ref $z eq 'ARRAY' ? (@{$z}) : ($z); - push @res, map { @{get_target($project, $options, $paths, $_)} } @z; + return [ map { @{get_target($project, $options, $paths, $_)} } @z ]; } } - return \@res; + return []; } sub get_targets {

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 46345ac0bcfaf482aae7e13e16e0abb0f275f334 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:51:31 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 33fed7848596..9a3956916b98 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e +Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit a7346bbda23463f5366d6b712be5d34fd98c1457 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:41:09 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 33fed7848596..9a3956916b98 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 33fed7848596b3da7d0e66309f94fdbdc21d253e +Subproject commit 9a3956916b9897d668138dd450ad5a8be9d38e02

1 0

[torbutton/master] Bug 40008: Style fixes for 78
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9a3956916b9897d668138dd450ad5a8be9d38e02 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 17:57:06 2020 +0200 Bug 40008: Style fixes for 78 --- chrome/content/tor-circuit-display.js | 2 +- chrome/skin/tor-circuit-display.css | 41 +++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 1be4571d..4e0088f0 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -409,7 +409,7 @@ let ensureCorrectPopupDimensions = function () { let stack = document.querySelector("#identity-popup-multiView .panel-viewstack"); let view2 = document.getElementById("identity-popup-mainView"); if (view && stack && view2) { - let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)) + 10; + let newWidth = Math.max(...[...view2.children].map(el => el.clientWidth)); let newHeight = stack.clientHeight; stack.setAttribute("width", newWidth); view2.style.minWidth = view2.style.maxWidth = newWidth + "px"; diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 3c349e0c..35c786ec 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -6,30 +6,36 @@ Each bullet in the circuit node list is supposed to represent a Tor circuit node and lines drawn between them to represent Tor network inter-relay connections. */ +#circuit-display-headline { + margin: 0; +} -#circuit-display-content { +#circuit-display-header { background-image: url(chrome://torbutton/skin/torbutton.svg); - background-position: 1em 1em; background-repeat: no-repeat; - background-size: 24px auto; - background-blend-mode: overlay; - cursor: default; - padding: 0.5em 0px 0.5em; - padding-inline-end: 1em; - padding-inline-start: calc(2em + 24px); - width: 100%; + background-position: 0 50%; + background-size: 16px auto; -moz-context-properties: fill, fill-opacity; fill: currentColor; - fill-opacity: .6; + /* icon indent + 16px icon width + 6px description margin + (total of 12px margin with the native 6px description margin) */ + padding-inline: calc(2em + 22px) 1em; + /* 16px icon width + 12px margin */ + padding-inline-start: 28px; +} + +#circuit-display-header:-moz-locale-dir(rtl) { + background-position-x: right; } -#circuit-display-content:-moz-locale-dir(rtl) { - background-position: calc(100% - 1em) 1em; +#circuit-display-content { + padding-inline: 2em 1em; + padding-block: 1em; } #circuit-reload-content { cursor: default; - padding: 1em 0px 1em; + padding: 0 0 1em; padding-inline-end: 3em; padding-inline-start: calc(2em + 24px); width: 100%; @@ -47,13 +53,10 @@ and lines drawn between them to represent Tor network inter-relay connections. /* Format the circuit node list. */ ul#circuit-display-nodes { - /* font-family: Arial; */ - font-size: 16px; line-height: 26px; - /* color: black;*/ - margin-top: 4px; - margin-bottom: 2px; - padding-inline-start: 4px; + margin-top: 8px; + margin-bottom: 0; + padding-inline-start: 28px; } /* Hide default bullets, and draw our own bullets */

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit c16217700b7e3537e378d10b7ebc1c1a54f34952 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 7 21:47:56 2020 +0200 fixup! Bug 25658: Replace security slider with security level UI --- browser/components/securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index c28456d359f3..4abbb12dd856 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -4,6 +4,7 @@ orient="vertical" level="top" hidden="true" + class="panel-no-padding" onpopupshown="SecurityLevelPanel.onPopupShown(event);" onpopuphidden="SecurityLevelPanel.onPopupHidden(event);" >

1 0

[tor-browser/tor-browser-81.0b2-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9ba3edb547ca98b74a2e4986e305eb35e27eb37a Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:02:36 2020 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index fd0399cf2d0f..e32fd66ff16f 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -62,9 +62,12 @@  <hbox id="circuit-display-container" class="identity-popup-section"> - <vbox id="circuit-display-content" flex="1"> - <label id="circuit-display-headline" - class="identity-popup-headline">&torbutton.circuit_display.title;</label> + <vbox id="circuit-display-content" flex="1" role="group" + aria-labelledby="circuit-display-headline"> + <hbox id="circuit-display-header" align="center"> + <label id="circuit-display-headline" + role="heading" aria-level="2">&torbutton.circuit_display.title;</label> + </hbox> <html:ul id="circuit-display-nodes" dir="auto"/> </vbox> <vbox id="circuit-reload-content" flex="1">

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 25658: Replace security slider with security level UI
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 5ff0565d2c039b40384c40869905f51a57453b12 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 7 21:47:56 2020 +0200 fixup! Bug 25658: Replace security slider with security level UI --- browser/components/securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index c28456d359f3..4abbb12dd856 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -4,6 +4,7 @@ orient="vertical" level="top" hidden="true" + class="panel-no-padding" onpopupshown="SecurityLevelPanel.onPopupShown(event);" onpopuphidden="SecurityLevelPanel.onPopupHidden(event);" >

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/43' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 9768956ac3500385a3784d7884a34595dab6b078 Merge: c386fb331223 41a9c483bb08 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 09:21:16 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/43' into tor-browser-78.2.0esr-10.0-1 browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- .../securitylevel/content/securityLevelPanel.inc.xhtml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 41a9c483bb084d5d7bb9e5eb267c5a1374089536 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 8 18:02:36 2020 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/components/controlcenter/content/identityPanel.inc.xhtml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml index 3e0dc960a6f5..a8edda858e41 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml @@ -62,9 +62,12 @@  <hbox id="circuit-display-container" class="identity-popup-section"> - <vbox id="circuit-display-content" flex="1"> - <label id="circuit-display-headline" - class="identity-popup-headline">&torbutton.circuit_display.title;</label> + <vbox id="circuit-display-content" flex="1" role="group" + aria-labelledby="circuit-display-headline"> + <hbox id="circuit-display-header" align="center"> + <label id="circuit-display-headline" + role="heading" aria-level="2">&torbutton.circuit_display.title;</label> + </hbox> <html:ul id="circuit-display-nodes" dir="auto"/> </vbox> <vbox id="circuit-reload-content" flex="1">

1 0