October 2019 - tor-commits - lists.torproject.org

[tpo/develop] Bug 32223: Add the ro locale for Tor Browser stable downloads
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit a7741370d2d6f415577003478f32d6f8367aa3e9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 11:06:46 2019 +0200 Bug 32223: Add the ro locale for Tor Browser stable downloads --- databags/download-alternatives.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 752985e..2ccb7d4 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -98,6 +98,10 @@ language = Polszczyzna (pl) url = /pt-BR/ language = Português Brasil(pt-BR) +[ro] +url = /ro/ +language = Română (ro) + [ru] language = Русский (ru) url = /ru/

1 0

[tpo/develop] Merge master
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit 95e62263a11bbd162f1da643f45e86f70a8c9886 Merge: 0b0aec7 ff50627 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 23:26:25 2019 +0200 Merge master .htaccess | 9 +- assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/home/png/take-back(a)3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/keys/sstevenson.txt | 79 + content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 2 + content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 91 + content/about/people/ahf/contents.lr | 2 +- content/about/people/anarcat/contents.lr | 17 + content/about/people/arma/contents.lr | 2 +- content/about/people/igt0/contents.lr | 17 - content/about/people/meejah/contents.lr | 2 + content/about/people/schneier-core/contents.lr | 15 + content/about/people/schneier/contents.lr | 13 + content/about/people/sstevenson/contents.lr | 4 + content/about/people/wshackleton/contents.lr | 20 + .../about/sponsors/DARPA-georgetown/contents.lr | 19 + .../about/sponsors/USSD-DHRL-harvard/contents.lr | 4 +- content/about/sponsors/USSD-DHRL/contents.lr | 3 +- content/about/sponsors/nsf-georgetown/contents.lr | 7 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 4 +- content/about/sponsors/otf/contents.lr | 3 +- content/download/languages/contents.lr | 2 +- content/press/new-release-tor-browser/contents.lr | 2 +- .../torbrowser/RecommendedTBBVersions/contents.lr | 16 +- databags/download-alternatives.ini | 8 + databags/versions.ini | 14 +- lego | 2 +- models/job.ini | 4 + models/person.ini | 5 + templates/contact.html | 4 +- templates/download-android.html | 10 +- templates/download-options.html | 5 + templates/download-tor.html | 10 +- templates/hero-download.html | 2 +- templates/homepage.html | 10 +- templates/jobs.html | 2 +- templates/layout.html | 9 +- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 8 +- templates/macros/people.html | 3 + templates/meta.html | 9 + 50 files changed, 8270 insertions(+), 84 deletions(-)

1 0

[tpo/develop] Updates with banner
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit 29f697caa022a74a53e4b21d6dcea8eb43e20114 Author: hiro <hiro(a)torproject.org> Date: Sat Oct 26 00:14:52 2019 +0200 Updates with banner --- lego | 2 +- templates/homepage.html | 1 + templates/layout.html | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lego b/lego index 91aeb8f..eeeb665 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 91aeb8fa5d9492c9fd2b4e86368b2409869ac66f +Subproject commit eeeb665a9b147f046fc9029b8733956982dcebc0 diff --git a/templates/homepage.html b/templates/homepage.html index 0710d17..43663a7 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -18,6 +18,7 @@ </div> </div> </div> + {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html> diff --git a/templates/layout.html b/templates/layout.html index ab0e998..e626e2c 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,6 +12,7 @@ </div> </div> </div> + {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html>

1 0

[tpo/develop] Add space between IRC and nickname
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit c258de0caf1489d6c34bff234a7175a56a705db6 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Sun Sep 15 21:19:25 2019 +0000 Add space between IRC and nickname --- templates/macros/people.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/people.html b/templates/macros/people.html index 79afc6f..1a4d7d1 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -41,7 +41,7 @@ <h6 class="nick text-primary m-0"><a href="https://pronoun.is/{{ item.pronoun }}">pronoun.is/{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} - <label class="nick text-primary">IRC:{{ item.nickname }}</label> + <label class="nick text-primary">IRC: {{ item.nickname }}</label> {% endif %} {{ item.description }} </div>

1 0

[tpo/develop] Add banner to templates
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit d118ec92946f27b81543109fbb5962f9b138b355 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:26:31 2019 +0200 Add banner to templates --- templates/homepage.html | 1 + templates/layout.html | 1 + templates/meta.html | 1 + 3 files changed, 3 insertions(+) diff --git a/templates/homepage.html b/templates/homepage.html index 25ba0ba..fd09888 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -25,4 +25,5 @@ <footer> {% include 'footer.html' %} </footer> + {% include 'bottom_banner.html' %} </body> diff --git a/templates/layout.html b/templates/layout.html index db1168f..6172b4d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -19,5 +19,6 @@ <footer> {% include 'footer.html' %} </footer> + {% include 'bottom_banner.html' %} </body> </html> diff --git a/templates/meta.html b/templates/meta.html index 8601988..04b9e93 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,6 +11,7 @@ <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> +<link rel="stylesheet" href="{{ '/static/css/digital-climate-strike/main.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/develop] 0.4.2.1-alpha is now the alpha release
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit bae229b4928c53211014d9d9b98e72eeaedb721a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 10:49:35 2019 -0400 0.4.2.1-alpha is now the alpha release --- databags/versions.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 8678372..41d128c 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -12,4 +12,5 @@ version = 9.0a6 version = 0.4.1.5 [tor-alpha] -version = 0.4.1.4-rc +version = 0.4.2.1-alpha +

1 0

[tpo/develop] Update digital climate strike banner
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit f4972e7aad4528574c222cc3ff795e5748245979 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 16 14:10:29 2019 +0200 Update digital climate strike banner --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 77fc882..09c5813 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 77fc882c7f54abb72c81d6fcd8c2fcc88e32781c +Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790

1 0

[tpo/develop] fix sajolida's pronoun link
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit ba28d5ce7651b8fa784ecd23093fae6d153bc5c2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 15 13:41:49 2019 -0400 fix sajolida's pronoun link --- content/about/people/sajolida/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index 56e6644..cddc3bc 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -8,7 +8,7 @@ name: sajolida --- nickname: sajolida --- -pronoun: https://pronoun.is/he +pronoun: he --- gpg: /static/keys/sajolida.txt ---

1 0

[tpo/develop] Add climate banner style and stuff
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit 91a80d3c1c4e70f49fbc56b77ae01f9dfc78bb32 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:22:57 2019 +0200 Add climate banner style and stuff --- assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/static/images/dcs-logo.png b/assets/static/images/dcs-logo.png new file mode 100644 index 0000000..d3bd1ff Binary files /dev/null and b/assets/static/images/dcs-logo.png differ diff --git a/lego b/lego index 3d80025..77fc882 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 +Subproject commit 77fc882c7f54abb72c81d6fcd8c2fcc88e32781c diff --git a/templates/bottom_banner.html b/templates/bottom_banner.html new file mode 120000 index 0000000..71f1dc9 --- /dev/null +++ b/templates/bottom_banner.html @@ -0,0 +1 @@ +../lego/templates/bottom_banner.html \ No newline at end of file

1 0

[lego/master] Fix banner
by hiro＠torproject.org 26 Oct '19

26 Oct '19

commit eeeb665a9b147f046fc9029b8733956982dcebc0 Author: hiro <hiro(a)torproject.org> Date: Sat Oct 26 00:12:44 2019 +0200 Fix banner --- assets/static/css/eoy.css | 21 +++++++-------------- templates/bottom_banner.html | 33 ++++++++++++++------------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/assets/static/css/eoy.css b/assets/static/css/eoy.css index 8a79113..27027ff 100644 --- a/assets/static/css/eoy.css +++ b/assets/static/css/eoy.css @@ -8,7 +8,7 @@ @font-face { font-family: League Gothic; - src: url('fonts/LeagueGothic/LeagueGothic-Italic.otf') format('otf'); + src: url('fonts/LeagueGothic/LeagueGothic-Italic.otf'); } .banner { @@ -23,6 +23,10 @@ bottom: 0; padding: 1.25rem 1.25rem 2rem; width: 100%; + background-image: url('../images/home/png/take-back(a)3x.png'); + background-position: bottom 10% right 30%; + background-repeat: no-repeat; + background-size: contain; } .footer__close { @@ -38,36 +42,25 @@ visibility: inherit; } -.take-back-monochrome-purple { - width: 533px; - height: 475px; -} - .tracking-surveillan { color: #2EF900 !important; font-family: Source Code Pro; - font-size: 18px; font-weight: 400; - line-height: 22px; text-align: left; } .take-back-the-intern { color: #2FFF00; - font-family: League Gothic; - font-size: 80px; + font-family: League Gothic !important; font-style: italic; - font-weight: 400; - line-height: 96px; + font-weight: 400 !important; text-align: left; } .give-today-and-mozi { color: #FFFFFF; font-family: Source Code Pro; - font-size: 14px; font-weight: 400; - line-height: 17px; text-align: left; } diff --git a/templates/bottom_banner.html b/templates/bottom_banner.html index 5c790e6..31c1603 100644 --- a/templates/bottom_banner.html +++ b/templates/bottom_banner.html @@ -1,29 +1,24 @@ -<div class="banner__containter banner align-middle d-flex justify-content-center"> +<div class="banner__containter banner align-middle d-flex justify-content-center p-0"> <input id="trigger" type="checkbox" title="Close banner" /> <label for="trigger" class="footer__close text-white">X</label> <span class="eoy-sr-only text-white">Close banner</span> - <div class="eoy-banner row col-12 p-5" id="banner-header" role="contentinfo"> - <div class="col-2"></div> - <div class="col-8"> - <div class="col-12 row"> - <div class="col-9"> - <div class="row"> - <p class="tracking-surveillan">Tracking, surveillance, and censorship are widespread online.</p> - </div> - <div class="row"> - <p class="take-back-the-intern">TAKE BACK THE INTERNET WITH TOR</p> - </div> - <div class="row"> - <a class="btn-lg rectangle" href="https://donate.torproject.org">DONATE NOW</a> - <p class="give-today-and-mozi ml-5">Give today, and Mozilla will match your donation.</p> - </div> + <div class="eoy-banner row col-md-12" id="banner-header" role="contentinfo"> + <div class="col-lg-2 col-md-2 col-sm-1"></div> + <div class="col-lg-8 col-md-8 col-sm-4"> + <div class="col-12 p-5"> + <div class="row"> + <h4 class="tracking-surveillan">Tracking, surveillance, and censorship are widespread online.</h4> </div> - <div class="col-3"> - <img src="{{ '/static/images/home/png/take-back(a)3x.png'|asseturl }}" alt="{{ _("Take Back The Internet") }}" /> + <div class="row"> + <h2 class="take-back-the-intern display-3">TAKE BACK THE INTERNET WITH TOR</h2> + </div> + <div class="row"> + <a class="btn-lg rectangle" href="https://donate.torproject.org">DONATE NOW</a> + <p class="give-today-and-mozi ml-5">Give today, and Mozilla will match your donation.</p> </div> </div> </div> - <div class="col-2"> + <div class="col-lg-2 col-md-2 col-sm-1"> </div> </div> </div>

1 0