From 9077451d1ed69cb04018769d85eb02828bee8fac Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 4 Feb 2024 22:48:27 +0400
Subject: [PATCH 1/6] feat: move docsy overrides to a separate file

---
 assets/scss/_styles_project.scss | 34 +--------------
 assets/scss/docsy_overrides.scss | 74 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 33 deletions(-)
 create mode 100644 assets/scss/docsy_overrides.scss

diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 0ca446c..5276f65 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -1,32 +1,4 @@
-.td-navbar {
-  background: $dark;
-  min-height: 5rem;
-  .navbar-brand__name {
-    display: none;
-  }
-  .nav-link {
-    color: $secondary !important;
-    font-weight: 600;
-  }
-  .nav-link:hover, .nav-link.active{
-    background-color: #616161;
-    color: white;
-    border-radius: 5px;
-  }
-}
-
-.td-breadcrumbs__single {
-  visibility: hidden;
-}
-
-.td-navbar .td-navbar-nav-scroll {
-  height: unset !important;
-  margin-top: unset !important;
-}
-
-.td-navbar .td-navbar-nav-scroll .nav-link {
-  padding: .5rem 1.5rem;
-}
+@import "docsy_overrides";
 
 .sp-footer a.nav-link span {
   width: 2rem;
@@ -40,10 +12,6 @@
   margin: auto;
 }
 
-.td-navbar .td-navbar-nav-scroll .navbar-nav {
-  padding-bottom: 0 !important;
-}
-
 .nav-item {
   margin-right: .5rem !important;
 }
diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
new file mode 100644
index 0000000..85820d2
--- /dev/null
+++ b/assets/scss/docsy_overrides.scss
@@ -0,0 +1,74 @@
+.td-navbar {
+    background: $dark;
+    min-height: 5rem;
+    .navbar-brand__name {
+        display: none;
+    }
+    .nav-link {
+        color: $secondary !important;
+        font-weight: 600;
+    }
+    .nav-link:hover, .nav-link.active{
+        background-color: #616161;
+        color: white;
+        border-radius: 5px;
+    }
+    .td-navbar-nav-scroll {
+        height: unset !important;
+        margin-top: unset !important;
+    }
+    .td-navbar-nav-scroll .nav-link {
+        padding: .5rem 1.5rem;
+    }
+    .td-navbar-nav-scroll .navbar-nav {
+    padding-bottom: 0 !important;
+    }
+}
+
+.td-breadcrumbs__single {
+    visibility: hidden;
+}
+
+.td-sidebar-nav .td-sidebar-link__page,
+ul.ul-2>.td-sidebar-nav__section-title a {
+  color: #616161 !important;
+  font-weight: 400;
+}
+
+ul.ul-2>.td-sidebar-nav__section-title a:hover {
+  color: $blue !important;
+}
+
+.td-toc ul {
+    margin-top: 1rem;
+  }
+  
+  .td-toc li {
+    display: block;
+    padding-bottom: .5rem;
+  }
+  
+  .td-toc a{
+    display: inline !important;
+  }
+
+  .tab-content .tab-pane {
+    border: 1px solid rgba(0, 0, 0, 0.125) !important;
+    border-radius: 0px .25rem .25rem .25rem;
+  }
+  
+  .nav-tabs {
+    border: none !important;
+  }
+  
+  .nav-tabs a:not(.active).nav-link:hover {
+    background-color:  #0d6efd11;
+  }
+  
+  .td-content ul li, .td-content ol li {
+    margin-bottom: unset !important;
+  }
+  
+  .tab-content div {
+    transition: none;
+  }
\ No newline at end of file

From 7e257894f2875f8cc9a888d53848d57d5ac0fc7e Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 4 Feb 2024 23:09:40 +0400
Subject: [PATCH 2/6] fix: use sass nesting

---
 assets/scss/_styles_project.scss | 92 ++++--------------------------
 assets/scss/docsy_overrides.scss | 98 +++++++++++++++++++++++---------
 2 files changed, 80 insertions(+), 110 deletions(-)

diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 5276f65..2713c20 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -1,72 +1,5 @@
 @import "docsy_overrides";
 
-.sp-footer a.nav-link span {
-  width: 2rem;
-  display: inline-flex;
-  align-items: center;
-  border-radius: .1rem;
-  padding: .5rem;
-}
-
-.sp-footer span i {
-  margin: auto;
-}
-
-.nav-item {
-  margin-right: .5rem !important;
-}
-
-.dropdown-menu {
-  right: 0;
-  left: unset;
-  padding: 0px;
-  box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
-}
-
-.dropdown-item {
-  padding: 0.5rem 1.5rem;
-  border-radius: 0.25rem;
-}
-
-.td-sidebar-nav .td-sidebar-link__page,
-ul.ul-2>.td-sidebar-nav__section-title a {
-  color: #616161 !important;
-  font-weight: 400;
-}
-
-ul.ul-2>.td-sidebar-nav__section-title a:hover {
-  color: $blue !important;
-}
-
-li:has(input[type="checkbox"]) {
-  list-style-type: none;
-}
-
-  .td-toc ul {
-  margin-top: 1rem;
-}
-
-.td-toc li {
-  display: block;
-  padding-bottom: .5rem;
-}
-
-.td-toc a{
-  display: inline !important;
-}
-
-@media (min-width: 768px)  {
-  .td-sidebar {
-    padding-top: 5rem;
-  }
-  .td-404 main, .td-main main {
-    padding-top: 6.5rem;
-  }
-  .td-sidebar-toc {
-    padding-top: 2.75rem;
-  }
-}
-
 .rounded-img {
   border-radius: 1rem;
 }
@@ -84,10 +17,6 @@ li:has(input[type="checkbox"]) {
   padding-top: 0.8rem;
 }
 
-.btn {
-    font-weight: 600;
-}
-
 .sp-feature-title {
   font-weight: 600;
 }
@@ -97,23 +26,26 @@ li:has(input[type="checkbox"]) {
     font-weight: 600;
     padding: 0.3rem 0;
     color: $navbar-dark-color;
-
     &:hover {
       color: $navbar-dark-hover-color;
     }
-
     &:active {
       color: $navbar-dark-active-color;
     }
-
     &:disabled {
       color: $navbar-dark-disabled-color;
     }
+    span {
+      width: 2rem;
+      display: inline-flex;
+      align-items: center;
+      border-radius: .1rem;
+      padding: .5rem;
+    }
+  }
+  span i {
+    margin: auto;
   }
-}
-
-.text-secondary {
-  font-weight: 600;
 }
 
 .sp-service-icon {
@@ -135,10 +67,6 @@ li:has(input[type="checkbox"]) {
   margin-top: 6rem;
 }
 
-.tab-content .tab-pane {
-  max-width: 100% !important;
-}
-
 .sp-supperted-by-img {
   max-height: 5rem;
   margin: 1rem;
diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
index 85820d2..c682641 100644
--- a/assets/scss/docsy_overrides.scss
+++ b/assets/scss/docsy_overrides.scss
@@ -39,36 +39,78 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover {
   color: $blue !important;
 }
 
-.td-toc ul {
-    margin-top: 1rem;
-  }
-  
-  .td-toc li {
-    display: block;
-    padding-bottom: .5rem;
-  }
-  
-  .td-toc a{
-    display: inline !important;
-  }
+.td-toc {
+    ul {
+        margin-top: 1rem;
+    }
+    li {
+        display: block;
+        padding-bottom: .5rem;
+    }
+    a {
+        display: inline !important;
+    }
+}
 
-  .tab-content .tab-pane {
-    border: 1px solid rgba(0, 0, 0, 0.125) !important;
-    border-radius: 0px .25rem .25rem .25rem;
-  }
-  
-  .nav-tabs {
+.tab-content {
+    .tab-pane {
+        border: 1px solid rgba(0, 0, 0, 0.125) !important;
+        border-radius: 0px .25rem .25rem .25rem;
+    }
+    ul li, ol li {
+        margin-bottom: unset !important;
+    }
+    div {
+        transition: none;
+    }
+    .tab-pane {
+        max-width: 100% !important;
+    }
+}
+
+.nav-tabs {
     border: none !important;
-  }
+    a:not(.active).nav-link:hover {
+        background-color:  #0d6efd11;
+    }
+}
+
+.nav-item {
+    margin-right: .5rem !important;
+}
   
-  .nav-tabs a:not(.active).nav-link:hover {
-    background-color:  #0d6efd11;
-  }
+.dropdown-menu {
+    right: 0;
+    left: unset;
+    padding: 0px;
+    box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
+}
   
-  .td-content ul li, .td-content ol li {
-    margin-bottom: unset !important;
-  }
+.dropdown-item {
+    padding: 0.5rem 1.5rem;
+    border-radius: 0.25rem;
+}
   
-  .tab-content div {
-    transition: none;
-  }
\ No newline at end of file
+li:has(input[type="checkbox"]) {
+    list-style-type: none;
+}
+
+.btn {
+    font-weight: 600;
+}
+
+.text-secondary {
+    font-weight: 600;
+}
+
+@media (min-width: 768px)  {
+    .td-sidebar {
+      padding-top: 5rem;
+    }
+    .td-404 main, .td-main main {
+      padding-top: 6.5rem;
+    }
+    .td-sidebar-toc {
+      padding-top: 2.75rem;
+    }
+}
\ No newline at end of file

From 2c556abba05e030f38de1081dea599e834ddbe6c Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 4 Feb 2024 23:16:04 +0400
Subject: [PATCH 3/6] fix: more sass nesting

---
 assets/scss/docsy_overrides.scss | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
index c682641..d383e5e 100644
--- a/assets/scss/docsy_overrides.scss
+++ b/assets/scss/docsy_overrides.scss
@@ -10,18 +10,17 @@
     }
     .nav-link:hover, .nav-link.active{
         background-color: #616161;
-        color: white;
         border-radius: 5px;
     }
     .td-navbar-nav-scroll {
         height: unset !important;
         margin-top: unset !important;
-    }
-    .td-navbar-nav-scroll .nav-link {
-        padding: .5rem 1.5rem;
-    }
-    .td-navbar-nav-scroll .navbar-nav {
-    padding-bottom: 0 !important;
+        .nav-link {
+            padding: .5rem 1.5rem;
+        }
+        .navbar-nav {
+            padding-bottom: 0 !important;
+        }
     }
 }
 
@@ -31,12 +30,12 @@
 
 .td-sidebar-nav .td-sidebar-link__page,
 ul.ul-2>.td-sidebar-nav__section-title a {
-  color: #616161 !important;
-  font-weight: 400;
+    color: #616161 !important;
+    font-weight: 400;
 }
 
 ul.ul-2>.td-sidebar-nav__section-title a:hover {
-  color: $blue !important;
+    color: $blue !important;
 }
 
 .td-toc {
@@ -95,22 +94,19 @@ li:has(input[type="checkbox"]) {
     list-style-type: none;
 }
 
-.btn {
-    font-weight: 600;
-}
-
+.btn,
 .text-secondary {
     font-weight: 600;
 }
 
 @media (min-width: 768px)  {
     .td-sidebar {
-      padding-top: 5rem;
+        padding-top: 5rem;
     }
     .td-404 main, .td-main main {
-      padding-top: 6.5rem;
+        padding-top: 6.5rem;
     }
     .td-sidebar-toc {
-      padding-top: 2.75rem;
+        padding-top: 2.75rem;
     }
 }
\ No newline at end of file

From 4f786bf803371cd663a1144553ecd9a4a7e500a8 Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 4 Feb 2024 23:25:23 +0400
Subject: [PATCH 4/6] fix: add variables

---
 assets/scss/_styles_project.scss    | 2 +-
 assets/scss/_variables_project.scss | 4 ++++
 assets/scss/docsy_overrides.scss    | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 2713c20..3e52b19 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -81,7 +81,7 @@
 
 .sp-supported-by-card {
   background: #FFFFFF;
-  box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
+  box-shadow: $shadow;
   border-radius: 10px;
   border: none;
   margin-top: 1rem;
diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss
index c284a43..642d12f 100644
--- a/assets/scss/_variables_project.scss
+++ b/assets/scss/_variables_project.scss
@@ -6,7 +6,11 @@ Add styles or override variables from the theme here.
 
 $primary: #7EB07F;
 $secondary: #F2C94C;
+$gray: #616161;
 $dark: #30312C;
+$bg-color: whitesmoke;
+
+$shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
 
 $td-enable-google-fonts: false;
 $google_font_name: "Montserrat";
diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
index d383e5e..5702ce0 100644
--- a/assets/scss/docsy_overrides.scss
+++ b/assets/scss/docsy_overrides.scss
@@ -9,7 +9,7 @@
         font-weight: 600;
     }
     .nav-link:hover, .nav-link.active{
-        background-color: #616161;
+        background-color: $gray;
         border-radius: 5px;
     }
     .td-navbar-nav-scroll {
@@ -30,7 +30,7 @@
 
 .td-sidebar-nav .td-sidebar-link__page,
 ul.ul-2>.td-sidebar-nav__section-title a {
-    color: #616161 !important;
+    color: $gray !important;
     font-weight: 400;
 }
 
@@ -82,7 +82,7 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover {
     right: 0;
     left: unset;
     padding: 0px;
-    box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25);
+    box-shadow: $shadow;
 }
   
 .dropdown-item {

From 34d991ff5036b8746297e7828def365d0870f70a Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 4 Feb 2024 23:35:17 +0400
Subject: [PATCH 5/6] fix: more nesting

---
 assets/scss/_styles_project.scss | 21 ++++++++++-----------
 assets/scss/docsy_overrides.scss | 19 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 3e52b19..a857511 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -88,21 +88,20 @@
 }
 
 body {
-  background-color: whitesmoke;
+  background-color: $bg-color;
 }
 
 a.nav-link.sp-coming-soon {
   pointer-events: none;
   cursor: default;
   color: #616161;
+  &::after {
+    content: "Coming soon!";
+    display: inline-block;
+    background-color: #616161;
+    color: $dark;
+    margin-left: .5rem;
+    padding: .1rem .5rem;
+    border-radius: .1rem;
+  }
 }
-
-a.nav-link.sp-coming-soon::after {
-  content: "Coming soon!";
-  display: inline-block;
-  background-color: #616161;
-  color: $dark;
-  margin-left: .5rem;
-  padding: .1rem .5rem;
-  border-radius: .1rem;
-}
\ No newline at end of file
diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
index 5702ce0..6439f98 100644
--- a/assets/scss/docsy_overrides.scss
+++ b/assets/scss/docsy_overrides.scss
@@ -7,10 +7,10 @@
     .nav-link {
         color: $secondary !important;
         font-weight: 600;
-    }
-    .nav-link:hover, .nav-link.active{
-        background-color: $gray;
-        border-radius: 5px;
+        &:hover, &.nav-link.active{
+            background-color: $gray;
+            border-radius: 5px;
+        }
     }
     .td-navbar-nav-scroll {
         height: unset !important;
@@ -32,10 +32,9 @@
 ul.ul-2>.td-sidebar-nav__section-title a {
     color: $gray !important;
     font-weight: 400;
-}
-
-ul.ul-2>.td-sidebar-nav__section-title a:hover {
-    color: $blue !important;
+    &:hover {
+        color: $blue !important;
+    }
 }
 
 .td-toc {
@@ -55,6 +54,7 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover {
     .tab-pane {
         border: 1px solid rgba(0, 0, 0, 0.125) !important;
         border-radius: 0px .25rem .25rem .25rem;
+        max-width: 100% !important;
     }
     ul li, ol li {
         margin-bottom: unset !important;
@@ -62,9 +62,6 @@ ul.ul-2>.td-sidebar-nav__section-title a:hover {
     div {
         transition: none;
     }
-    .tab-pane {
-        max-width: 100% !important;
-    }
 }
 
 .nav-tabs {

From 3145d5751103fb0b54cd40916327a54165d2f248 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Thu, 8 Feb 2024 15:39:50 +0300
Subject: [PATCH 6/6] fix: Link to fdroid

---
 layouts/partials/footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index a0d92b1..a77b83c 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -44,7 +44,7 @@
         <h2 class="text-secondary">{{ T "footer_download" }}</h2>
           <h3 class="text-secondary">{{ T "footer_download_phone" }}</h3>
           <ul class="list-unstyled">
-            <li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-android"></i></span> {{ T "footer_download_fdroid" }}</a></li>
+            <li><a href="https://f-droid.org/en/packages/pro.kherel.selfprivacy/" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-android"></i></span> {{ T "footer_download_fdroid" }}</a></li>
             <li><a href="https://play.google.com/store/apps/details?id=org.selfprivacy.app" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-play"></i></span> {{ T "footer_download_google_play" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank"><span><i class="fa-solid fa-file"></i></span> {{ T "footer_download_apk" }}</a></li>
             <li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_ios" }}</a></li>
@@ -57,4 +57,4 @@
           </ul>
 
       </div>
-</div>
\ No newline at end of file
+</div>