Merge branch 'master' into patch-3

.github/ISSUE_TEMPLATE/1_Software_Suggestion.md

@@ -1,6 +1,8 @@
 ---
 name: "🆕 Software Suggestion"
 about: Suggest new software that enhances privacy.
+title: "🆕 Software Suggestion | "
+labels: 🆕 software suggestion
 ---
 
 ## Basic Information

.github/ISSUE_TEMPLATE/2_Software_Removal.md

@@ -1,6 +1,8 @@
 ---
 name: "❌ Software Removal"
 about: Suggest the removal of outdated, insecure, or otherwise bad software.
+title: "❌ Software Removal | "
+labels: ❌ software removal
 ---
 
 ## Description

.github/ISSUE_TEMPLATE/3_Discussion.md

@@ -1,6 +1,8 @@
 ---
 name: "💬 Discussion"
 about: Discuss the website or any mentioned software in general.
+title: "💬 Discussion | "
+labels: 💬 discussion, feedback wanted
 ---
 
 <!-- Remember to stay civil! -->

.github/ISSUE_TEMPLATE/4_Feature.md

@@ -1,6 +1,8 @@
 ---
 name: "✨ Feature Suggestion"
 about: Suggest a new feature for the website.
+title: "✨ Feature Suggestion | "
+labels: ✨ enhancement
 ---
 
 ## Description:

.github/ISSUE_TEMPLATE/5_Website_Issues.md

@@ -1,6 +1,8 @@
 ---
-name: "🌐 Website Issues"
+name: "🌐 Website Issue"
-about: Report issues with the website.
+about: Report an issue with the website.
+title: "🌐 Website Issue | "
+labels: 🌐 website issue, high priority
 ---
 
 ## Description

_includes/card.html

@@ -15,14 +15,21 @@
                     {% assign label_data = label | split:":" %}
                     {% assign color = label_data[0] %}
                     {% assign text = label_data[1] %}
-                    <span class="badge badge-{{color}}">{{text}}</span>
+                    {% assign tooltip = label_data[2] | default: "" %}
+                    {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
+                    <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" title="{{ tooltip }}">{{text}} {{ help_icon
+                        }}
+                        {% else %}
+                        >{{text}}
+                        {% endif %}
+                    </span>
                 {% endfor %}
             </div>
             {% endif %}
             <p><img src="{{include.image}}" alt="{{include.title}}" class="panel-item">{{include.description}}</p>
             <div>
             <p>
-                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website: 
+                <a class="btn btn-{{include.color}} mb-1" href="{{include.url}}">Website:
                     {% if include.website %}
                         {{include.website}}
                     {% else %}

_layouts/default.html

@@ -184,8 +184,7 @@
 </nav>
 <!-- navigation ends here -->
 
-<div class="py-4">
+<div id="top" class="py-4">
-<h1 id="top"></h1>
 <div class="mb-5"></div>
 {{ content }}
 </div>

donate.html

@@ -2,55 +2,31 @@
 layout: default
 active_page: donate
 ---
-
 <div class="col-12">
-<div class="row">
+  <div class="row">
-<div class="mx-auto text-center">
+    <div class="mx-auto text-center">
-
+      <div class="mt-4 mb-4">
-<br>
+        <a href="https://www.privacytools.io/"><img src="assets/img/layout/logo_smaller.png" class="img-fluid" alt="privacytools.io"></a>
-
+      </div>
-<p>
+      <h1>Please Donate</h1>
-	<a href="https://www.privacytools.io/"><img src="assets/img/layout/logo_smaller.png" class="img-fluid" alt="privacytools.io"></a>
+      <p>Our website is free of advertisement and not affiliated with any listed providers.<br>Your donation will cover our cost for server, domains, coffee, beer and pizza.</p>
-</p>
+      <h2>Bitcoin:</h2>
-
+      <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)" target="_blank">
-
+        <img src="assets/img/layout/qr.png">
-<h1>Please Donate</h1>
+      </a>
-
+      </p>
-<p>
+      <div class="form-group">
-	Our website is free of advertisement and not affiliated with any listed providers.<br/>
+        <input id="address" type="text" value="1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt" onclick="this.focus();this.select()" class="form-control text-center">
-	Your donation will cover our cost for server, domains, coffee, beer and pizza.
+        <label for="address">For easy copy and paste. <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)">Or use this link.</a></label>
-</p>
+      </div>
-
+      </p>
-<p>
+      <p>
-	<h2>Bitcoin:</h2>
+      <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2" target="_blank"><img src="assets/img/layout/PayPal.png"></a>
-
+      </p>
-<p>
+      <h3>Thanks for your support. You are awesome!</h3>
-	<a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)" target="_blank"><img src="assets/img/layout/qr.png"></a>	
+      <p>
-</p>	
+      <img src="assets/img/misc/smile.png" class="img-fluid" alt="Smile">
-
+      </p>
-<div class="form-group">
+    </div>
-	<input id="address" type="text" value="1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt" onclick="this.focus();this.select()" class="form-control text-center">
+  </div>
-	<label for="address">For easy copy and paste. <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)">Or use this link.</a></label>
-</div>	
-
-</p>
-
-<br>
-
-<p>
-	<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2" target="_blank"><img src="assets/img/layout/PayPal.png"></a>
-</p>
-
-
-
-
-	<h3>Thanks for your support. You are awesome!</h3>
-
-
-<p>
-	<img src="assets/img/misc/smile.png" class="img-fluid" alt="Smile">
-</p>
-
 </div>
-</div>
-</div>

robots.txt

@@ -1,5 +0,0 @@
-# www.robotstxt.org/
-
-# Allow crawling of all content
-User-agent: *
-Disallow: