diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3df664f7..88e4f94f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,17 +1,19 @@ - + ## Description -Resolves: #none #### Check List -- [ ] I have read and understand [CONTRIBUTING.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). +- [ ] I have read and understand [the contributing guidelines](https://github.com/privacytoolsIO/privacytools.io/blob/master/.github/CONTRIBUTING.md). -- [ ] I have listed the source code for this project in [source_code.md](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). +- [ ] I have [listed the source code](https://github.com/privacytoolsIO/privacytools.io/blob/master/source_code.md). - [ ] This project is [free/libre software](https://www.wikipedia.org/wiki/Free_software). - [ ] This project has an [associated discussion](https://github.com/privacytoolsIO/privacytools.io/issues). -Code Repository (if applicable): +* Netlify preview for the mainly edited page: + +* Code Repository (if applicable): diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 3e8e590a..bc055202 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -2,88 +2,254 @@

{% if include.badges %} - {{include.title}} - {% assign badges = include.badges | replace:", ", "," | split:"," %} - {% for badge in badges %} - {% assign badge_data = badge | split:":" %} - {% assign color = badge_data[0] %} - {% assign text = badge_data[1] %} - {% assign tooltip = badge_data[2] | default: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon - }} - {% else %} - >{{text}} - {% endif %} - - {% endfor %} + {{ include.title }} + {% assign badges = include.badges | split:"|" %} + {% for badge in badges %} + {% assign badge_data = badge | split:":" %} + {% assign color = badge_data[0] %} + {% assign text = badge_data[1] %} + {% assign tooltip = badge_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} {% else %} - {{include.title}} + {{ include.title }} {% endif %}

- {{include.title}} - {{include.description}} + {{include.title}} + {{ include.description }} {% if include.labels %} - {% assign labels = include.labels | replace:", ", "," | split:"," %} - {% for label in labels %} - {% assign label_data = label | split:":" %} - {% assign color = label_data[0] %} - {% assign text = label_data[1] %} - {% assign tooltip = label_data[2] | default: false %} - {% assign help_icon = '' %} - {{text}} {{ help_icon - }} - {% else %} - >{{text}} - {% endif %} - - {% endfor %} + {% assign labels = include.labels | split:"|" %} + {% for label in labels %} + {% assign label_data = label | split:":" %} + {% assign color = label_data[0] %} + {% assign text = label_data[1] %} + {% assign tooltip = label_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon }} + {% else %} + > {{text}} + {% endif %} + + {% endfor %} {% endif %}

- Website + + + Website + {% if include.forum %} - Forum + + + Forum + {% endif %} {% if include.tor %} - Tor + + Tor + {% endif %}
- {% if include.windows %}{% if include.windows != "" %}{% else %}{% endif %}{% endif %} - {% if include.mac %}{% if include.mac != "" %}{% else %}{% endif %}{% endif %} - {% if include.linux %}{% if include.linux != "" %}{% else %}{% endif %}{% endif %} - {% if include.bsd %}{% if include.bsd != "" %}{% else %}{% endif %}{% endif %} + {% if include.windows %} + {% if include.windows != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.firefox %}{% if include.firefox != "" %}{% else %}{% endif %}{% endif %} - {% if include.chrome %}{% if include.chrome != "" %}{% else %}{% endif %}{% endif %} - {% if include.safari %}{% if include.safari != "" %}{% else %}{% endif %}{% endif %} - {% if include.opera %}{% if include.opera != "" %}{% else %}{% endif %}{% endif %} - {% if include.edge %}{% if include.edge != "" %}{% else %}{% endif %}{% endif %} + {% if include.mac %} + {% if include.mac != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.android %}{% if include.android != "" %}{% else %}{% endif %}{% endif %} - {% if include.ios %}{% if include.ios != "" %}{% else %}{% endif %}{% endif %} - {% if include.fire %}{% if include.fire != "" %}{% else %}{% endif %}{% endif %} + {% if include.linux %} + {% if include.linux != "" %} + + + + {% else %} + + {% endif %} + {% endif %} - {% if include.web %}{% if include.web != "" %}{% else %}{% endif %}{% endif %} + {% if include.bsd %} + {% if include.bsd != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.firefox %} + {% if include.firefox != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.chrome %} + {% if include.chrome != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.safari %} + {% if include.safari != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.opera %} + {% if include.opera != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.edge %} + {% if include.edge != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.android %} + {% if include.android != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.ios %} + {% if include.ios != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.fire %} + {% if include.fire != "" %} + + + + {% else %} + + {% endif %} + {% endif %} + + {% if include.web %} + {% if include.web != "" %} + + + + {% else %} + + {% endif %} + {% endif %} {{include.icon1}} {{include.icon2}} {{include.icon3}} - {% if include.github %}{% endif %} - {% if include.gitlab %}{% endif %} - {% if include.git %}{% endif %} - {% if include.source %}{% endif %} + {% if include.github %} + + + + {% endif %} + + {% if include.gitlab %} + + + + {% endif %} + + {% if include.git %} + + + + {% endif %} + + {% if include.source %} + + + + {% endif %}
-

diff --git a/_includes/nav.html b/_includes/nav.html index 297f71e4..ab763507 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,85 +1,115 @@ - + + diff --git a/_includes/scripts.html b/_includes/scripts.html index cdc7e515..08fffe2a 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -2,17 +2,7 @@ - +