From 17329fca3a91a19bffe7532b5ba3ff5696517f1f Mon Sep 17 00:00:00 2001
From: Maruan <alshedivat@users.noreply.github.com>
Date: Fri, 31 Dec 2021 19:47:19 +0300
Subject: [PATCH] Fix distill dark mode again (#517)

---
 _layouts/distill.html             |  4 +++-
 _sass/_distill.scss               | 14 +++++++++-----
 assets/js/distillpub/overrides.js |  4 ++++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/_layouts/distill.html b/_layouts/distill.html
index 6f69e29..fd42318 100644
--- a/_layouts/distill.html
+++ b/_layouts/distill.html
@@ -8,7 +8,6 @@
     <!-- Distill js -->
     <script src="{{ '/assets/js/distillpub/template.v2.js' | relative_url }}"></script>
     <script src="{{ '/assets/js/distillpub/transforms.v2.js' | relative_url }}"></script>
-    <script src="{{ '/assets/js/distillpub/overrides.js' | relative_url }}"></script>
     {% if page._styles %}
     <!-- Page/Post style -->
     <style type="text/css">
@@ -105,4 +104,7 @@ <h3>Contents</h3>
   <d-bibliography src="{{ page.bibliography | prepend: '/assets/bibliography/' | relative_url }}">
   </d-bibliography>
 
+  {% include scripts/jquery.html %}
+  <script src="{{ '/assets/js/distillpub/overrides.js' | relative_url }}"></script>
+
 </html>
diff --git a/_sass/_distill.scss b/_sass/_distill.scss
index 344972a..d83fafd 100644
--- a/_sass/_distill.scss
+++ b/_sass/_distill.scss
@@ -44,13 +44,13 @@ d-article {
     width: calc(max(70%, 300px));
     margin-right: 0px;
     margin-top:  0em;
-    display: grid;      
-    grid-template-columns: 
-      minmax(8px, 1fr) [toc] auto 
+    display: grid;
+    grid-template-columns:
+      minmax(8px, 1fr) [toc] auto
       minmax(8px, 1fr) [toc-line] 1px
       minmax(32px, 2fr);
-    
-    nav {      
+
+    nav {
       grid-column: toc;
       a {
         border-bottom: none !important;
@@ -87,6 +87,10 @@ d-article {
       grid-column: toc-line;
     }
   }
+
+  d-footnote {
+    scroll-margin-top: 66px;
+  }
 }
 
 d-appendix {
diff --git a/assets/js/distillpub/overrides.js b/assets/js/distillpub/overrides.js
index 7e4dba7..2d83962 100644
--- a/assets/js/distillpub/overrides.js
+++ b/assets/js/distillpub/overrides.js
@@ -5,6 +5,8 @@ $(document).ready(function() {
             .setAttribute("style", "color: var(--global-theme-color);");
         footnote.shadowRoot.querySelector("d-hover-box").shadowRoot.querySelector("style").sheet
             .insertRule(".panel {background-color: var(--global-bg-color) !important;}");
+        footnote.shadowRoot.querySelector("d-hover-box").shadowRoot.querySelector("style").sheet
+            .insertRule(".panel {border-color: var(--global-divider-color) !important;}");
     });
     // Override styles of the citations.
     document.querySelectorAll("d-cite").forEach(function(cite) {
@@ -16,5 +18,7 @@ $(document).ready(function() {
             .insertRule("ul li a:hover {color: var(--global-theme-color) !important;}");
         cite.shadowRoot.querySelector("d-hover-box").shadowRoot.querySelector("style").sheet
             .insertRule(".panel {background-color: var(--global-bg-color) !important;}");
+        cite.shadowRoot.querySelector("d-hover-box").shadowRoot.querySelector("style").sheet
+            .insertRule(".panel {border-color: var(--global-divider-color) !important;}");
     });
 })
\ No newline at end of file