From 60eea8a6905ef53fdb4c2a912dc1a327c8865678 Mon Sep 17 00:00:00 2001
From: Bhavy Khatri <bhavykhatri@gmail.com>
Date: Tue, 30 Nov 2021 16:18:24 +0530
Subject: [PATCH 1/5] Accessibility Bug Fix: Tab focus doesn't reach Dark mode
 toggle button

---
 _includes/mode-toggle.html |  7 +++++++
 _includes/sidebar.html     | 20 +++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html
index 4108c835455..e19e92f4136 100644
--- a/_includes/mode-toggle.html
+++ b/_includes/mode-toggle.html
@@ -142,4 +142,11 @@
 
   });
 
+  $("#mode-toggle-wrapper").keyup(function(e){
+    if(e.keyCode == 13)
+    {
+      toggle.flipMode();
+    }
+});
+
 </script>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 5fd3eb0307c..f2038c0cf10 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,6 +52,15 @@
   </ul> <!-- ul.nav.flex-column -->
 
   <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center align-items-center">
+    {% unless site.theme_mode %}
+      {% if site.data.contact.size > 0 %}
+        <span class="icon-border order-2"></span>
+      {% endif %}
+
+      <span id="mode-toggle-wrapper" class="order-1" tabindex="0">
+        {% include mode-toggle.html %}
+      </span>
+    {% endunless %}
 
     {% for entry in site.data.contact %}
       {% capture url %}
@@ -78,17 +87,6 @@
       {% endif %}
 
     {% endfor %}
-
-    {% unless site.theme_mode %}
-      {% if site.data.contact.size > 0 %}
-        <span class="icon-border order-2"></span>
-      {% endif %}
-
-      <span id="mode-toggle-wrapper" class="order-1">
-        {% include mode-toggle.html %}
-      </span>
-    {% endunless %}
-
   </div> <!-- .sidebar-bottom -->
 
 </div><!-- #sidebar -->

From 6f4945fa1e594307ca7608ff021d41be288ad500 Mon Sep 17 00:00:00 2001
From: Bhavy Khatri <bhavykhatri@gmail.com>
Date: Tue, 30 Nov 2021 16:29:53 +0530
Subject: [PATCH 2/5] Fix indentation

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

diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html
index e19e92f4136..1e47adc2607 100644
--- a/_includes/mode-toggle.html
+++ b/_includes/mode-toggle.html
@@ -147,6 +147,6 @@
     {
       toggle.flipMode();
     }
-});
+  });
 
 </script>

From b1a31bf60be613b1d709f6dca77d967d993ec1e8 Mon Sep 17 00:00:00 2001
From: Bhavy Khatri <bhavykhatri@gmail.com>
Date: Tue, 30 Nov 2021 18:30:35 +0530
Subject: [PATCH 3/5] small syntax changes

---
 _includes/mode-toggle.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html
index 1e47adc2607..da80863659e 100644
--- a/_includes/mode-toggle.html
+++ b/_includes/mode-toggle.html
@@ -143,8 +143,7 @@
   });
 
   $("#mode-toggle-wrapper").keyup(function(e){
-    if(e.keyCode == 13)
-    {
+    if(e.keyCode == 13) {
       toggle.flipMode();
     }
   });

From 8798e024656b7d1837f59f5aef008c7df0b9a3fb Mon Sep 17 00:00:00 2001
From: Bhavy Khatri <bhavykhatri@gmail.com>
Date: Tue, 30 Nov 2021 20:47:42 +0530
Subject: [PATCH 4/5] Restore code order

---
 _includes/sidebar.html | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index f2038c0cf10..2301fef691e 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,16 +52,6 @@
   </ul> <!-- ul.nav.flex-column -->
 
   <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center align-items-center">
-    {% unless site.theme_mode %}
-      {% if site.data.contact.size > 0 %}
-        <span class="icon-border order-2"></span>
-      {% endif %}
-
-      <span id="mode-toggle-wrapper" class="order-1" tabindex="0">
-        {% include mode-toggle.html %}
-      </span>
-    {% endunless %}
-
     {% for entry in site.data.contact %}
       {% capture url %}
         {%- if entry.type == 'github' -%}
@@ -87,6 +77,17 @@
       {% endif %}
 
     {% endfor %}
+
+    {% unless site.theme_mode %}
+      {% if site.data.contact.size > 0 %}
+        <span class="icon-border order-2"></span>
+      {% endif %}
+
+      <span id="mode-toggle-wrapper" class="order-1" tabindex="0">
+        {% include mode-toggle.html %}
+      </span>
+    {% endunless %}
+    
   </div> <!-- .sidebar-bottom -->
 
 </div><!-- #sidebar -->

From e73e3b26801830b64bb16c6547a58afdf23f76b1 Mon Sep 17 00:00:00 2001
From: Bhavy Khatri <bhavykhatri@gmail.com>
Date: Tue, 30 Nov 2021 20:48:25 +0530
Subject: [PATCH 5/5] small change

---
 _includes/sidebar.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 2301fef691e..2acaa4bc3bf 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,6 +52,7 @@
   </ul> <!-- ul.nav.flex-column -->
 
   <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center align-items-center">
+    
     {% for entry in site.data.contact %}
       {% capture url %}
         {%- if entry.type == 'github' -%}
@@ -87,7 +88,7 @@
         {% include mode-toggle.html %}
       </span>
     {% endunless %}
-    
+
   </div> <!-- .sidebar-bottom -->
 
 </div><!-- #sidebar -->