commit a2ca2ccd0bb3fd4ff356ed29418a4db0772cca08 Author: kez kez@torproject.org Date: Thu Jan 6 12:47:13 2022 -0800
Remove the YEC banner
Context: tpo/web/lego#42 --- assets/scss/bootstrap.scss | 2 +- templates/banner.html | 48 ---------------------------------------------- templates/header.html | 22 +++++++++------------ templates/navbar.html | 8 +++----- 4 files changed, 13 insertions(+), 67 deletions(-)
diff --git a/assets/scss/bootstrap.scss b/assets/scss/bootstrap.scss index 16bf167..6c6583d 100644 --- a/assets/scss/bootstrap.scss +++ b/assets/scss/bootstrap.scss @@ -48,6 +48,6 @@ @import "portal"; @import "tpo"; @import "tor"; -@import "eoy"; +//@import "eoy"; @import "donate"; @import "cryptocurrency"; diff --git a/templates/banner.html b/templates/banner.html deleted file mode 100644 index d7a165c..0000000 --- a/templates/banner.html +++ /dev/null @@ -1,48 +0,0 @@ -{% set locale = bag('alternatives', this.alt) %} -<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"></label> - <span class="eoy-sr-only text-white">{{ _('Close banner') }}</span> - <div class="eoy-banner row col-md-12" id="banner-header" role="contentinfo"> - <div class="col-1 px-0"></div> - <div class="col-lg-5 col-md-5 col-11 px-0"> - <div class="col-12 pl-0 {{ locale.direction }}"> - <div class="row"> - <h4 class="banner-big-text">{{ _('Privacy is a human right') }}</h4><br> - </div> - <div class="row"> - <h2 class="banner-small-text"> - {{ _('Thank you for helping us reach our $150,000 Friends of Tor match!') }} - </h2> - </div> - {% if locale.direction == 'text-right' %} - <div class="col-4 order-0"> - {% else %} - <div class="col-4 order-1"> - {% endif %} - </div> - <!-- <div class="row"> - <div class="col-8 order-0 pb-3"> - <a href="https://blog.torproject.org/friends-of-tor-match-2020" target="_blank" title="Friends of Tor" class="match">{{ _('Your donation will be matched by Friends of Tor, up to $100,000.') }}</a> - </div> - </div> --> - <div class="row py-3"> - {% if this._model == 'donate-form' %} - <a class="rectangle" href="#giving-form">{{ _('Donate now') }}</a> - {% else %} - <a class="rectangle" href="https://torproject.org/donate/donate-phr-hp1">{{ _('Donate now') }}</a> - {% endif %} - </div> - </div> - </div> - <div class="col-1 px-0"></div> - <div class="col-lg-4 col-md-4 col-10 pt-0 px-0 illo-container position-relative"> - <picture> - {% set image = '/static/css/images/home/png/yec-activist-' + this.alt + '@3x.png' %} - <source srcset="{{ image|asseturl }}"> - <img class="banner-img-style" src="{{ '/static/css/images/home/png/yec-activist-en@3x.png'|asseturl }}"> - </picture> - </div> - <div class="col-1 px-0"></div> - </div> - </div> diff --git a/templates/header.html b/templates/header.html index 7cdb3a0..6282a70 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,6 +1,3 @@ -{% if this._model == 'donate-form' and this.header_image|length %} - {% include 'banner.html' %} -{% else %} {% if this.color == 'primary' %} <div class="container-fluid bg-primary"> {% else %} @@ -10,29 +7,29 @@ {% if this.color == 'primary' %} <div class="container bg-primary pt-1 pt-sm-0"> {% else %} - <div class="container {% if this.header_color %} bg-{{ this.header_color }} {% else %} bg-dark {% endif %}git {% if this._model == 'donate-form' %} pt-4 px-4 {% else %} py-4 {% endif %}"> + <div class="container {% if this.header_color %} bg-{{ this.header_color }} {% else %} bg-dark {% endif %}git py-4"> {% endif %} <div class="row"> {% if this._model == 'donate-form' and this.header_image|length %} - <div class="col-12 content-center pt-1 pt-sm-0 donate-has-image"> - <h2 class="mx-auto display-3 text-white donate-title">{{ this.title }}</h2> - <img src="{{ '/static/css/images/home/png/yec-activist-light-en@3x.png' | asseturl }}" class="donate-header-image img-fluid" /> - <!--{% set idx = this.header_image.index(".png") %} + <div class="col-12 content-center pt-1 pt-sm-0 donate-has-image"> + <h2 class="mx-auto display-3 text-white text-capitalize donate-title">{{ this.title }}</h2> + <img src="{{ this.header_image | asseturl }}" class="donate-header-image img-fluid" /> + {#% set idx = this.header_image.index(".png") %} {% set header_mobile = this.header_image[:idx] + "-mobile" + this.header_image[idx:] %} - <img src="{{ header_mobile | asseturl }}" class="donate-header-image-mobile img-fluid" />--> + <img src="{{ header_mobile | asseturl }}" class="donate-header-image-mobile img-fluid" />#} {% if this.header_tag_line %} <div class="text-center py-3"> <a href="{{ this.header_tag_link.ascii_url }}" title="Friends of Tor" class="match">{{ _( this.header_tag_line ) }}</a> </div> {% endif %} - </div> + </div> {% else %} <div class="col-12 content-center pt-5"> <div class="row"> - <h6 class="mx-auto text-white">{% block section %}{{ this.section }}{% endblock %}</h6> + <h6 class="mx-auto text-white text-capitalize">{% block section %}{{ this.section }}{% endblock %}</h6> </div> <div class="row pb-5"> - <h2 class="mx-auto display-3 text-white">{% block title %}{{ this.title }}{% endblock %}</h2> + <h2 class="mx-auto display-3 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2> </div> {% if this.header_description_alignment == 'center' %} <div class="row text-center header-description"> @@ -52,4 +49,3 @@ {% if this.section_id == 'about' %} {% include 'pagenav.html' %} {% endif %} -{% endif %} diff --git a/templates/navbar.html b/templates/navbar.html index 6ff3080..ed681ed 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -1,4 +1,4 @@ -{% include 'banner.html' %} +{#% include 'banner.html' %#} {% if not this.color %} <div class="container-fluid bg-primary"> <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4"> @@ -14,13 +14,11 @@ <span class="sr-only">Tor Logo</span> </a>
- {# TODO: the following lines were commented out to remove the donate navbar button during the '21 year-end campaign #} - {# TODO: uncomment them when the campaign is over #} {% set link = bag('links', this.alt, 'donate') %} {% if link %} - <!--h4 class="pl-2 pr-2"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4--> + <h4 class="pl-2 pr-2"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> {% else %} - <!--h4 class="pl-2 pr-2"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4--> + <h4 class="pl-2 pr-2"><a href="https://www.torproject.org/donate/%7B%7B this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> {% endif %}
<label for="nav-toggle">