jekyll-theme-amethyst 0.5.4 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '098f1973205c26d8a0bdbb0c188b2be769783ab3b527b39088e3fa2bbbb9e7c6'
-  data.tar.gz: 0fac758e9d16da28ba89ec6e43487a4bb66d65eeb20468111a98a967c3306865
+  metadata.gz: bc62c023ae273db79b3acc529dddc7135d43bfe271fb6881f1bb40ddd1cfe8e2
+  data.tar.gz: e942d04b53cebbc392adeb2568e2c76cc89375c4d2856088e7b3b4882af6536f
 SHA512:
-  metadata.gz: 061a89dc8273ddbe34207b55dee3c2569d0f7feb670f6b3956ab6b48b5c97413c4c5f742f33bb2d61a574c7a0a4a5f328d8bb18c1c41920924a9d4bf45d0c4ef
-  data.tar.gz: d2f40a4e94f42d0a77545f9e61659d25dce7640dea0af24a9597b347adedba086baee1d61fcc3166da6dd0e19597f90b072d5aa1601cd118d39c9ee573b55bfd
+  metadata.gz: 1d408de5207f6847843de164aefefe67e2625788d31cef75e7f3a01d0c9c259d7750465e3efef0acf3572e2561002b5852a7a05b3f2951c009abf6d0715a4a8a
+  data.tar.gz: 31238e7c423a739c1a779ad90a98192efa45d6b7898fe958ddac5f6b69bf71548ac882a705d7e4f5a8115837b972a75d8a6f5f316deec5d5c7d320732c29354c

data/_includes/opengraph.html

@@ -47,7 +47,7 @@
 
 
 {% if layout.amethyst.pagetype == "navigation" %}
-<meta name="robots" content="{{ layout.amethyst.robots | default: 'noindex,follow' }}">
+<meta name="robots" content="{{ page.amethyst.robots | default: layout.amethyst.robots | default: 'noindex,follow' }}">
 <meta name="docsearch:amethyst_pagetype_navigation" content="1">
 {% endif %}
 

data/_sass/typesense-minibar.css

@@ -1,12 +1,12 @@
-/*! https://github.com/jquery/typesense-minibar 1.0.2 */
+/*! https://github.com/jquery/typesense-minibar 1.1.1 */
 .tsmb-form {
   --tsmb-size-edge: 1px;
   --tsmb-size-radius: 3px;
   --tsmb-size-highlight: 2px;
   --tsmb-size-base: 1rem;
   --tsmb-size-sm: 0.8rem;
-  --tsmb-size-half: calc( var(--tsmb-size-sm) * 0.5 );
-  --tsmb-size-input: calc( var(--tsmb-size-base) * 1.2 );
+  --tsmb-size-half: calc(var(--tsmb-size-sm)/2);
+  --tsmb-size-input: calc(var(--tsmb-size-base) * 1.2);
 
   --tsmb-color-base-background: #fff;
   --tsmb-color-base30: #333;
@@ -24,10 +24,12 @@
   position: relative;
   width: 20rem;
   max-width: 100%;
+  padding: 0;
   color: var(--tsmb-color-base30);
 }
 
 .tsmb-form input[type=search] {
+  box-sizing: border-box;
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
@@ -68,15 +70,22 @@
   background: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='654 -372 1664 1664' width='20' height='20'><path d='M1806,332c0-123.3-43.8-228.8-131.5-316.5C1586.8-72.2,1481.3-116,1358-116s-228.8,43.8-316.5,131.5 C953.8,103.2,910,208.7,910,332s43.8,228.8,131.5,316.5C1129.2,736.2,1234.7,780,1358,780s228.8-43.8,316.5-131.5 C1762.2,560.8,1806,455.3,1806,332z M2318,1164c0,34.7-12.7,64.7-38,90s-55.3,38-90,38c-36,0-66-12.7-90-38l-343-342 c-119.3,82.7-252.3,124-399,124c-95.3,0-186.5-18.5-273.5-55.5s-162-87-225-150s-113-138-150-225S654,427.3,654,332 s18.5-186.5,55.5-273.5s87-162,150-225s138-113,225-150S1262.7-372,1358-372s186.5,18.5,273.5,55.5s162,87,225,150s113,138,150,225 S2062,236.7,2062,332c0,146.7-41.3,279.7-124,399l343,343C2305.7,1098.7,2318,1128.7,2318,1164z'/></svg>") 0 50% / contain no-repeat;
   position: absolute;
   top: calc(var(--tsmb-size-sm) + var(--tsmb-size-edge));
-  left: var(--tsmb-size-base);
+  left: var(--tsmb-size-sm);
   width: var(--tsmb-size-base);
   height: var(--tsmb-size-input);
   opacity: 0.5;
 }
 
+/* js only */
+.tsmb-form--open input[type=search],
+.tsmb-form--slash input[type=search] {
+  padding-right: calc(var(--tsmb-size-sm) + var(--tsmb-size-base) + var(--tsmb-size-base));
+}
+
 .tsmb-icon-close {
+  box-sizing: border-box;
   position: absolute;
-  top: calc(50% - var(--tsmb-size-base) / 2);
+  top: calc(50% - var(--tsmb-size-base)/2);
   right: var(--tsmb-size-base);
   width: var(--tsmb-size-base);
   height: var(--tsmb-size-base);
@@ -95,15 +104,16 @@
   content: '/';
   display: inline-block;
   position: absolute;
-  top: calc(var(--tsmb-size-sm) + var(--tsmb-size-edge) + (var(--tsmb-size-input) / 2) - 1em - var(--tsmb-size-edge));
-  right: var(--tsmb-size-base);
-  width: 2em;
-  height: 2em;
+  top: calc(50% - (var(--tsmb-size-input) + var(--tsmb-size-sm)/2)/2);
+  right: var(--tsmb-size-sm);
+  width: calc(var(--tsmb-size-input) + var(--tsmb-size-sm)/2);
+  height: calc(var(--tsmb-size-input) + var(--tsmb-size-sm)/2);
 
-  font-size: var(--tsmb-size-sm);
-  line-height: 2;
+  font-size: var(--tsmb-size-base);
+  line-height: calc(var(--tsmb-size-input) + var(--tsmb-size-sm)/2);
   text-align: center;
 
+  background: var(--tsmb-color-base-background);
   border: var(--tsmb-size-edge) solid var(--tsmb-color-base90);
   border-radius: var(--tsmb-size-radius);
   color: var(--tsmb-color-base90);
@@ -179,15 +189,14 @@
   padding: var(--tsmb-size-base);
 }
 
-.tsmb-foot {
+.tsmb-foot,
+.tsmb-foot:hover {
   display: block;
   text-align: right;
   font-size: var(--tsmb-size-sm);
   line-height: 18px;
   padding: var(--tsmb-size-half) var(--tsmb-size-sm);
   box-shadow: 0 0 10px rgba(0,0,0,0.12);
-}
-.tsmb-foot:hover {
   text-decoration: none;
 }
 .tsmb-foot::before {

data/assets/typesense-minibar.js

@@ -1,9 +1,23 @@
-/*! https://github.com/jquery/typesense-minibar 1.0.2 */
+/*! https://github.com/jquery/typesense-minibar 1.1.1 */
 globalThis.tsminibar = function tsminibar (form) {
-  const { origin, key, collection } = form.dataset;
+  const { origin, collection } = form.dataset;
   const group = !!form.dataset.group;
   const cache = new Map();
-  const state = { query: '', hits: [], cursor: -1, open: false };
+  const state = { query: '', cursor: -1, open: false, hits: [] };
+  const searchParams = new URLSearchParams({
+    per_page: '5',
+    query_by: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content',
+    include_fields: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content,url_without_anchor,url,id',
+    highlight_full_fields: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content',
+    group_by: 'url_without_anchor',
+    group_limit: '1',
+    sort_by: 'item_priority:desc',
+    snippet_threshold: '8',
+    highlight_affix_num_tokens: '12',
+    'x-typesense-api-key': form.dataset.key,
+    ...Object.fromEntries(new URLSearchParams(form.dataset.searchParams))
+  });
+  const noResults = form.dataset.noResults || "No results for '{}'.";
 
   const input = form.querySelector('input[type=search]');
   const listbox = document.createElement('div');
@@ -12,11 +26,11 @@ globalThis.tsminibar = function tsminibar (form) {
   input.after(listbox);
 
   let preconnect = null;
-  input.addEventListener('focus', () => {
+  input.addEventListener('focus', function () {
     if (!preconnect) {
       preconnect = document.createElement('link');
       preconnect.rel = 'preconnect';
-      preconnect.crossOrigin = 'anonymous'; // for fetch mode:cors,credentials:omit
+      preconnect.crossOrigin = 'anonymous'; // match fetch cors,credentials:omit
       preconnect.href = origin;
       document.head.append(preconnect);
     }
@@ -25,19 +39,12 @@ globalThis.tsminibar = function tsminibar (form) {
       render();
     }
   });
-  input.addEventListener('click', () => {
-    if (!state.open && state.hits.length) {
-      state.open = true;
-      render();
-    }
-  });
-  input.addEventListener('input', async () => {
+  input.addEventListener('input', async function () {
     const query = state.query = input.value;
     if (!query) {
       state.hits = []; // don't leak old hits on focus
       state.cursor = -1;
-      close();
-      return;
+      return close();
     }
     const hits = await search(query);
     if (state.query === query) { // ignore non-current query
@@ -47,8 +54,14 @@ globalThis.tsminibar = function tsminibar (form) {
       render();
     }
   });
-  input.addEventListener('keydown', (e) => {
-    if (!(e.altKey || e.ctrlKey || e.metaKey || e.shiftKey)) {
+  input.addEventListener('click', function () {
+    if (!state.open && state.hits.length) {
+      state.open = true;
+      render();
+    }
+  });
+  input.addEventListener('keydown', function (e) {
+    if (!e.altKey && !e.ctrlKey && !e.metaKey && !e.shiftKey) {
       if (e.code === 'ArrowDown') moveCursor(1);
       if (e.code === 'ArrowUp') moveCursor(-1);
       if (e.code === 'Escape') close();
@@ -58,11 +71,15 @@ globalThis.tsminibar = function tsminibar (form) {
       }
     }
   });
-  form.addEventListener('submit', (e) => {
+  form.addEventListener('submit', function (e) {
     e.preventDefault(); // disable fallback
   });
   form.insertAdjacentHTML('beforeend', '<svg viewBox="0 0 12 12" width="20" height="20" aria-hidden="true" class="tsmb-icon-close" style="display: none;"><path d="M9 3L3 9M3 3L9 9"/></svg>');
-  form.querySelector('.tsmb-icon-close').addEventListener('click', close);
+  form.querySelector('.tsmb-icon-close').addEventListener('click', function () {
+    input.value = '';
+    input.focus();
+    close();
+  });
   connect();
 
   function close () {
@@ -98,30 +115,19 @@ globalThis.tsminibar = function tsminibar (form) {
   }
 
   async function search (query) {
+    let lvl0;
     let hits = cache.get(query);
     if (hits) {
       cache.delete(query);
       cache.set(query, hits); // LRU
       return hits;
     }
+    searchParams.set('q', query);
     const resp = await fetch(
-      `${origin}/collections/${collection}/documents/search?` + new URLSearchParams({
-        q: query,
-        per_page: '5',
-        query_by: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content',
-        include_fields: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content,url_without_anchor,url,id',
-        highlight_full_fields: 'hierarchy.lvl0,hierarchy.lvl1,hierarchy.lvl2,hierarchy.lvl3,hierarchy.lvl4,hierarchy.lvl5,content',
-        group_by: 'url_without_anchor',
-        group_limit: '1',
-        sort_by: 'item_priority:desc',
-        snippet_threshold: '8',
-        highlight_affix_num_tokens: '12',
-        'x-typesense-api-key': key,
-      }),
+      `${origin}/collections/${collection}/documents/search?` + searchParams,
       { mode: 'cors', credentials: 'omit', method: 'GET' }
     );
     const data = await resp.json();
-    let lvl0;
     hits = data?.grouped_hits?.map(ghit => {
       const hit = ghit.hits[0];
       return {
@@ -146,7 +152,7 @@ globalThis.tsminibar = function tsminibar (form) {
     listbox.hidden = !state.open;
     form.classList.toggle('tsmb-form--open', state.open);
     if (state.open) {
-      listbox.innerHTML = (state.hits.map((hit, i) => `<div role="option"${i === state.cursor ? ' aria-selected="true"' : ''}>${hit.lvl0 ? `<div class="tsmb-suggestion_group">${hit.lvl0}</div>` : ''}<a href="${hit.url}" tabindex="-1"><div class="tsmb-suggestion_title">${hit.title}</div><div class="tsmb-suggestion_content">${hit.content}</div></a></div>`).join('') || `<div class="tsmb-empty">No results for '${escape(state.query)}'.</div>`) + (form.dataset.foot ? '<a href="https://typesense.org" class="tsmb-foot" title="Search by Typesense"></a>' : '');
+      listbox.innerHTML = (state.hits.map((hit, i) => `<div role="option"${i === state.cursor ? ' aria-selected="true"' : ''}>${hit.lvl0 ? `<div class="tsmb-suggestion_group">${hit.lvl0}</div>` : ''}<a href="${hit.url}" tabindex="-1"><div class="tsmb-suggestion_title">${hit.title}</div><div class="tsmb-suggestion_content">${hit.content}</div></a></div>`).join('') || `<div class="tsmb-empty">${noResults.replace('{}', escape(state.query))}</div>`) + (form.dataset.foot ? '<a href="https://typesense.org" class="tsmb-foot" title="Search by Typesense"></a>' : '');
     }
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-amethyst
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.6
 platform: ruby
 authors:
 - Timo Tijhof
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -65,28 +65,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: jekyll-feed
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: jekyll-archives
   requirement: !ruby/object:Gem::Requirement