fix: corrcet hash locate, menu item hilight issues

2 files changed, 16 insertions, 10 deletions

diff --git a/_includes/extensions/hashlocate.html b/_includes/extensions/hashlocate.html
index 6faf553..5194273 100644
--- a/_includes/extensions/hashlocate.html
+++ b/_includes/extensions/hashlocate.html
@@ -7,18 +7,21 @@
       return;
     }
 
-    var header = document.querySelector('header');
+    var header = document.querySelector('header.site-header');
+    var headerRect = header.getBoundingClientRect();
+    var headerTop = Math.floor(headerRect.top);
+    var headerHeight = Math.floor(headerRect.height);
     var scrollPos = getScrollPos();
-    var offsetY = element.offsetTop - (header.offsetTop + header.offsetHeight + 20);
+    var offsetY = element.offsetTop - (headerTop + headerHeight + 20);
 
-    if (offsetY  == scrollPos.y) {
+    if (offsetY == scrollPos.y) {
       return;
     }
 
-    if (header.offsetTop == 0  && offsetY > scrollPos.y) {
-      offsetY += header.offsetHeight;
-    } else if (header.offsetTop < 0  && offsetY < scrollPos.y) {
-      offsetY -= header.offsetHeight;
+    if (headerTop == 0  && offsetY > scrollPos.y) {
+      offsetY += headerHeight + 2;
+    } else if (headerTop < 0  && offsetY < scrollPos.y) {
+      offsetY -= headerHeight - 2;
     }
 
     smoothScrollTo(offsetY);
diff --git a/_includes/sidebar/article-menu.html b/_includes/sidebar/article-menu.html
index 7f83160..c4286b1 100644
--- a/_includes/sidebar/article-menu.html
+++ b/_includes/sidebar/article-menu.html
@@ -36,9 +36,12 @@
       var changed = true;
       for (var i = headings.length - 1; i >= 0; i--) {
         var h = headings[i];
-        var clientRect = h.getBoundingClientRect();
-        var headerHeight = header.offsetTop + header.offsetHeight + 20;
-        if (clientRect.top <= headerHeight) {
+        var headingRect = h.getBoundingClientRect();
+        var headerRect = header.getBoundingClientRect();
+        var headerTop = Math.floor(headerRect.top);
+        var headerHeight = Math.floor(headerRect.height);
+        var headerHeight = headerTop + headerHeight + 20;
+        if (headingRect.top <= headerHeight) {
           var id = 'h-' + h.getAttribute('id');
           var curActive = menu.querySelector('a[href="#' + id  + '"]');
           if (curActive) {