Merge branch 'master' into i18n

This commit is contained in:
djoate
2019-11-02 02:09:50 -04:00
127 changed files with 2586 additions and 1382 deletions

View File

@ -31,8 +31,8 @@
<i class="fab fa-linkedin-in pl-3"></i>
</a>
<a href="http://www.stumbleupon.com/submit?url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn stumbleupon" title="{% t footer.stumbleupon_title %}">
<i class="fab fa-stumbleupon pl-3"></i>
<a href="https://mix.com/mixit?su=submit&url=https://www.privacytools.io&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
<i class="ptio-mix pl-3"></i>
</a>
<a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url=https://www.privacytools.io" class="share-btn diaspora" title="{% t footer.diaspora_title %}">
@ -44,29 +44,25 @@
<h3>{% t footer.copy_url_description %}</h3>
<p>
<input type="text" value="www.privacytools.io - encryption against global mass surveillance" onclick="this.focus();this.select()" class="form-control input-lg">
<input type="text" value="privacytools.io - encryption against global mass surveillance" class="form-control input-lg onclick-select">
<span class="help-block">{% t footer.for_easy_copy_paste %}</span>
</p>
<hr class="footer-divider" />
<div class="row mt-3">
<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center d-flex justify-content-center">
<a href="https://www.privacytools.io/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
<div class="col-sm-4 mb-3 d-flex justify-content-center d-flex justify-content-center">
<a href="/LICENSE.txt" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.CC0_title %}"><img alt="{% t footer.CC0 %}" src="/assets/img/layout/zero.png" width="32" height="32">CC0</a>
</div>
<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
<a href="https://www.kopimi.com/" data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.kopimi_title %}"><img alt="{% t footer.kopimi %}" src="/assets/img/layout/kopimi.png" width="32" height="33">kopimi</a>
</div>
<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
<div class="col-sm-4 mb-3 d-flex justify-content-center">
<i class="far fa-envelope fa-2x"></i>
<a href="/contact/">{% t footer.contact %}</a>
</div>
<div class="col-md-3 col-sm-6 mb-3 d-flex justify-content-center">
<i class="fas fa-heart fa-2x text-danger"></i>
<a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="/donate/">{% t footer.donate %}</a>
<div class="col-sm-4 mb-3 d-flex justify-content-center">
<i class="fas fa-donate fa-2x"></i>
<a data-toggle="tooltip" data-placement="top" data-original-title="{% t footer.donate_title %}" href="https://opencollective.com/privacytoolsio#section-contribute">{% t footer.donate %}</a>
</div>
</div>
@ -78,7 +74,7 @@
<p class="mt-2">
<strong>{% t footer.no_ads %}</strong>
<em>{% t footer.socially_motivated %}</em>
<a href="/privacy-policy/">{% t footer.privacy_policy %}</a>.
<a href="/privacy/">{% t footer.privacy_policy %}</a>.
</p>
<p class="text-left">
Tor v3: <strong>privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion</strong>