Add Apple Mail to tools overview (#993)

Signed-off-by: lexi <git@lx-is.lol>

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
       
       - name: Cache files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         with:
           key: ${{ github.ref }}
           path: .cache

.github/workflows/deploy.yml

@@ -21,7 +21,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
       
       - name: Cache files
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         with:
           key: ${{ github.ref }}
           path: .cache

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 <!-- Add the date and any new changes to the TOP of this file, below this line. -->
 
+## 2022-04-12
+
+- Enabled organization discussions ([#986](https://github.com/orgs/privacyguides/discussions/986))
+- Added a navbar link to the new [organization discussions](https://github.com/orgs/privacyguides/discussions) ([#994](https://github.com/privacyguides/privacyguides.org/pull/994))
+
 ## 2022-04-11
 
 - Added changelog

README.md

@@ -58,7 +58,7 @@ Our current list of team members can be found [here](https://github.com/orgs/pri
 2. Install [Python 3.6+](https://www.python.org/downloads/)
 3. Install [mkdocs-material](https://squidfunk.github.io/mkdocs-material/getting-started/): `pip install mkdocs-material`
 4. Serve the site locally: `mkdocs serve`
-    - The site will be available at `http://localhost:8000/`.
+    - The site will be available at `http://localhost:8000/`
   
 Your local site will appear slightly different, because the production version of the website uses a private/custom build of mkdocs-material with additional features.
 
@@ -73,3 +73,14 @@ Team members with access to [mkdocs-material-insiders](https://github.com/privac
     - The site will be available at `http://localhost:8000`
     - You can build the site locally with `mkdocs build --config-file mkdocs.production.yml`
     - This version of the site should be identical to the live, production version
+
+## Releasing
+
+1. Create a new tag: `git tag -s v2.X.X -m 'Some message'`
+    - [View existing tags](https://github.com/privacyguides/privacyguides.org/tags)
+    - Tag [numbering](https://semver.org/): Increment the MINOR (2nd) number when making significant changes (adding/deleting pages, etc.), increment the PATCH (3rd) number when making minor changes (typos, bug fixes). Probably leave the MAJOR number at 2 until a massive redesign (v1 -> v2 was the Jekyll to MkDocs transition).
+2. Push the tag to GitHub: `git push --tags`
+3. [Create a new release](https://github.com/privacyguides/privacyguides.org/releases/new) selecting the new tag
+    - Title the release the same as the tag version number without the `v`, i.e. `2.X.X`
+    - GitHub should let you auto-generate release notes, otherwise copy notes from the changelog
+4. Publish release, it will be deployed to the live site automatically

docs/stylesheets/extra.css

@@ -145,3 +145,8 @@ h1, h2, h3, .md-header__topic {
 .md-nav__link svg {
     width: 22px;
 }
+
+/* Unsticky sidebar without JS */
+.no-js .md-sidebar {
+    align-self: auto;
+}

docs/tools.md

@@ -241,6 +241,7 @@ We [recommend](dns.md#why-should-i-use-encrypted-dns) a number of encrypted DNS
 <div class="grid cards" markdown>
 
 - ![Thunderbird logo](/assets/img/email-clients/thunderbird.svg){ .twemoji } [Thunderbird](https://www.thunderbird.net/)
+- ![Apple Mail logo](/assets/img/email-clients/applemail.png){ .twemoji } [Apple Mail](https://support.apple.com/guide/mail/welcome/mac)
 - ![GNOME Evolution logo](/assets/img/email-clients/evolution.svg){ .twemoji } [GNOME Evolution (Linux)](https://wiki.gnome.org/Apps/Evolution)
 - ![Kontact logo](/assets/img/email-clients/kontact.svg){ .twemoji } [Kontact (Linux)](https://kontact.kde.org/)
 - ![Mailvelope logo](/assets/img/email-clients/mailvelope.svg){ .twemoji } [Mailvelope (PGP in standard webmail)](https://www.mailvelope.com/)

mkdocs.yml

@@ -65,6 +65,7 @@ nav:
     - 'Privacy Guides': 'about.md'
     - 'Notices': 'about/notices.md'
     - 'Privacy Policy': 'about/privacy-policy.md'
+  - 'Discussions': 'https://github.com/orgs/privacyguides/discussions'
   - 'Blog': 'https://blog.privacyguides.org/'
 
 theme: