June 2021 - tor-commits - lists.torproject.org

[community/master] add a missing css rule
by gus＠torproject.org 22 Jun '21

22 Jun '21

commit 0fd1a15c10c9af3b66e5f5dd4fe34cac778aa29e Author: kez <kez(a)torproject.org> Date: Tue Jun 15 01:35:14 2021 -0400 add a missing css rule --- templates/blocks/slide.html | 12 ++++++++---- templates/blocks/test.html | 1 + templates/testtemplate.html | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/templates/blocks/slide.html b/templates/blocks/slide.html index 33d42e1..57158fe 100644 --- a/templates/blocks/slide.html +++ b/templates/blocks/slide.html @@ -13,16 +13,20 @@ <section class="slide-image-left" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > <h2>{{ this.title }}</h2> {% if this.image %} - <div style="display: inline-block; vertical-align: top; width: 46%; text-align: center;"><img data-src="{{ this.image }}"></div> + <div style="display: inline-block; vertical-align: top; width: 46%; float: left;"><img data-src="{{ this.image }}"></div> {% endif %} - {{ this.description }} + <div style="display: inline-block; width: 46%;"> + {{ this.description }} + </div> </section> {% elif this.slide_layout == "image_right" %} <section class="slide-image-right" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > <h2>{{ this.title }}</h2> - {{ this.description }} + <div style="display: inline-block; width: 46%;"> + {{ this.description }} + </div> {% if this.image %} - <div style="display: inline-block; vertical-align: top; width: 46%; text-align: center;"><img data-src="{{ this.image }}"></div> + <div style="display: inline-block; vertical-align: top; width: 46%; float: right;"><img data-src="{{ this.image }}"></div> {% endif %} </section> {% else %} diff --git a/templates/blocks/test.html b/templates/blocks/test.html new file mode 100644 index 0000000..eba2d81 --- /dev/null +++ b/templates/blocks/test.html @@ -0,0 +1 @@ +<h1>test</h1> diff --git a/templates/testtemplate.html b/templates/testtemplate.html new file mode 100644 index 0000000..eba2d81 --- /dev/null +++ b/templates/testtemplate.html @@ -0,0 +1 @@ +<h1>test</h1>

1 0

[community/master] Merge remote-tracking branch 'gitlab/issue-214'
by gus＠torproject.org 22 Jun '21

22 Jun '21

commit abf9d6a1019562cd2c94866e3190afb2dfa6eaff Merge: 521089a 0fd1a15 Author: gus <gus(a)torproject.org> Date: Mon Jun 21 13:24:20 2021 -0300 Merge remote-tracking branch 'gitlab/issue-214' templates/blocks/slide.html | 20 ++++++++++++++++++++ templates/blocks/test.html | 1 + templates/testtemplate.html | 1 + 3 files changed, 22 insertions(+)

1 0

[community/master] create additional slide templates for image slides
by gus＠torproject.org 22 Jun '21

22 Jun '21

commit cf4d538942e7b678c9b2aaa3b4907621562e524b Author: kez <kez(a)torproject.org> Date: Sun Jun 13 10:38:07 2021 -0400 create additional slide templates for image slides --- templates/blocks/slide.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/templates/blocks/slide.html b/templates/blocks/slide.html index 2d89823..33d42e1 100644 --- a/templates/blocks/slide.html +++ b/templates/blocks/slide.html @@ -9,6 +9,22 @@ <h5>{{ this.author }}</h5> {% endif %} </section> +{% elif this.slide_layout == "image_left" %} + <section class="slide-image-left" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > + <h2>{{ this.title }}</h2> + {% if this.image %} + <div style="display: inline-block; vertical-align: top; width: 46%; text-align: center;"><img data-src="{{ this.image }}"></div> + {% endif %} + {{ this.description }} + </section> +{% elif this.slide_layout == "image_right" %} + <section class="slide-image-right" {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > + <h2>{{ this.title }}</h2> + {{ this.description }} + {% if this.image %} + <div style="display: inline-block; vertical-align: top; width: 46%; text-align: center;"><img data-src="{{ this.image }}"></div> + {% endif %} + </section> {% else %} <section {% if this.background != "white" %} data-background-color="{{ this.background }}" {% else %} data-background-color="white" {% endif %} > <h2>{{ this.title }}</h2>

1 0

[community/master] Remove leftover test files
by gus＠torproject.org 22 Jun '21

22 Jun '21

commit d6d163dfc9692e7f6636d029d9d442a756c287a4 Author: kez <kez(a)torproject.org> Date: Mon Jun 21 16:37:36 2021 -0400 Remove leftover test files --- templates/blocks/test.html | 1 - templates/testtemplate.html | 1 - 2 files changed, 2 deletions(-) diff --git a/templates/blocks/test.html b/templates/blocks/test.html deleted file mode 100644 index eba2d81..0000000 --- a/templates/blocks/test.html +++ /dev/null @@ -1 +0,0 @@ -<h1>test</h1> diff --git a/templates/testtemplate.html b/templates/testtemplate.html deleted file mode 100644 index eba2d81..0000000 --- a/templates/testtemplate.html +++ /dev/null @@ -1 +0,0 @@ -<h1>test</h1>

1 0

[community/master] Merge branch 'issue-214'
by gus＠torproject.org 22 Jun '21

22 Jun '21

commit 84fac0c9e13a70221bff9d8e43126149300c7e84 Merge: abf9d6a d6d163d Author: gus <gus(a)torproject.org> Date: Tue Jun 22 09:22:43 2021 -0300 Merge branch 'issue-214' templates/blocks/test.html | 1 - templates/testtemplate.html | 1 - 2 files changed, 2 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40311'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit b3629abd0fcd0a1b96c13e180031d3fe3f772260 Merge: 80e97dc dac2b35 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:53:26 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40311' projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40313'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2d69c715c1fdaa4099cf0d4bc37ba36c58d68f83 Merge: b3629ab 8ec1d47 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:57:18 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40313' rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 8ec1d476c8a3b3e8a67a33964bb4e67f494efbf2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 15:14:52 2021 +0200 Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6d2a774..9a9339f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -351,7 +351,7 @@ targets: wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c - dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb + apt-get install -y -q ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit dac2b35d64153c183165d0955b0e42f502798794 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 12:14:26 2021 +0200 Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4) --- projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0d8d88c..bf3b8a4 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,8 +58,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v75.0.22 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v90.0.7 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index efbe321..93f8f5c 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -94,7 +94,7 @@ input_files: steps: list_toolchain_updates: - #git_hash: 'v74.0.1' + git_hash: 'v77.0.2' input_files: [] var: container: diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index 69c232c..b028d10 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current" # android-gradle-plugin read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) { print $1; exit; } @@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current" # android-components read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { print $1; exit; } diff --git a/projects/fenix/config b/projects/fenix/config index a25aaa0..296ab7c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -56,8 +56,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v89.1.1 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v90.0.0-beta.4 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index 0695277..c46901e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 89.0b10 - #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + git_url: https://github.com/mozilla/gecko-dev.git + # 90.0b9 + git_hash: 92485800ccb404788bfd215e59c3850b314d3905 tag_gpg_id: 0 input_files: [] var:

1 0

[torbutton/master] Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 0e79e26f682c87fbe26a42c021d9a4f72e2ae8aa Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 17 15:47:07 2021 +0200 Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped --- chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 35c786ec..6f132db8 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -15,6 +15,7 @@ and lines drawn between them to represent Tor network inter-relay connections. background-repeat: no-repeat; background-position: 0 50%; background-size: 16px auto; + min-height: 16px; -moz-context-properties: fill, fill-opacity; fill: currentColor; /* icon indent + 16px icon width + 6px description margin

1 0