commit 0308ca518be503b715f3462c2a9650c528453ded Author: hiro hiro@torproject.org Date: Tue Dec 10 12:58:46 2019 +0100
Merge changes to download templates --- templates/download-android.html | 10 +++++++--- templates/download.html | 2 +- templates/hero-download.html | 22 +++++++++++++--------- templates/navbar-min.html | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/templates/download-android.html b/templates/download-android.html index bcb8fccc..968a5794 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,6 +14,13 @@ <div class="row"> <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding@2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> {% set t = bag('versions', 'torbrowser-stable') %} @@ -36,9 +43,6 @@ </div> </div> </div> - <div class="d-none d-lg-block col-lg-5 col-md-6"> - <img class="img-fluid p-5 m-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding@2x.png'|asseturl }}"> - </div> </div> <div class="row pb-5"> <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a> diff --git a/templates/download.html b/templates/download.html index b5ef03df..27f71922 100644 --- a/templates/download.html +++ b/templates/download.html @@ -11,7 +11,7 @@ </div> <div class="row pl-3 pr-5 text-tpo"> <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won't connect is an incorrect system clock. Please make sure it's set correctly.') }}</p> - <a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQs at our Support Portal') }}</a> + <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ's at our Support Portal') }}</a></h6> </div> </div> <div class="col-sm-6"> diff --git a/templates/hero-download.html b/templates/hero-download.html index a13fb086..e142ecb0 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -7,7 +7,7 @@ <div class="row p-5 mx-auto"> {% for id, item in bag('platforms').items() %} <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> + <div class="oval-2 bg-darker"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} @@ -29,23 +29,27 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small class="float-left"><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div> - {% endfor %} - <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> - <a href="#android"> - <i class="text-light fab fa-android-png"></i> - </a> + {% endfor %} + <div class="col-sm-6 col-md-3 py-3"> + <div class="oval-2 bg-darker mx-auto"> + <a href="#android"> + <i class="text-light fab fa-android-png"></i> + </a> + <a class="btn btn-primary mt-4" href="#android">{{ _('Download for Android') }}</a> + </div> </div> - </div> </div> + <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> + <div class="hidden-sm row p-md-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> </div> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 00000000..f9d2bc77 --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,19 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> +{% endif %} + + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo@2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + </div> + </nav> +</div>