tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[lego/master] Modify css and templates
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit d110f07b4e4abea653b88d112587a929fe433099 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:36:31 2019 +0100 Modify css and templates --- assets/static/css/eoy.css | 11 +++++++---- templates/navbar.html | 15 ++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/assets/static/css/eoy.css b/assets/static/css/eoy.css index fe51de5..c007402 100644 --- a/assets/static/css/eoy.css +++ b/assets/static/css/eoy.css @@ -11,6 +11,11 @@ src: url('fonts/LeagueGothic/LeagueGothic-Italic.otf'); } +/* Don't move down content w banner. Navbar isn't fixed. */ +.page { + padding-top: 0 !important; } + + .banner { background-color: #000000; z-index: 100000000000000 !important; @@ -72,18 +77,16 @@ } .banner__containter { - - position: fixed; + position: relative right: 0; left: 0; - bottom: 0; + top: 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 45%; background-repeat: no-repeat; background-size: contain; - } .eoy-sr-only { diff --git a/templates/navbar.html b/templates/navbar.html index 287e178..4474fa8 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,18 +1,19 @@ +{% include 'bottom_banner.html' %} {% if not this.color %} -<div class="container bg-primary"> - <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-primary p-4"> +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4"> {% elif this.color == 'primary' %} -<div class="container bg-primary"> - <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-primary p-4"> +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4"> {% else %} -<div class="container bg-dark"> - <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4"> +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-4"> {% endif %} <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a> - + <a href="https://donate.torproject.org/{{ '/'|url(alt=this.alt) }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> <label for="nav-toggle">

1 0

[tpo/develop] Update lego
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit b8c7f309b0bfdc47e009ab35d62d541769a0893c Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:12:38 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index eeeb665..740a29c 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit eeeb665a9b147f046fc9029b8733956982dcebc0 +Subproject commit 740a29c997e87c75f48bc58d85cc2572a35154e0

1 0

[lego/master] Update css
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 740a29c997e87c75f48bc58d85cc2572a35154e0 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:11:38 2019 +0100 Update css --- assets/static/css/eoy.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/static/css/eoy.css b/assets/static/css/eoy.css index 934f17b..fe51de5 100644 --- a/assets/static/css/eoy.css +++ b/assets/static/css/eoy.css @@ -39,10 +39,8 @@ .take-back-the-intern { color: lime; font-family: League Gothic !important; - font-style: italic; font-weight: 400 !important; text-align: left; - width: 40%; line-height: 4rem !important; right: 8px; position: relative;

1 0

[tpo/master] Remove banner again
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit a260d8f704aa341ef2938a2d0a08a328adb6c2b9 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:00:22 2019 +0100 Remove banner again --- templates/homepage.html | 1 - templates/layout.html | 1 - 2 files changed, 2 deletions(-) diff --git a/templates/homepage.html b/templates/homepage.html index 43663a7..0710d17 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -18,7 +18,6 @@ </div> </div> </div> - {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html> diff --git a/templates/layout.html b/templates/layout.html index e626e2c..ab0e998 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,7 +12,6 @@ </div> </div> </div> - {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html>

1 0

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

28 Oct '19

commit 980220d9cbda113827575018e868556ab6ad80ca 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/master] fix sajolida's pronoun link
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit 69e98c95e7f7d0b36902278a25573d667fd1dd7d 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/master] Merge branch 'master' into develop
by hiro＠torproject.org 28 Oct '19

28 Oct '19

commit a7bfcae251c944623e98c99677d6192248a1a682 Merge: 56e8a89 9cd7a57 Author: hiro <hiro(a)torproject.org> Date: Fri Sep 13 22:23:10 2019 +0200 Merge branch 'master' into develop assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files changed, 2 insertions(+), 1 deletion(-)

1 0

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

28 Oct '19

commit 9cd7a5708dee56969901a9908c85590c9b317265 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

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

28 Oct '19

commit c0e38968acb4cf2b685e7f1ea1a744e9dccad1a6 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/master] Updates with banner
by hiro＠torproject.org 28 Oct '19

28 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019