jekyll-ham 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d9bce136793f181a7227a0bd17ef8d2191e3bf834aa80a48d1f509feb7a7cd
-  data.tar.gz: cf3a60ab44ce32017302ffd28fee2b91dcbb213c31fd7528d68efbf12ce35d71
+  metadata.gz: a62916483d33bfe35d4ba07584c67024a2805656337f17a74400001fb0ff0736
+  data.tar.gz: f41683049c26e0fbd4ac22dc1a7081dec4085675fd46f7325e08427b92fa0093
 SHA512:
-  metadata.gz: 9d06d7430743e1ee12b58bf02fbf9ed8b5676f1a05abc29571cd4be206e4be32726d7be2d5b6c1e9fcbb9cfa15d2709a7bc426325a02a5511c59046d99084a3c
-  data.tar.gz: 5c584f8a2bc52bb734839d5e8137002980bb277fa5cd36edaafda4fb8b2b57f91dda198c79a768ff8f1927347e93755ffe5f514a8be0433273d3877c1efb98f6
+  metadata.gz: 2bff65101e73ca1379b195a0fba6c21acafefb1e37d2f582a18401131c2bad163243f38ead09f3c7070b4864446902b82abcdbbf70081f064991bdab0e591c77
+  data.tar.gz: e8573a85f3fb71985695f1caee6da374d33e0a969322f1b80e42ecdfbd7053863d4691b5aeaa4c834cfff0b7aaced6dc118edaeccd040f9ac5fab524b5eb8657

data/_includes/ham/navbar.html

@@ -5,7 +5,7 @@
         <i class="bi bi-list-nested" aria-hidden="true"></i>
       </button>
     </div>
-    <a class="navbar-brand" href="#">
+    <a class="navbar-brand" href="/">
       {% if site.ham.site_icon != null %}
         <img src="{{ site.ham.site_icon }}" alt="{{ site.title }}" width="24" height="24" class="d-inline-block align-text-top">
       {% endif %}{{ site.title }}

data/_includes/ham/sidebar.html

@@ -2,12 +2,10 @@
   <div class="offcanvas-header d-md-none border-bottom border-secondary border-opacity-25">
     <a href="/" class="sidebar-brand">
       {% if site.ham.site_icon != null %}
-        <img src="{{ site.ham.site_icon }}" alt="{{ site.title }}">
+        <img src="{{ site.ham.site_icon }}" alt="{{ site.title }}" width="24" height="24">
       {% endif %}{{ site.title }}
     </a>
-    <button type="button" class="btn-close d-md-none" data-bs-dismiss="offcanvas" aria-label="Close" data-bs-target="#_ham_sidebar">
-      <i class="bi bi-x-lg" aria-description="Close sidebar"></i>
-    </button>
+    <button type="button" class="btn-close d-md-none" aria-label="Close" data-bs-dismiss="offcanvas" data-bs-target="#_ham_sidebar"></button>
   </div>
   <div class="offcanvas-body">
     <div class="mb-3">

data/_layouts/default.html

@@ -67,7 +67,7 @@
     document.getElementById('_ham_search_input').addEventListener('change', updateSearchResultsVisibility);
     document.getElementById('_ham_search_input').addEventListener('input', updateSearchResultsVisibility);
   </script>
-  <!-- Halfmoon JS -->
+  <!-- Bootstrap JS -->
   <script src="{{ site.url }}/assets/halfmoon.min.js"></script>
   <!-- Bootstrap JS for color modes -->
   <script src="{{ site.url }}/assets/bootstrap-color-modes.js"></script>

data/_layouts/page.html

@@ -2,10 +2,10 @@
 layout: default
 ---
 <article class="row px-1 py-3">
-  <div class="col-xl-8 collapse-group article-wrapper" id="_ham_content">
+  <div class="col-xl-8 collapse-group article-wrapper mb-3" id="_ham_content">
     {{ content }}
   </div>
-  <div class="col-xl-4">
+  <div class="col-xl-4 mb-3">
     {% if page.related_topics != null %}
       <div class="mb-3">
         <h5 id="related-topics" class="sidebar-title">Related Topics</h5>

data/assets/entry-parser.js

@@ -61,12 +61,14 @@ function parseRawEntry(originalContent, onThisPageEntry, siteTitle, siteTagline)
       var newA = document.createElement('a');
       newA.href = '#' + node.id;
       newA.className = 'nav-link text-truncate';
-      newA.setAttribute('onclick', 'expandAccordion(\'' + currentAccordionId + '\')');
+      newA.setAttribute('data-bs-dismiss', 'offcanvas');
+      newA.setAttribute('data-bs-target', '#_ham_sidebar');
+      newA.setAttribute('onclick', 'expandAccordion(\'' + currentAccordionId + '\', \'' + node.id + '\')');
       for (j = 2; j < currentHeadingLevel; j++){
         var newSpan = document.createElement('span');
         if (j == currentHeadingLevel - 1) {
           newSpan.className = 'me-1 d-inline-block text-body-tertiary';
-          newSpan.textContent = '↳';
+          newSpan.innerHTML = '<i class="bi bi-arrow-return-right"></i>';
         } else {
           newSpan.className = 'ms-3 d-inline-block';
         }
@@ -193,9 +195,14 @@ function autoexpandAccordion(){
   }
 }
 
-async function expandAccordion(id){
-  var el = new bootstrap.Collapse(document.getElementById(id + "-content"), {toggle: false});
+async function expandAccordion(collapsibleId, contentId){
+  var el = new bootstrap.Collapse(document.getElementById(collapsibleId + "-content"), {toggle: false});
   await el.show();
+  if (contentId) {
+    location.hash = "";
+    location.hash = "#" + contentId;
+    scrollBy(0, -66);
+  }
 }
 
 window.addEventListener("load", autoexpandAccordion);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ham
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Reinhart Previano Koentjoro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll