From 93c646bca677718f8485e51991bcb434526119bf Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Sun, 28 Jan 2024 19:21:52 +0400
Subject: [PATCH 1/3] fix: set empty alt for illustrations to be ignored by
 screenreaders

---
 layouts/shortcodes/landing-feature.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/shortcodes/landing-feature.html b/layouts/shortcodes/landing-feature.html
index fac9ac2..e582cb8 100644
--- a/layouts/shortcodes/landing-feature.html
+++ b/layouts/shortcodes/landing-feature.html
@@ -11,13 +11,13 @@
         </div>
         {{ if $illustration }}
         <div class="col-md-4 col-xs-12 my-auto">
-            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
+            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}" alt="">
         </div>
         {{ end }}
     {{ else }}
         {{ if $illustration }}
         <div class="col-md-4 col-xs-12 my-auto">
-            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}">
+            <img class="card-img-top rounded-img" src="{{ $illustration.RelPermalink }}" alt="">
         </div>
         {{ end }}
         <div class="col-md-8 col-xs-12 my-auto px-5">

From 73e4b2716d8494c5cc799b0a59645fa2adb9efa8 Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Mon, 29 Jan 2024 20:27:00 +0400
Subject: [PATCH 2/3] fix: add icons to the footer dl section

---
 assets/scss/_styles_project.scss | 12 ++++++++++++
 layouts/partials/footer.html     | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
index 367b5a6..6c06960 100644
--- a/assets/scss/_styles_project.scss
+++ b/assets/scss/_styles_project.scss
@@ -24,6 +24,18 @@
   padding: .5rem 1.5rem;
 }
 
+.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;
+}
+
 .td-navbar .td-navbar-nav-scroll .navbar-nav {
   padding-bottom: 0 !important;
 }
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 8b5aed9..094296b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -44,6 +44,7 @@
         <h2 class="text-secondary">{{ T "footer_download" }}</h2>
           <h3 class="text-secondary">{{ T "footer_download_phone" }}</h3>
           <ul class="list-unstyled">
+<<<<<<< HEAD
             <li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank">{{ 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">{{ 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">{{ T "footer_download_apk" }}</a></li>
@@ -54,6 +55,17 @@
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_linux" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_windows" }}</a></li>
             <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_macos" }}</a></li>
+=======
+            <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://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>
+          </ul>
+        <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
+          <ul class="list-unstyled">
+            <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-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</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-brands fa-linux"></i></span> {{ T "footer_download_linux" }}</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-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
+>>>>>>> 6717733 (fix: add icons to the footer dl section)
           </ul>
 
       </div>

From 1d3856542ae81842397dae733c1da92132c72d3c Mon Sep 17 00:00:00 2001
From: nevfy <yaver4.0.0.0@gmail.com>
Date: Mon, 29 Jan 2024 20:56:12 +0400
Subject: [PATCH 3/3] fix: bad merge

---
 layouts/partials/footer.html | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 094296b..a0d92b1 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -44,28 +44,16 @@
         <h2 class="text-secondary">{{ T "footer_download" }}</h2>
           <h3 class="text-secondary">{{ T "footer_download_phone" }}</h3>
           <ul class="list-unstyled">
-<<<<<<< HEAD
-            <li><a href="https://fdroid.selfprivacy.org/" class="nav-link" rel="noopener noreferrer" target="_blank">{{ 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">{{ 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">{{ T "footer_download_apk" }}</a></li>
-            <li><a href="#" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_ios" }}</a></li>
-          </ul>
-        <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
-          <ul class="list-unstyled">
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link" rel="noopener noreferrer" target="_blank">{{ T "footer_download_linux" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_windows" }}</a></li>
-            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank">{{ T "footer_download_macos" }}</a></li>
-=======
             <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://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>
           </ul>
         <h3 class="text-secondary">{{ T "footer_download_desktop" }}</h3>
           <ul class="list-unstyled">
-            <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-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</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-brands fa-linux"></i></span> {{ T "footer_download_linux" }}</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-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
->>>>>>> 6717733 (fix: add icons to the footer dl section)
+            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-windows"></i></span> {{ T "footer_download_windows" }}</a></li>
+            <li><a href="https://git.selfprivacy.org/kherel/selfprivacy.org.app/releases/latest" class="nav-link sp-coming-soon" rel="noopener noreferrer" target="_blank"><span><i class="fa-brands fa-apple"></i></span> {{ T "footer_download_macos" }}</a></li>
           </ul>
 
       </div>