From 07d20054289f5dba5b430a33d4dfe3c77aa4d237 Mon Sep 17 00:00:00 2001
From: Alberto <strappazzon@protonmail.com>
Date: Fri, 30 Aug 2019 18:50:11 +0200
Subject: [PATCH 1/4] Fix dark theme's input forms colors (#1237)

* Fix readonly and disabled input forms colors

* Fix the fix
---
 _includes/head.html  | 2 +-
 assets/css/dark.scss | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/_includes/head.html b/_includes/head.html
index 0580dc35..771c4e48 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -44,5 +44,5 @@
 
   <!-- CSS stylesheets -->
   <link href="/assets/css/style.css?v=5" rel="stylesheet">
-  <link id="dark-css" href="/assets/css/dark.css?v=1" rel="stylesheet" media="(prefers-color-scheme: dark)">
+  <link id="dark-css" href="/assets/css/dark.css?v=2" rel="stylesheet" media="(prefers-color-scheme: dark)">
 </head>
diff --git a/assets/css/dark.scss b/assets/css/dark.scss
index d7133452..d982475b 100644
--- a/assets/css/dark.scss
+++ b/assets/css/dark.scss
@@ -111,6 +111,11 @@ img {
   border-color: $dark-300;
 }
 
+.form-control[readonly],
+.form-control:disabled {
+  background: $dark-300;
+}
+
 .card,
 .jumbotron,
 .list-group-item {
-- 
2.49.0


From 5b20d9a1e4b021d5412ea1c4f7389f3e6f8d3dd3 Mon Sep 17 00:00:00 2001
From: Jonah Aragon <jonah@triplebit.net>
Date: Fri, 30 Aug 2019 12:01:48 -0500
Subject: [PATCH 2/4] Fullwidth icons in navbar (#1243)

---
 _includes/nav.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 5434b7ab..e7f6c2e8 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -11,7 +11,7 @@
 
       <div id="nav-left" class="position-relative flex-col">
         <a class="nav-anchor" href="/index.html">
-          <span id="nav-home" class="fas fa-home"></span>
+          <span id="nav-home" class="fas fa-home fa-fw"></span>
         </a>
 
         <!-- Provider -->
@@ -103,7 +103,7 @@
         <details class="nav-details">
           <summary>
             <span class="nav-summary">
-              <span class="fas fa-language text-danger"></span>
+              <span class="fas fa-language text-danger fa-fw"></span>
               Language
               <span class="dropdown-toggle"></span>
             </span>
@@ -141,10 +141,10 @@
 
         <a href="https://blog.privacytools.io/" class="nav-anchor">Blog </a>
         <a href="/donate/" class="nav-anchor">
-          Donate <span class="fas fa-heart text-danger"></span>
+          Donate <span class="fas fa-heart text-danger fa-fw"></span>
         </a>
         <a id="nav-switch-theme" class="nav-anchor" href="javascript:void(0)" onClick="changeColorScheme()">
-          Theme <span class="nav-theme-icon fas"></span>
+          Theme <span class="nav-theme-icon fas fa-fw"></span>
         </a>
       </div>
     </div>
-- 
2.49.0


From ec1a5d2a934cf4818f7c6b3349de1fea33845a19 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Fri, 30 Aug 2019 10:12:25 -0700
Subject: [PATCH 3/4] Fix LessPass GitHub link (#1238)

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

diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html
index 14c153b4..c0f79ae6 100644
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@@ -44,7 +44,7 @@
   description="<strong>LessPass</strong> is a free and open source password manager that generates unique passwords for websites, email accounts, or anything else based on a master password and information you know. No sync needed. Uses PBKDF2 and SHA-256. It's advised to use the browser addons for more security."
   website="https://lesspass.com/"
   forum="https://forum.privacytools.io/t/discussion-keepassxc/1344/2"
-  github="https://github.com/keepassxreboot/keepassxc"
+  github="https://github.com/lesspass/lesspass"
   firefox="https://addons.mozilla.org/en-US/firefox/addon/lesspass/"
   chrome="https://chrome.google.com/webstore/detail/lesspass/lcmbpoclaodbgkbjafnkbbinogcbnjih"
   android="https://play.google.com/store/apps/details?id=com.lesspass.android&hl=en"
-- 
2.49.0


From ec8877a28dca9b0af6c9ff2c37349bc807d434a9 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dpot@disroot.org>
Date: Fri, 30 Aug 2019 22:00:53 +1200
Subject: [PATCH 4/4] Reduce flickering with dark/light theme

---
 _includes/scripts.html  |  2 +-
 _layouts/minimal.html   |  1 +
 assets/js/applytheme.js |  6 ++++++
 assets/js/main.js       | 39 ++++++++++++++++++++-------------------
 4 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 assets/js/applytheme.js

diff --git a/_includes/scripts.html b/_includes/scripts.html
index d55f2c76..b5ed2d18 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -2,7 +2,7 @@
 <script src="/assets/js/popper.min.js?v=4"></script>
 <script src="/assets/js/bootstrap.min.js?v=4"></script>
 <script src="/assets/js/sortable.min.js?v=4"></script>
-<script src="/assets/js/main.js?v=2"></script>
+<script src="/assets/js/main.js?v=3"></script>
 
 <!--
   Matomo is the leading open-source analytics platform:
diff --git a/_layouts/minimal.html b/_layouts/minimal.html
index 1061dc36..470aa55f 100644
--- a/_layouts/minimal.html
+++ b/_layouts/minimal.html
@@ -2,6 +2,7 @@
 <html lang="en">
 {% include head.html %}
 <body data-spy="scroll" data-target="#navbar">
+  <script src="/assets/js/applytheme.js?v=1"></script>
   <header>
   {% include nav.html %}
   <div id="top" class="py-4"></div>
diff --git a/assets/js/applytheme.js b/assets/js/applytheme.js
new file mode 100644
index 00000000..1392dd66
--- /dev/null
+++ b/assets/js/applytheme.js
@@ -0,0 +1,6 @@
+if (localStorage.getItem("colorScheme") === "dark") {
+  document.querySelector("#dark-css").removeAttribute("media"); // Set dark theme
+}
+else if (localStorage.getItem("colorScheme") === "light") {
+  document.querySelector("#dark-css").setAttribute("media", "invalid"); // Set light theme
+}
diff --git a/assets/js/main.js b/assets/js/main.js
index 9e04c387..67738c1a 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -29,29 +29,31 @@ function navSectionsClose(event) {
 
 
 // Dark/Light color scheme switch button
-document.querySelector("#nav-switch-theme").style.display = "inline"
-
-if (localStorage.getItem("colorScheme") === "dark") {
-  document.querySelector("#dark-css").removeAttribute("media"); // Set dark theme
-}
-else if (localStorage.getItem("colorScheme") === "light") {
-  document.querySelector("#dark-css").setAttribute("media", "invalid"); // Set light theme
-}
+document.querySelector("#nav-switch-theme").style.display = "inline";
 
 function changeColorScheme() {
-
   // Use whatever users want
   if (localStorage.getItem("colorScheme") === "dark") {
     // Change to light theme
-    // by setting invalid media it will just not apply CSS for anyone
-    document.querySelector("#dark-css").setAttribute("media", "invalid");
-    localStorage.setItem("colorScheme", "light");
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches === false) {
+      document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)");
+      localStorage.removeItem("colorScheme");
+    } else {
+      // by setting invalid media it will just not apply CSS for anyone
+      document.querySelector("#dark-css").setAttribute("media", "invalid");
+      localStorage.setItem("colorScheme", "light");
+    }
   }
+  // Change to dark theme
   else if (localStorage.getItem("colorScheme") === "light") {
-    // Change to dark theme
-    // media was set to prefers-color-scheme: dark
-    document.querySelector("#dark-css").removeAttribute("media");
-    localStorage.setItem("colorScheme", "dark");;
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches === true) {
+      document.querySelector("#dark-css").setAttribute("media", "(prefers-color-scheme: dark)");
+      localStorage.removeItem("colorScheme");
+    } else {
+      // media was set to prefers-color-scheme: dark
+      document.querySelector("#dark-css").removeAttribute("media");
+      localStorage.setItem("colorScheme", "dark");
+    }
   }
 
   // Just use whatever browsers want
@@ -59,11 +61,10 @@ function changeColorScheme() {
     // Change to light Theme
     document.querySelector("#dark-css").setAttribute("media", "invalid");
     localStorage.setItem("colorScheme", "light");
-  }
-  else {
+  } else {
     // Change to dark theme
     document.querySelector("#dark-css").removeAttribute("media");
-    localStorage.setItem("colorScheme", "dark");;
+    localStorage.setItem("colorScheme", "dark");
   }
 }
 
-- 
2.49.0