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

[styleguide/master] Update lego
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 589be75ad4988889de7b595d2f907d2b1693fc7f Author: gus <gus(a)torproject.org> Date: Tue Aug 31 10:26:30 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 66d0bd5..2fe962d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 66d0bd56c8c687a7c3b560a6520a8daac3f50d1e +Subproject commit 2fe962dadb1d087287e18cc5f92c0f20d3668c79

1 0

[manual/master] Update lego
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 3026382af6f431e247ba7fb86eb273054c5fdd8b Author: gus <gus(a)torproject.org> Date: Tue Aug 31 10:26:07 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 66d0bd5..2fe962d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 66d0bd56c8c687a7c3b560a6520a8daac3f50d1e +Subproject commit 2fe962dadb1d087287e18cc5f92c0f20d3668c79

1 0

[community/master] Update lego
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 2d82387830f491912393503d467e94e174978990 Author: gus <gus(a)torproject.org> Date: Tue Aug 31 10:25:32 2021 -0300 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 66d0bd5..2fe962d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 66d0bd56c8c687a7c3b560a6520a8daac3f50d1e +Subproject commit 2fe962dadb1d087287e18cc5f92c0f20d3668c79

1 0

[lego/master] Add sans-serif as a fallback for Source Sans Pro
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit a023f2b48fc13830734beddab96e07cdb0987b39 Author: kez <kez(a)torproject.org> Date: Mon Jul 12 12:22:35 2021 -0400 Add sans-serif as a fallback for Source Sans Pro sans-serif is used as the only fallback instead of the usual Helvetica, Arial, sans-serif stack since it's just a temporary fallback until the Source Sans fonts are loaded. See: tpo/web/lego#17 --- assets/scss/_tor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/_tor.scss b/assets/scss/_tor.scss index 093b4bf..ddd6d16 100644 --- a/assets/scss/_tor.scss +++ b/assets/scss/_tor.scss @@ -273,7 +273,7 @@ .display-2, .display-3, .display-4 { - font-family: Source Sans Pro Light; + font-family: 'Source Sans Pro Light', sans-serif; } .font-family-serif {

1 0

[lego/master] N #21: Add privchat to footer
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 07769a548210b2260bd696ddf01154d40c953a55 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Tue Aug 31 13:13:35 2021 +0000 N #21: Add privchat to footer --- databags/menu_footer.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini index c997390..d9bc8d2 100644 --- a/databags/menu_footer.ini +++ b/databags/menu_footer.ini @@ -13,3 +13,7 @@ label = Contact [press] path = https://www.torproject.org/press/ label = Press + +[privchat] +path = https://www.torproject.org/privchat +label = Privchat

1 0

[lego/master] Merge branch 'bug_21'
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 20509cc6b8eba69b388ef74a09e4e78fc485589b Merge: 66d0bd5 07769a5 Author: gus <gus(a)torproject.org> Date: Tue Aug 31 10:24:12 2021 -0300 Merge branch 'bug_21' assets/scss/_tor.scss | 2 +- databags/menu_footer.ini | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[lego/master] Minor fix
by gus＠torproject.org 31 Aug '21

31 Aug '21

commit 2fe962dadb1d087287e18cc5f92c0f20d3668c79 Author: gus <gus(a)torproject.org> Date: Tue Aug 31 10:24:55 2021 -0300 Minor fix --- databags/menu_footer.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini index d9bc8d2..732ad09 100644 --- a/databags/menu_footer.ini +++ b/databags/menu_footer.ini @@ -16,4 +16,4 @@ label = Press [privchat] path = https://www.torproject.org/privchat -label = Privchat +label = PrivChat

1 0

[tpo/master] Increase per_page in press to decrease pages built
by emmapeel＠torproject.org 31 Aug '21

31 Aug '21

commit 7dea5042353839f6e194305b2b75e45d81c71c99 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Mon Aug 30 21:08:35 2021 +0000 Increase per_page in press to decrease pages built --- models/press.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/press.ini b/models/press.ini index 0f30beaa..cd5e5546 100644 --- a/models/press.ini +++ b/models/press.ini @@ -34,5 +34,5 @@ slug_format = {{ ((this.pub_date) if this.pub_date) ~ "-" ~ this._id }} [pagination] enabled = yes -per_page = 10 +per_page = 25 items = site.query('/press').include_undiscoverable(true).filter(F.type == "snippet")

1 0

[tpo/master] Fix some pagination bugs
by emmapeel＠torproject.org 31 Aug '21

31 Aug '21

commit 7d2343b3aa5f09bacaf0a76444acd79d402c83dd Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Mon Aug 30 21:54:28 2021 +0000 Fix some pagination bugs 1. Page 2 only showed 4 entries 2. Second to last page also only shows 4, last pages only shows 3 --- templates/macros/pagination.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/macros/pagination.html b/templates/macros/pagination.html index cdff81d5..2d69afd6 100644 --- a/templates/macros/pagination.html +++ b/templates/macros/pagination.html @@ -9,11 +9,12 @@ {% set goback = 1 %} {% endif %} - {% if pagination.has_next %} + {% if year != oldest %} {% if pagination.for_page(pagination.page+2).has_next %} - {% set goforw = 3 %} + {% set goforw = 5-goback %} {% else %} {% set goforw = 2 %} + {% set goback = 3 %} {% endif %} {% for i in range(pagination.page-goback, pagination.page+goforw)%} @@ -28,8 +29,8 @@ {% endfor %} {% else %} - {% for i in range(pagination.page-5, pagination.page)%} - {% set yearToShow = year-(i-pagination.page+1) %} + {% for i in range(pagination.page-4, pagination.page+1)%} + {% set yearToShow = year-(i-pagination.page) %} {% if yearToShow >= oldest %} {% if i == pagination.page %} <li class="page-item active"><a class="page-link" href="{{ pagination.for_page(i)|url }}">{{ yearToShow }}</a></li>

1 0

[tpo/master] build less press pages, see
by emmapeel＠torproject.org 31 Aug '21

31 Aug '21

commit 676968ec5a1998e69e6af9eae28c44b0246ec03e Merge: 90cb27b4 7d2343b3 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Aug 31 14:49:14 2021 +0200 build less press pages, see https://gitlab.torproject.org/tpo/web/tpo/-/merge_requests/117 and https://gitlab.torproject.org/tpo/web/tpo/-/issues/75 models/press.ini | 2 +- templates/macros/pagination.html | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-)

1 0