diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2ebfe534..1032d75c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,9 +1,11 @@ -### Description + +## Description +Issue: #none -### HTML Preview + diff --git a/Gemfile b/Gemfile index 1594f53b..70f8d954 100644 --- a/Gemfile +++ b/Gemfile @@ -1,25 +1,11 @@ source "https://rubygems.org" -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "~> 3.8.4" +# Install github-pages gem (https://jekyllrb.com/docs/github-pages/) +gem "github-pages", group: :jekyll_plugins -# This is the default theme for new Jekyll sites. You may change this to anything you like. -# gem "minima", "~> 2.0" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -# gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! +# Plugins group :jekyll_plugins do - # gem "jekyll-feed", "~> 0.6" + # example: gem "jekyll-feed", "~> 0.6" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/README.md b/README.md index 23346b02..4e6d6d1f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![privacytools](https://privacytoolsio.github.io/privacytools.io/img/layout/logo.png)](https://www.privacytools.io/) +[![privacytools](https://privacytools.io/assets/img/layout/logo.png)](https://www.privacytools.io/) _Encryption Against Global Mass Surveillance._ @@ -35,8 +35,8 @@ There can be exceptions if no software is available that meet the criteria. ## Images -- Provider logos should be exactly 200 x 70 ([example](https://privacytoolsio.github.io/privacytools.io/img/provider/AirVPN.gif)) -- Tool logos should be exactly 120 x 120 ([example](https://privacytoolsio.github.io/privacytools.io/img/tools/ChatSecure.png)) +- Provider logos should be exactly 200 x 70 ([example](https://www.privacytools.io/assets/img/provider/AirVPN.gif)) +- Tool logos should be exactly 120 x 120 ([example](https://www.privacytools.io/assets/img/tools/ChatSecure.png)) # Support privacytools.io @@ -46,10 +46,10 @@ There can be exceptions if no software is available that meet the criteria. - View and edit our website source code here on GitHub. # Community Translations -- [繁体中文 / Chinese](https://github.com/twngo/privacytools-zh) - [GitHub](https://github.com/twngo/privacytools-zh) +- [繁体中文 / Chinese](https://privacytools.twngo.xyz/) - [GitHub](https://github.com/twngo/privacytools-zh) - [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es) - [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks) -- [Italiano / Italian](https://strappazzon.github.io/privacytools-it/) - [GitHub](https://github.com/Strappazzon/privacytools-it) +- [Italiano / Italian](https://privacytools-it.github.io/) - [GitHub](https://github.com/privacytools-it/privacytools-it.github.io) - [Русский / Russian](https://privacytools.ru) - [GitHub](https://github.com/c0rdis/privacytools.ru) # License diff --git a/_config.yml b/_config.yml index 0aa2236a..5bcc16fe 100644 --- a/_config.yml +++ b/_config.yml @@ -1,38 +1,6 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely edit after that. If you find -# yourself editing this file very often, consider using Jekyll's data files -# feature for the data you need to update frequently. -# -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'bundle exec jekyll serve'. If you change this file, please restart the server process. - -# Site settings -# These are used to personalize your new site. If you look in the HTML files, -# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. -# You can create any custom variable you would like, and they will be accessible -# in the templates via {{ site.myvariable }}. title: Privacy Tools - Encryption Against Global Mass Surveillance -description: >- # this means to ignore newlines until "baseurl:" - You are being watched! Knowledge, encryption and privacy tools to protect you against global mass surveillance. -baseurl: "" # the subpath of your site, e.g. /blog -url: "" # the base hostname & protocol for your site, e.g. http://example.com +description: You are being watched! Knowledge, encryption and privacy tools to protect you against global mass surveillance. +url: "https://privacytools.io" +sass: + style: compressed -# Build settings -# markdown: kramdown -# theme: minima -# plugins: -# - jekyll-feed - -# Exclude from processing. -# The following items will not be processed, by default. Create a custom list -# to override the default setting. -# exclude: -# - Gemfile -# - Gemfile.lock -# - node_modules -# - vendor/bundle/ -# - vendor/cache/ -# - vendor/gems/ -# - vendor/ruby/ diff --git a/_includes/card.html b/_includes/card.html index f10b5758..069943ae 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -30,7 +30,7 @@ {% endif %} {% if include.tor %} - Tor + Tor {% endif %} {% if include.extra_button %} @@ -43,4 +43,4 @@ - \ No newline at end of file + diff --git a/_layouts/default.html b/_layouts/default.html index b8ae259b..138eabfb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -23,32 +23,28 @@ {% endif %} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - - - + - - - - + + + +