Merge remote-tracking branch 'origin/master' into file-sync-to-cardv2

This commit is contained in:
nitrohorse 2019-09-17 23:17:17 -07:00
commit 9ac8b8e87d
No known key found for this signature in database
GPG Key ID: 6F3175557E766CBF
3 changed files with 7 additions and 11 deletions

View File

@ -37,7 +37,7 @@
<div>
<p>
{% if include.url %}
<a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
<a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">
{% if include.website %}
{{include.website}}
{% else %}

View File

@ -44,27 +44,23 @@
<h3>Copy URL and 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" onclick="this.focus();this.select()" class="form-control input-lg">
<span class="help-block">For easy copy and paste. Share this text snippet.</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="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="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="This work is free. You can redistribute it and/or modify it under the terms of the &quot;Creative Commons CC0 1.0 Universal Public Domain Dedication&quot;."><img alt="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="kopimi (copyme), symbol showing that you want to be copied. use kopimi in your own fancy. kopimi may be put on homepages or blogs, in books, in software, as sound logos in music or whatever."><img alt="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/">Contact</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="fas fa-heart fa-2x text-danger"></i>
<a data-toggle="tooltip" data-placement="top" data-original-title="Please support this project by donating. We are ad free and not affiliated with any providers. Your donation will cover our cost for server and domain." href="/donate/">Donate</a>
</div>

View File

@ -343,7 +343,7 @@
</a>
</td>
<td>No</td>
<td>DoT</td>
<td>DoH, DoT</td>
<td>Yes</td>
<td>Yes</td>
<td>