April 2020 - tor-commits - lists.torproject.org

[lego/develop] Fix banner
by hiro＠torproject.org 07 Apr '20

07 Apr '20

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

[lego/develop] Add redirect model and template
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 37611e7cfae397d5e8a8aa41ac219a41ae2b6181 Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 21:21:40 2019 +0200 Add redirect model and template --- models/redirect.ini | 7 +++++++ templates/redirect.html | 1 + 2 files changed, 8 insertions(+) diff --git a/models/redirect.ini b/models/redirect.ini new file mode 100644 index 0000000..91ea2ce --- /dev/null +++ b/models/redirect.ini @@ -0,0 +1,7 @@ +[model] +name = Redirect + +[fields.target] +label = Redirect Target +type = string +description = Target is of type 'string' to allow relative paths. Converted to url in the template. diff --git a/templates/redirect.html b/templates/redirect.html new file mode 100644 index 0000000..60560fb --- /dev/null +++ b/templates/redirect.html @@ -0,0 +1 @@ +<meta http-equiv="refresh" content="0; URL='{{ this.target|url }}'" />

1 0

[lego/develop] Update padding in bottom_banner
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 31602335de2b4a07f9bff1ce4d173b62b3b29f1f Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 21:33:13 2019 +0200 Update padding in bottom_banner --- templates/bottom_banner.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/bottom_banner.html b/templates/bottom_banner.html index be3d119..5c790e6 100644 --- a/templates/bottom_banner.html +++ b/templates/bottom_banner.html @@ -1,8 +1,8 @@ -<div class="banner__containter banner align-middle d-flex justify-content-center p-5"> +<div class="banner__containter banner align-middle d-flex justify-content-center"> <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" id="banner-header" role="contentinfo"> + <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">

1 0

[lego/develop] Update css
by hiro＠torproject.org 07 Apr '20

07 Apr '20

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

[lego/develop] Update footer
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 7dddd1b1d5bed1be4fdcd65a5261d50ed09d82f7 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:01:58 2019 +0200 Update footer --- templates/footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index e42f109..5849145 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -35,8 +35,10 @@ {% set link = site.get(item.path) %} {% if link %} <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> + {% elif item.label == "Documentation" or item.label == "Blog"} + <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link text-light" href="{{ item.path }}"> + <a class="nav-link" href="{{ item.path }}/{{this.alt}}"> {% endif %} {{ _(item.label) }} {% if this.is_child_of(item.path) %}

1 0

[lego/develop] Fix typo
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 0150af1c3b300f53fa47577b183330d478ac7662 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:03:23 2019 +0200 Fix typo --- templates/footer.html | 4 ++-- templates/navbar.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 5849145..2f9af2b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -35,10 +35,10 @@ {% set link = site.get(item.path) %} {% if link %} <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> - {% elif item.label == "Documentation" or item.label == "Blog"} + {% elif item.label == "Documentation" or item.label == "Blog" %} <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path }}/{{this.alt}}"> + <a class="nav-link" href="{{ item.path }}/{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.is_child_of(item.path) %} diff --git a/templates/navbar.html b/templates/navbar.html index a1dac26..095f42a 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -28,10 +28,10 @@ {% set link = site.get(item.path) %} {% if link %} <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> - {% elif item.label == "Documentation" or item.label == "Blog"} + {% elif item.label == "Documentation" or item.label == "Blog" %} <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path }}/{{this.alt}}"> + <a class="nav-link" href="{{ item.path }}/{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.path == item.path %}

1 0

[lego/develop] Fix templates
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit ddd5194024c719bc3088cb78fa2af7f4a87149b1 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:07:33 2019 +0200 Fix templates --- databags/menu+en.ini | 2 +- templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/menu+en.ini b/databags/menu+en.ini index e4826c0..e7a52b2 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -1,5 +1,5 @@ [about] -path = https://www.torproject.org/about/history +path = https://www.torproject.org/about/history/ label = About [documentation] diff --git a/templates/navbar.html b/templates/navbar.html index db78178..782474e 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -31,7 +31,7 @@ {% elif item.label == "Documentation" or item.label == "Blog" or item.label == "Jobs" %} <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path }}{{ this.alt }}"> + <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> {% endif %} {{ _(item.label) }} {% if this.path == item.path %}

1 0

[lego/develop] Fix templates
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit f4e63da99d97ca8840c4c842be6bdbffce5d889a Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:04:38 2019 +0200 Fix templates --- templates/footer.html | 4 ++-- templates/navbar.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 2f9af2b..438d404 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -36,9 +36,9 @@ {% if link %} <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> {% elif item.label == "Documentation" or item.label == "Blog" %} - <a class="nav-link" href="{{ item.path }}"> + <a class="nav-link text-light" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path }}/{{ this.alt }}"> + <a class="nav-link text-light" href="{{ item.path }}/{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.is_child_of(item.path) %} diff --git a/templates/navbar.html b/templates/navbar.html index 095f42a..f15f215 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -31,7 +31,7 @@ {% elif item.label == "Documentation" or item.label == "Blog" %} <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path }}/{{ this.alt }}"> + <a class="nav-link" href="{{ item.path }}{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.path == item.path %}

1 0

[lego/develop] Fix templates
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit bcc9aeb57bb61db39a8964c3427682466ebbc743 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:05:44 2019 +0200 Fix templates --- databags/menu_footer+en.ini | 6 +++--- templates/footer.html | 4 ++-- templates/navbar.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini index 51d909b..c997390 100644 --- a/databags/menu_footer+en.ini +++ b/databags/menu_footer+en.ini @@ -1,5 +1,5 @@ [jobs] -path = https://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs/ label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = https://www.torproject.org/contact +path = https://www.torproject.org/contact/ label = Contact [press] -path = https://www.torproject.org/press +path = https://www.torproject.org/press/ label = Press diff --git a/templates/footer.html b/templates/footer.html index 438d404..6168ca4 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -35,10 +35,10 @@ {% set link = site.get(item.path) %} {% if link %} <a class="nav-link text-light" href="{{ item.path|url(alt=this.alt) }}"> - {% elif item.label == "Documentation" or item.label == "Blog" %} + {% elif item.label == "Documentation" or item.label == "Blog" or item.label == "Jobs" %} <a class="nav-link text-light" href="{{ item.path }}"> {% else %} - <a class="nav-link text-light" href="{{ item.path }}/{{ this.alt }}"> + <a class="nav-link text-light" href="{{ item.path }}{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.is_child_of(item.path) %} diff --git a/templates/navbar.html b/templates/navbar.html index f15f215..db78178 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -28,7 +28,7 @@ {% set link = site.get(item.path) %} {% if link %} <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> - {% elif item.label == "Documentation" or item.label == "Blog" %} + {% elif item.label == "Documentation" or item.label == "Blog" or item.label == "Jobs" %} <a class="nav-link" href="{{ item.path }}"> {% else %} <a class="nav-link" href="{{ item.path }}{{ this.alt }}">

1 0

[lego/develop] Fix templates
by hiro＠torproject.org 07 Apr '20

07 Apr '20

commit 25d6ecd37f7a75fb8e394e8e94bcdcf257158a4a Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:10:38 2019 +0200 Fix templates --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 782474e..db78178 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -31,7 +31,7 @@ {% elif item.label == "Documentation" or item.label == "Blog" or item.label == "Jobs" %} <a class="nav-link" href="{{ item.path }}"> {% else %} - <a class="nav-link" href="{{ item.path|url(alt=this.alt) }}"> + <a class="nav-link" href="{{ item.path }}{{ this.alt }}"> {% endif %} {{ _(item.label) }} {% if this.path == item.path %}

1 0