jekyll-theme-amethyst 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f7b0f9d251222c85f49f4af58db521600c1181d7e48b2ae10909cae943d7c1
-  data.tar.gz: 6266b78cf47fca3f3f8004f5e014e2b264d0aa7e2ea7f64952162b15c90a0ea4
+  metadata.gz: fc393106dfbf4834a28cd8a2b51fb278658e64ad6af6356561c0e3bfab76adf5
+  data.tar.gz: e774ffc6f990b590526ff5ffeb296f9303aa63a4c61bd4cdcfb122b2166d8b51
 SHA512:
-  metadata.gz: e727632a049809d4f346d2d9cf89fc13a21e6428f87cb4b806edda1765be44611abff2c05d470902510d2099dee40bb234439169692fe08eb2d3adcbb532a4a1
-  data.tar.gz: a2f951769200180f3e5159c63af66641c8155b45ceeef2fb3e21d74b86643ebb3c4ed297dc23a899dd27f18c1b37e3235aa289a0f5186a2a88130d8699511147
+  metadata.gz: 5182dc86a1e6fa2e2723488029f7c84c8c25528a1c1bd332e5a16cd5e6fcae2cd88f4f91f92b3fe8822c10c61032c095427e9092a8af588fe5964e15380e3d1f
+  data.tar.gz: c8701134ac06e006c7bb025de2303835c761fd699f48580f689ce68725500d6f36b7abf0218217c3a36ec6078116f1e442bb5c03fca8cc4a927c5f8521e992f0

data/_includes/sidebar.html

@@ -15,7 +15,11 @@ Block data:
   - "group" to query a list of pages from a page group.
   - "list" to specify your own custom list.
   - "link" to specify a single link.
-  - "archive" to query a list of chronological pages based on their layout.
+  - "archive" to query a list of chronological pages using the 'posts-year' layout.
+    This is designed for use with the jekyll-archives plugin, with a separate
+    archive page for each year.
+  - "archive-flat" to generate links to anchors on a singular flat 'posts-archive' page.
+    This is designed for blogs with less than ~1,000 posts.
   - "tags" to query a list of alphabetical pages based on their layout.
 
 * title: [Default: group_page.title or ""]
@@ -67,6 +71,9 @@ Block data:
 		{%- 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 == "archive-flat" -%}
+		{%- 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" -%}
@@ -95,6 +102,12 @@ Block data:
 	<h4 {%- if block_expand %} class="sidebar-title-open"{% endif %}>{% if block_url %}<a href="{{ block_url | relative_url }}">{{ block_title }}</a>{% else %}{{ block_title }}{% endif %}</h4>
 	{% if block_expand -%}
 	<ul class="sidebar-list">
+	{%- if block_type == "archive-flat" -%}
+		{%- for year in site.data.amethyst_post_years -%}
+			{%- assign year_page = site.pages | where: "layout", "posts-year" | sort_natural: 'title' -%}
+		<li class="sidebar-item"><a href="{{ block_url | relative_url }}#{{ year | escape }}">{{ year | escape }}</a></li>
+		{%- endfor -%}
+	{%- else -%}
 	{%- for entry in block_contents -%}
 	<li class="sidebar-item{% if page.url == entry.url %} sidebar-item-active{% endif %}">
 		<a href="{{ entry.url | relative_url }}">
@@ -102,10 +115,11 @@ Block data:
 			{%- if entry.title == nil and entry.date -%}
 				{%- assign entry_title = entry.date | date: '%Y' -%}
 			{%- endif -%}
-			{{- entry_title -}}
+			{{- entry_title | escape -}}
 		</a>
 	</li>
 	{%- endfor -%}
+	{%- endif -%}
 	</ul>
 	{%- endif -%}
 {%- endfor -%}

data/_layouts/posts-archive.html

@@ -5,13 +5,20 @@ amethyst:
 ---
 
 <div class="main main--columns wrapper">
-{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
+{%- assign date_format_archive = site.amethyst.date_format_archive | default: "%B %Y" -%}
 {%- assign posts = site.posts -%}
+{%- assign prev_year = false -%}
 <div class="posts content">
 	<h1>{{ page.title }}</h1>
-	<ul>
 	{% for post in posts -%}
-		<li><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>, <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>.</li>
+		{%- assign post_year = post.date | date: '%Y' -%}
+		{%- if post_year != prev_year -%}
+		{%- if prev_year != false %}</ul>{% endif %}
+		<p id="{{ post_year | escape }}"><strong>{{ post_year | escape }}</strong></p>
+		<ul>
+		{%- assign prev_year = post_year -%}
+		{%- endif %}
+		<li><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>, <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format_archive }}</time></li>
 	{%- endfor -%}
 	</ul>
 </div>

data/_layouts/posts-author.html

@@ -5,19 +5,15 @@ amethyst:
 ---
 
 <div class="main main--columns wrapper">
-{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
+{%- assign date_format_archive = site.amethyst.date_format_archive | default: "%B %Y" -%}
 {%- assign posts = site.posts | where: 'author', page.author -%}
 <div class="posts content">
 	<h1>Author: {{ page.title | escape }}</h1>
-	{%- 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></p>
-		<div class="post">
-			{{- post.excerpt -}}
-		</div>
-	</div>
+	<ul>
+	{% for post in posts -%}
+		<li><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>, <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format_archive }}</time></li>
 	{%- endfor -%}
+	</ul>
 </div>
 {% include sidebar.html blocks="sidebar_blog" %}
 </div>

data/_layouts/posts-tag.html

@@ -5,22 +5,15 @@ amethyst:
 ---
 
 <div class="main main--columns wrapper">
-{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
+{%- assign date_format_archive = site.amethyst.date_format_archive | default: "%B %Y" -%}
 {%- assign posts = site.tags[page.tag] -%}
 <div class="posts content">
 	<h1>Tag: {{ page.title | escape }}</h1>
-	{%- 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 {{ site.data.authors[post.author] | default: post.author | escape }}{% endif %}</p>
-		<div class="post">
-			{{- post.excerpt -}}
-			{%- if post.excerpt != post.content %}
-			<a class="screen-reader-text" href="{{ post.url | relative_url }}">Continue reading "{{ post.title | escape }}".</a>
-			{%- endif -%}
-		</div>
-	</div>
+	<ul>
+	{% for post in posts -%}
+		<li><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a>, <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format_archive }}</time></li>
 	{%- endfor -%}
+	</ul>
 </div>
 {% include sidebar.html blocks="sidebar_blog" %}
 </div>

data/_layouts/posts-year.html

@@ -5,19 +5,16 @@ amethyst:
 ---
 
 <div class="main main--columns wrapper">
-{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
+{%- assign date_format_archive = site.amethyst.date_format_archive | default: "%B %Y" -%}
 {%- assign posts = page.posts -%}
 <div class="posts content">
 	<h1>Archive: {{ page.date | date: '%Y' }}</h1>
-	{%- for post in posts -%}
+	{% 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 {{ site.data.authors[post.author] | default: post.author | escape }}{% endif %}</p>
+		<p class="post-meta">Posted on {{ post.date | date: date_format_archive }}</time>{% if post.author %} by {{ site.data.authors[post.author] | default: post.author | escape }}{% endif %}</p>
 		<div class="post">
-			{{- post.excerpt -}}
-			{%- if post.excerpt != post.content %}
-			<a class="screen-reader-text" href="{{ post.url | relative_url }}">Continue reading "{{ post.title | escape }}".</a>
-			{%- endif -%}
+			<p>{{- post.excerpt | strip_html -}}</p>
 		</div>
 	</div>
 	{%- endfor -%}

data/_layouts/posts.html

@@ -6,17 +6,17 @@ amethyst:
 ---
 
 <div class="main main--columns wrapper">
-{%- assign date_format = site.amethyst.date_format | default: "%e %B %Y" -%}
+{%- assign date_format_archive = site.amethyst.date_format_archive | default: "%B %Y" -%}
 {%- assign posts = site.posts | slice: 0, 10 -%}
 <div class="posts content">
 	<h1>{{ page.title }}</h1>
 	{% 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 {{ site.data.authors[post.author] | default: post.author | escape }}{% endif %}</p>
+		<p class="post-meta">Posted on {{ post.date | date: date_format_archive }}</time>{% if post.author %} by {{ site.data.authors[post.author] | default: post.author | escape }}{% endif %}</p>
 		<div class="post">
-			{{- post.excerpt -}}
-			{%- if post.excerpt != post.content %}
+			<p>{{- post.excerpt | strip_html -}}</p>
+			{%- if post.excerpt != post.content -%}
 			<a class="screen-reader-text" href="{{ post.url | relative_url }}">Continue reading "{{ post.title | escape }}".</a>
 			{%- endif -%}
 		</div>

data/_sass/amethyst.scss

@@ -759,6 +759,9 @@ article > header {
 
 /* Layout: posts */
 
+.posts > ul > li::marker {
+    color: $color-off-white;
+}
 
 .post-row h2 {
     margin-bottom: $size-1;
@@ -768,6 +771,15 @@ article > header {
     margin-bottom: $size-sm;
 }
 
+.post-read-more {
+    // avoid spanning "continue" "reading" over two different lines
+    // prefer inline if it fits, otherwise on the next line
+    // but, don't force `white-space: nowrap` either
+    display: inline-block;
+    font-size: $size-sm;
+    vertical-align: text-bottom;
+}
+
 /* Site footer */
 
 .site-footer {

data/lib/jekyll-theme-amethyst.rb

@@ -17,6 +17,7 @@
 #     ```
 #
 require "digest"
+require "set"
 
 module Jekyll
 	module AmethystFilters
@@ -70,4 +71,14 @@ module AmethystPlugin
 		end
 	end
 
+	class YearDataGenerator < Jekyll::Generator
+		safe true
+
+		def generate(site)
+			s = Set.new()
+			site.posts&.docs&.each { |post| s.add(post.date.strftime('%Y')) }
+			site.data["amethyst_post_years"] = s.to_a.sort!.reverse!
+		end
+	end
+
 end

metadata

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