From aec52be7dc34a0109db79b1aed5a6dc12bebf3d1 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Thu, 14 Nov 2019 09:39:20 -0800
Subject: [PATCH 1/3] Add warning to Cryptomator (#1484)

---
 _includes/sections/file-encryption.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index 96ec5f3f..19ec5af2 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -53,7 +53,7 @@
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open-source software: No backdoors, no registration.</li>
+  <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li></li>
   <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
-- 
2.49.0


From ec9f97f04307d3503b1ee7c65bcea86247d01c4d Mon Sep 17 00:00:00 2001
From: Daniel Nathan Gray <48640805+dngray@users.noreply.github.com>
Date: Sat, 16 Nov 2019 03:50:51 +0000
Subject: [PATCH 2/3] Delist DiskCryptor (#1491)

---
 _includes/sections/file-encryption.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index 19ec5af2..e39d747c 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -54,7 +54,6 @@
 
 <ul>
   <li><a href="https://cryptomator.org/">Cryptomator</a> - Free client-side AES encryption for your cloud files. Open source software: No backdoors, no registration. <span class="badge badge-warning" data-toggle="tooltip" title="Cryptomator's mobile apps are not open-source."><a href="https://github.com/cryptomator/cryptomator-android/issues/1#issuecomment-257979375"><i class="fas fa-exclamation-triangle"></i></a></span></li></li>
-  <li><a href="https://diskcryptor.net/">DiskCryptor</a> - A full disk and partition encryption system for Windows including the ability to encrypt the partition and disk on which the OS is installed.</li>
   <li><a href="https://gitlab.com/cryptsetup/cryptsetup/">Linux Unified Key Setup (LUKS)</a> - A full disk encryption system for Linux using dm-crypt as the disk encryption backend. Included by default in Ubuntu. Available for Windows and Linux.</li>
   <li><a href="https://hat.sh/">Hat.sh</a> - A cross-platform, serverless JavaScript web application that provides secure file encryption using the AES-256-GCM algorithm in your browser. It can also be downloaded and run offline.</a></li>
   <li><a href="https://www.keka.io/">Keka</a> - A macOS-only, open-source file archiver with the ability to encrypt files.</li>
-- 
2.49.0


From 4d19ac7dd05df298af525ede2400d65b71742c5f Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Sun, 17 Nov 2019 18:30:22 +1300
Subject: [PATCH 3/3] Layout mobile navbar nicely with Flexbox

Before hamburger menu was floated to the right with a fixed margin-top,
which means that it probably wasn't perfectly centered and if we would
change logo image size, we would have to edit that margin manually.
---
 _includes/nav.html    | 20 ++++++++++----------
 assets/css/style.scss |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 461457a2..3f9960df 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,14 +1,14 @@
-<div class="fixed-top bg-dark">
-  <nav id="navbar">
-
+<nav class="fixed-top bg-dark">
+  <div id="navbar" class="d-flex flex-wrap justify-content-between align-items-center">
+    <div class="w-50">
+      <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
+        <img src="/assets/img/layout/logo_smaller.png" width="150px" />
+      </a>
+    </div>
     <input type="checkbox" id="nav-toggle" checked />
     <label for="nav-toggle" id="nav-toggle-label" class="fas fa-bars fa-lg"></label>
-    <a id="nav-home-mobile" class="nav-anchor" href="/index.html">
-      <img src="/assets/img/layout/logo_smaller.png" width="148px" height="22px" />
-    </a>
-
-    <div class="menu">
 
+    <div class="menu w-100">
       <div id="nav-left" class="position-relative flex-col">
         <a class="nav-anchor" href="/index.html">
           <span id="nav-home" class="fas fa-home fa-fw"></span>
@@ -142,5 +142,5 @@
 
       </div>
     </div>
-  </nav>
-</div>
+  </div>
+</nav>
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 8b969301..a83d9cf2 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -340,8 +340,7 @@ input#nav-toggle,
   input#nav-toggle + label {
     display: block;
     cursor: pointer;
-    margin-top: 0.25rem;
-    float: right;
+    margin-bottom: 0;
   }
   .nav-dropdown {
     display: block;
-- 
2.49.0