jekyll-theme-amethyst 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 632ca2202b988416ea82997c0c2fb154ab96c7b806256ee2fd4e0e743a59faaf
-  data.tar.gz: cccf46ca9b07948abbfee973daba0ddff8fc1203c06ec6e3809109e01b8f39ec
+  metadata.gz: 6f24ddb3ef8eea41aefe27157c649ee526fb88508a0500b40a4ae6be5ee2829e
+  data.tar.gz: ffede56a7da05fce5c4681135f4e4c11b1e322d8b1fde377849262b0339d71b7
 SHA512:
-  metadata.gz: 870a76a617a6e746caf693d670d8a36f9c55de8789f68b4d41b3c7249e3c728aab153987daf0a2df32cbe37355ea1d9b7424099e8b15c50ce304fec00860f657
-  data.tar.gz: 56eda079a866dcfad9f3eaf8fe8a77592f873d53044a6b6fe535e91dbd9b0a78a8304decc4e4c237cce8f43e5bd4a756f393b014a787e89508a1874241a793d6
+  metadata.gz: 9a8681d0da13282f8ac0de2c56cfab79900c90360195f656b244f370145c0bb7c6934839294a7ba363155b60fed34bf60535e6c2e46716ec290e866d3056c2ab
+  data.tar.gz: 8eb5fc49da1f95afa1f717ebc65f9c0bf168f9bbded302377ea2ece1ba53b0aba7008a5420cbb68f5922be13427bfc757ce82cff8fc0c4535dd630101cbb2477

data/_includes/search.html

@@ -1,5 +1,5 @@
-<typesense-minibar>
-<form role="search"{% if site.amethyst.typesense.search_only_api_key %} data-origin="{{ site.amethyst.typesense.origin | escape }}" data-collection="{{ site.amethyst.typesense.collection | escape }}" data-key="{{ site.amethyst.typesense.search_only_api_key | escape }}" data-foot="true"{% endif %} action="https://duckduckgo.com">
+<typesense-minibar{% if site.amethyst.typesense.search_only_api_key %} data-origin="{{ site.amethyst.typesense.origin | escape }}" data-collection="{{ site.amethyst.typesense.collection | escape }}" data-key="{{ site.amethyst.typesense.search_only_api_key | escape }}" data-foot="true"{% endif %}>
+<form role="search" action="https://duckduckgo.com">
     <input type="search" name="q" aria-label="Search" placeholder="Search..." autocomplete="off">
     <input type="hidden" name="sites" value="{{ site.url | remove_first: 'http://' | remove_first: 'https://' }}">
 </form>

data/_sass/amethyst-variables-all.scss

@@ -0,0 +1,21 @@
+@forward "amethyst-variables";
+
+$size-sm: 0.8rem;
+$size-1: 1rem;
+$size-2: 1.333rem;
+$size-3: 1.777rem;
+$size-4: 2.369rem;
+$size-5: 3.157rem;
+$size-spacing: $size-2;
+$box-spacing: $size-1;
+
+$color-white: #fff;
+$color-light: #f4f4f4;
+$color-off-white: #cdcdcd;
+$color-darkgrey: #63676d; // based on 2015 api.jquery.com design
+$color-black: #333;
+
+$screen-s: 480px;
+$screen-m: 768px;
+$screen-l: 992px;
+$screen-xl: 1200px;

data/_sass/amethyst-variables.scss

@@ -1,4 +1,5 @@
 // Amethyst theme variables
+// Override by creating a local `_sass/amethyst-variables.scss` file in your project.
 
 // Primary color
 //

data/_sass/amethyst.scss

@@ -2,25 +2,9 @@
 
 // Amethyst theme for Jekyll
 
-$size-sm: 0.8rem;
-$size-1: 1rem;
-$size-2: 1.333rem;
-$size-3: 1.777rem;
-$size-4: 2.369rem;
-$size-5: 3.157rem;
-$size-spacing: $size-2;
-$box-spacing: $size-1;
-
-$color-white: #fff;
-$color-light: #f4f4f4;
-$color-off-white: #cdcdcd;
-$color-darkgrey: #63676d; // based on 2015 api.jquery.com design
-$color-black: #333;
-
-$screen-s: 480px;
-$screen-m: 768px;
-$screen-l: 992px;
-$screen-xl: 1200px;
+@use "amethyst-variables-all" as *;
+@use "sass:color";
+@use "sass:string";
 
 * {
     box-sizing: border-box;
@@ -465,13 +449,13 @@ table {
 /* Search */
 
 typesense-minibar {
-    --tsmb-color-base-background: #{lighten($color-accent, 12%)};
+    --tsmb-color-base-background: #{color.adjust($color-accent, $lightness: 12%)};
     --tsmb-color-primary30: #{$color-accent};
     --tsmb-color-primary50: #{$color-vibrant};
     --tsmb-color-primary90: #{$color-bright};
     --tsmb-color-base30: var(--tsmb-color-primary90);
-    --tsmb-color-base50: #{change-color($color-bright, $alpha: 0.6)}; // #a98dc1
-    --tsmb-color-base90: #{change-color($color-bright, $alpha: 0.6)};
+    --tsmb-color-base50: #{color.change($color-bright, $alpha: 0.6)}; // #a98dc1
+    --tsmb-color-base90: #{color.change($color-bright, $alpha: 0.6)};
 
     flex: 1;
     align-self: center;
@@ -480,7 +464,7 @@ typesense-minibar form {
     width: auto;
 }
 typesense-minibar form:not(:focus-within)::before {
-  filter: unquote("invert()");
+  filter: string.unquote("invert()");
 }
 typesense-minibar input[type="search"] {
   border: none;
@@ -607,8 +591,8 @@ typesense-minibar input[type="search"] {
 
 .hero {
     margin-bottom: $size-spacing;
-    background-color: darken($color-vibrant, 12%);
-    background-image: linear-gradient(135deg, darken($color-vibrant, 12%), $color-vibrant );
+    background-color: color.adjust($color-vibrant, $lightness: -12%);
+    background-image: linear-gradient(135deg, color.adjust($color-vibrant, $lightness: -12%), $color-vibrant );
     padding: ($size-4 * 2) 0;
     text-align: center;
 }

data/_sass/custom.scss

@@ -1,2 +1,8 @@
 // Add custom styles via a local `_sass/custom.scss` file
 // in your website.
+//
+// To import the same variables as used in amethyst.scss,
+// start your file with this line:
+//
+//   @use "amethyst-variables-all" as *;
+//

data/_sass/typesense-minibar.css

@@ -1,4 +1,4 @@
-/*! https://github.com/jquery/typesense-minibar 1.3.1 */
+/*! https://github.com/jquery/typesense-minibar 1.3.2 */
 .tsmb-form,
 typesense-minibar {
   --tsmb-size-edge: 1px;
@@ -173,12 +173,12 @@ typesense-minibar [role=option] a {
 }
 
 .tsmb-form:not([data-group=true]) [role=option]:not(:first-child) a,
-typesense-minibar form:not([data-group=true]) [role=option]:not(:first-child) a {
+typesense-minibar:not([data-group=true]) [role=option]:not(:first-child) a {
   border-top: var(--tsmb-size-edge) solid var(--tsmb-color-focus90);
 }
 
 .tsmb-form[data-group=true] [role=option] a,
-typesense-minibar form[data-group=true] [role=option] a {
+typesense-minibar[data-group=true] [role=option] a {
   margin: 0 var(--tsmb-size-base);
   padding: var(--tsmb-size-sm);
 }
@@ -210,7 +210,8 @@ typesense-minibar [role=option] mark {
 .tsmb-suggestion_title {
   color: var(--tsmb-color-primary30);
 }
-.tsmb-form[data-group=true] .tsmb-suggestion_title {
+.tsmb-form[data-group=true] .tsmb-suggestion_title,
+typesense-minibar[data-group=true] .tsmb-suggestion_title {
   font-weight: bold;
   font-size: var(--tsmb-size-sm);
 }

data/assets/styles.scss

@@ -3,7 +3,6 @@
 
 @use "typesense-minibar.css";
 
-@import "amethyst-variables";
-@import "amethyst";
-@import "highlight";
-@import "custom";
+@use "amethyst";
+@use "highlight";
+@use "custom";

data/assets/typesense-minibar.js

@@ -1,7 +1,5 @@
-/*! https://github.com/jquery/typesense-minibar 1.3.1 */
-globalThis.tsminibar = function tsminibar (form) {
-  const { origin, collection } = form.dataset;
-  const group = !!form.dataset.group;
+/*! https://github.com/jquery/typesense-minibar 1.3.2 */
+globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
   const cache = new Map();
   const state = { query: '', cursor: -1, open: false, hits: [] };
   const searchParams = new URLSearchParams({
@@ -14,10 +12,10 @@ globalThis.tsminibar = function tsminibar (form) {
     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))
+    'x-typesense-api-key': dataset.key,
+    ...Object.fromEntries(new URLSearchParams(dataset.searchParams))
   });
-  const noResults = form.dataset.noResults || "No results for '{}'.";
+  const noResults = dataset.noResults || "No results for '{}'.";
 
   const input = form.querySelector('input[type=search]');
   const listbox = document.createElement('div');
@@ -31,7 +29,7 @@ globalThis.tsminibar = function tsminibar (form) {
       preconnect = document.createElement('link');
       preconnect.rel = 'preconnect';
       preconnect.crossOrigin = 'anonymous'; // match fetch cors,credentials:omit
-      preconnect.href = origin;
+      preconnect.href = dataset.origin;
       document.head.append(preconnect);
     }
     if (!state.open && state.hits.length) {
@@ -92,7 +90,7 @@ globalThis.tsminibar = function tsminibar (form) {
 
   function connect () {
     document.addEventListener('click', onDocClick);
-    if (form.dataset.slash !== 'false') {
+    if (dataset.slash !== 'false') {
       document.addEventListener('keydown', onDocSlash);
       form.classList.add('tsmb-form--slash');
     }
@@ -124,9 +122,10 @@ globalThis.tsminibar = function tsminibar (form) {
     }
     searchParams.set('q', query);
     const resp = await fetch(
-      `${origin}/collections/${collection}/documents/search?` + searchParams,
+      `${dataset.origin}/collections/${dataset.collection}/documents/search?` + searchParams,
       { mode: 'cors', credentials: 'omit', method: 'GET' }
     );
+    const group = !!dataset.group;
     const data = await resp.json();
     hits = data?.grouped_hits?.map(ghit => {
       const hit = ghit.hits[0];
@@ -151,12 +150,11 @@ globalThis.tsminibar = function tsminibar (form) {
   function render () {
     listbox.hidden = !state.open;
     form.classList.toggle('tsmb-form--open', 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">${noResults.replace('{}', 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>`) + (dataset.foot ? '<a href="https://typesense.org" class="tsmb-foot" title="Search by Typesense"></a>' : '');
   }
 
   function moveCursor (offset) {
     state.cursor += offset;
-    // -1 refers to input field
     if (state.cursor >= state.hits.length) state.cursor = -1;
     if (state.cursor < -1) state.cursor = state.hits.length - 1;
     render();
@@ -164,10 +162,10 @@ globalThis.tsminibar = function tsminibar (form) {
 
   return { form, connect, disconnect };
 };
-document.querySelectorAll('.tsmb-form[data-origin]').forEach(tsminibar);
 window.customElements.define('typesense-minibar', class extends HTMLElement {
   connectedCallback () {
     const form = this.querySelector('form');
-    if (form) tsminibar(form);
+    if (form && this.dataset.origin) tsminibar(form, this.dataset);
   }
 });
+document.querySelectorAll('.tsmb-form[data-origin]').forEach(form => tsminibar(form));

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-amethyst
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Timo Tijhof
 - Trent Willis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -101,8 +101,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.1
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -124,6 +124,7 @@ files:
 - _layouts/posts-year.html
 - _layouts/posts.html
 - _layouts/wrapper.html
+- _sass/amethyst-variables-all.scss
 - _sass/amethyst-variables.scss
 - _sass/amethyst.scss
 - _sass/custom.scss
@@ -137,7 +138,7 @@ licenses:
 - MIT
 metadata:
   plugin_type: theme
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: https://github.com/qunitjs/jekyll-theme-amethyst
 test_files: []