jekyll-theme-amethyst 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f24ddb3ef8eea41aefe27157c649ee526fb88508a0500b40a4ae6be5ee2829e
-  data.tar.gz: ffede56a7da05fce5c4681135f4e4c11b1e322d8b1fde377849262b0339d71b7
+  metadata.gz: b821452b60270650a16031ce0c02143e94cc397e8c99dd661318398d59576497
+  data.tar.gz: f23da2ecb2b942d07cdb71a96e2de9c30f3d2ad3506b4bc3ef1fa2548e59a04d
 SHA512:
-  metadata.gz: 9a8681d0da13282f8ac0de2c56cfab79900c90360195f656b244f370145c0bb7c6934839294a7ba363155b60fed34bf60535e6c2e46716ec290e866d3056c2ab
-  data.tar.gz: 8eb5fc49da1f95afa1f717ebc65f9c0bf168f9bbded302377ea2ece1ba53b0aba7008a5420cbb68f5922be13427bfc757ce82cff8fc0c4535dd630101cbb2477
+  metadata.gz: 7739a80aa0ad3174a480b5302b6d8510fc3c0d219dfcebb6cfe6d2ff958ee87e346972b97102c5bc1bf13cd89dea9ce6996fb65d84fa0c693a9e1ea64eb6f7d4
+  data.tar.gz: 5cb9d1535f2899914db53358d579b846b233c0853d6210ac76f52c3c2844b38bd0d6b14791700740c5af5e049d814ee20aadf906b342ff7a15fbf71f5f52460b

data/_includes/opengraph.html

@@ -45,11 +45,16 @@
 {% endif %}
 <meta name="twitter:card" content="summary_large_image">
 
-
 {% if layout.amethyst.pagetype == "navigation" %}
 <meta name="robots" content="{{ page.amethyst.robots | default: layout.amethyst.robots | default: 'noindex,follow' }}">
 <meta name="docsearch:amethyst_pagetype_navigation" content="1">
 {% endif %}
 
+{% if page.layout == "post" and page.date and page.author %}
+<meta property="og:type" content="article">
+<meta property="article:published_time" content="{{ page.date | date_to_xmlschema }}">
+<meta name="author" content="{{ site.data.authors[include.author] | default: include.author | escape }}">
+{% endif %}
+
 {% endcapture -%}
 {{ opengraph | strip_newlines }}

data/_includes/search.html

@@ -4,3 +4,25 @@
     <input type="hidden" name="sites" value="{{ site.url | remove_first: 'http://' | remove_first: 'https://' }}">
 </form>
 </typesense-minibar>
+{%- if jekyll.environment == "development" %}
+<script type="module">
+/* global Response, URL */
+// Override URLs in search results to be relative to localhost,
+// by replacing "https://production.example/path" with "/path",
+// in any responses that look like they are from Typesense.
+const parent = Response.prototype.json;
+Response.prototype.json = function () {
+  return parent.call(this).then(function (obj) {
+    if (obj && obj.grouped_hits) {
+      for (const group of obj.grouped_hits) {
+        for (const hit of group.hits) {
+          const url = new URL(hit.document.url);
+          hit.document.url = url.pathname + url.hash;
+        }
+      }
+    }
+    return obj;
+  });
+};
+</script>
+{%- endif %}

data/_includes/sidebar.html

@@ -65,6 +65,8 @@ Block data:
 		{%- assign block_contents = site.posts | slice: 0, 5 -%}
 	{%- elsif block_type == "archive" -%}
 		{%- assign block_contents = site.pages | where: "layout", "posts-year" | sort_natural: 'date' | reverse  -%}
+		{%- assign group_page = site.pages | where: "layout", "posts-archive" | first -%}
+		{%- assign block_url = block.url | default: group_page.url -%}
 	{%- elsif block_type == "tags" -%}
 		{%- assign block_contents = site.pages | where: "layout", "posts-tag" | sort_natural: 'title'  -%}
 	{%- elsif block_type == "link" -%}

data/_layouts/post.html

@@ -8,7 +8,12 @@ layout: wrapper
 	<header>
 		<h1>{{ page.title | escape }}</h1>
 		{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
-		<p class="post-meta byline">Posted on <a href="{{ page.url | relative_url }}" rel="bookmark"><time itemprop="pubdate" datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: date_format }}</time></a>{% if page.author %} by <span class="vcard"><span class="fn n" rel="author">{{ page.author | escape }}</span></span>{% endif %}</p>
+		<p class="post-meta byline">Posted on <a href="{{ page.url | relative_url }}" rel="bookmark"><time itemprop="pubdate" datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: date_format }}</time></a>{% if page.author %} by <span class="vcard"><span class="fn n" rel="author">
+        {%- assign author_page = site.pages | where: "layout", "posts-author" | where: "author", page.author | first -%}
+        {%- if author_page -%}
+	        <a href="{{ author_page.url | relative_url }}">{{ site.data.authors[page.author] | default: page.author | escape }}</a>
+        {%- else -%}{{ site.data.authors[page.author] | default: page.author | escape}}
+	    {%- endif -%}</span></span>{% endif %}</p>
 	</header>
 	{{ content }}
 </article>

data/_layouts/posts-tag.html

@@ -12,7 +12,7 @@ amethyst:
 	{%- for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ post.author | escape }}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/_layouts/posts-year.html

@@ -12,7 +12,7 @@ amethyst:
 	{%- for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ post.author | escape }}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/_layouts/posts.html

@@ -13,7 +13,7 @@ amethyst:
 	{% for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ post.author | escape }}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/_sass/typesense-minibar.css

@@ -1,4 +1,4 @@
-/*! https://github.com/jquery/typesense-minibar 1.3.2 */
+/*! https://github.com/jquery/typesense-minibar 1.3.4 */
 .tsmb-form,
 typesense-minibar {
   --tsmb-size-edge: 1px;
@@ -24,6 +24,8 @@ typesense-minibar {
   --tsmb-color-primary30: #390f39;
   --tsmb-color-primary50: #9c3493;
   --tsmb-color-primary90: #fbdbfb;
+
+  max-width: 100%;
 }
 
 .tsmb-form,
@@ -88,7 +90,7 @@ typesense-minibar form::before {
   content: '';
   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));
+  top: calc(var(--tsmb-size-edge) + var(--tsmb-size-sm));
   left: var(--tsmb-size-sm);
   width: var(--tsmb-size-base);
   height: var(--tsmb-size-input);
@@ -104,7 +106,7 @@ typesense-minibar form::before {
 .tsmb-icon-close {
   box-sizing: border-box;
   position: absolute;
-  top: calc(50% - var(--tsmb-size-base)/2);
+  top: calc(var(--tsmb-size-edge) + var(--tsmb-size-sm) + (var(--tsmb-size-input)/2) - (var(--tsmb-size-base)/2));
   right: var(--tsmb-size-base);
   width: var(--tsmb-size-base);
   height: var(--tsmb-size-base);
@@ -115,11 +117,7 @@ typesense-minibar form::before {
   cursor: pointer;
 }
 
-.tsmb-form--open .tsmb-icon-close {
-  display: block !important;
-}
-
-.tsmb-form--slash::after {
+form:not(.tsmb-form--open) .tsmb-icon-close {
   display: none;
 }
 

data/assets/typesense-minibar.js

@@ -1,4 +1,4 @@
-/*! https://github.com/jquery/typesense-minibar 1.3.2 */
+/*! https://github.com/jquery/typesense-minibar 1.3.4 */
 globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
   const cache = new Map();
   const state = { query: '', cursor: -1, open: false, hits: [] };
@@ -41,7 +41,6 @@ globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
     const query = state.query = input.value;
     if (!query) {
       state.hits = [];
-      state.cursor = -1;
       return close();
     }
     const hits = await search(query);
@@ -62,7 +61,10 @@ globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
     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();
+      if (e.code === 'Escape') {
+        close();
+        input.blur();
+      }
       if (e.code === 'Enter') {
         const url = state.hits[state.cursor]?.url;
         if (url) location.href = url;
@@ -72,11 +74,12 @@ globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
   form.addEventListener('submit', function (e) {
     e.preventDefault();
   });
-  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.insertAdjacentHTML('beforeend', '<svg viewBox="0 0 12 12" width="20" height="20" aria-hidden="true" tabindex="-1" class="tsmb-icon-close"><path d="M9 3L3 9M3 3L9 9"/></svg>');
   form.querySelector('.tsmb-icon-close').addEventListener('click', function () {
     input.value = '';
-    input.focus();
+    state.hits = [];
     close();
+    input.focus();
   });
   connect();
 
@@ -117,7 +120,7 @@ globalThis.tsminibar = function tsminibar (form, dataset = form.dataset) {
     let hits = cache.get(query);
     if (hits) {
       cache.delete(query);
-      cache.set(query, hits); // LRU
+      cache.set(query, hits);
       return hits;
     }
     searchParams.set('q', query);

data/lib/jekyll-theme-amethyst.rb

@@ -37,3 +37,37 @@ module Jekyll
 end
 
 Liquid::Template.register_filter(Jekyll::AmethystFilters)
+
+module AmethystPlugin
+
+	class AuthorPageWithoutAFile < Jekyll::PageWithoutAFile
+		def template
+			# The template of the permalink, can be customized e.g. to "/blog/author/:author/"
+			# for sites with both API docs and a blog.
+			site.config["amethyst"]["author_permalink"] || "/author/:author"
+		end
+
+		def url_placeholders
+			super.merge({
+				"author" => data["author"]
+			})
+		end
+	end
+
+	class AuthorPageGenerator < Jekyll::Generator
+		safe true
+
+		def generate(site)
+			site.data["authors"].each do |slug, name|
+				site.pages << AuthorPageWithoutAFile.new(site, site.source, 'author', "#{slug}.html").tap do |page|
+					page.data.merge!(
+						"layout" => "posts-author",
+						"title" => name,
+						"author" => slug
+					)
+				end
+			end
+		end
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-amethyst
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Timo Tijhof