summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolpeon <git@volpeon.ink>2022-06-12 12:07:29 +0200
committerVolpeon <git@volpeon.ink>2022-06-12 12:07:29 +0200
commit7f2deacd64ee2e4cb5d4850a99ff298c0353017d (patch)
tree68459de3257282a8d49750d0c7d80c061e91a19b
parentOnly import used UI elements from iro (diff)
downloadvolpeon.ink-7f2deacd64ee2e4cb5d4850a99ff298c0353017d.tar.gz
volpeon.ink-7f2deacd64ee2e4cb5d4850a99ff298c0353017d.tar.bz2
volpeon.ink-7f2deacd64ee2e4cb5d4850a99ff298c0353017d.zip
Fixed list, updated fonts, fixed source wrapping
-rw-r--r--Makefile4
-rw-r--r--assets/fonts/iosevka-term-ss09-bold.ttfbin1297592 -> 1352488 bytes
-rw-r--r--assets/fonts/iosevka-term-ss09-regular.ttfbin1304140 -> 1362256 bytes
-rw-r--r--scripts/metadata_filter.lua7
-rw-r--r--templates/partials/gallery_card.html2
-rw-r--r--templates/partials/small_gallery_card.html2
6 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 52adc1d..e8ece08 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
58 pandoc \ 58 pandoc \
59 -f markdown-citations \ 59 -f markdown-citations \
60 -t html5 \ 60 -t html5 \
61 --wrap preserve \
61 --no-highlight \ 62 --no-highlight \
62 --template scripts/metadata_tpl.json \ 63 --template scripts/metadata_tpl.json \
63 --metadata namespace="$(NAMESPACE)" \ 64 --metadata namespace="$(NAMESPACE)" \
@@ -68,6 +69,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
68 pandoc \ 69 pandoc \
69 -f markdown-citations \ 70 -f markdown-citations \
70 -t html5 \ 71 -t html5 \
72 --wrap preserve \
71 --lua-filter scripts/metadata_filter.lua \ 73 --lua-filter scripts/metadata_filter.lua \
72 --lua-filter scripts/subpages.lua \ 74 --lua-filter scripts/subpages.lua \
73 $(GLOBAL_METADATA) \ 75 $(GLOBAL_METADATA) \
@@ -87,6 +89,7 @@ out/%.html: content/%.md .cache/meta/%.json $(CONTENT_TEMPLATES_SRC) metadata/*.
87 pandoc \ 89 pandoc \
88 -f markdown-citations \ 90 -f markdown-citations \
89 -t html5 \ 91 -t html5 \
92 --wrap preserve \
90 --no-highlight \ 93 --no-highlight \
91 --template templates/base.html \ 94 --template templates/base.html \
92 --lua-filter scripts/metadata_filter.lua \ 95 --lua-filter scripts/metadata_filter.lua \
@@ -104,6 +107,7 @@ out/%.xml: content/%.md .cache/meta/%.json $(FEED_TEMPLATES_SRC) metadata/*.yaml
104 pandoc \ 107 pandoc \
105 -f markdown-citations \ 108 -f markdown-citations \
106 -t html5 \ 109 -t html5 \
110 --wrap preserve \
107 --no-highlight \ 111 --no-highlight \
108 --template templates/feed.xml \ 112 --template templates/feed.xml \
109 --lua-filter scripts/metadata_filter.lua \ 113 --lua-filter scripts/metadata_filter.lua \
diff --git a/assets/fonts/iosevka-term-ss09-bold.ttf b/assets/fonts/iosevka-term-ss09-bold.ttf
index 35cad9d..f3ec04e 100644
--- a/assets/fonts/iosevka-term-ss09-bold.ttf
+++ b/assets/fonts/iosevka-term-ss09-bold.ttf
Binary files differ
diff --git a/assets/fonts/iosevka-term-ss09-regular.ttf b/assets/fonts/iosevka-term-ss09-regular.ttf
index 7ad5cd4..c44424d 100644
--- a/assets/fonts/iosevka-term-ss09-regular.ttf
+++ b/assets/fonts/iosevka-term-ss09-regular.ttf
Binary files differ
diff --git a/scripts/metadata_filter.lua b/scripts/metadata_filter.lua
index 314f2b0..cb060fa 100644
--- a/scripts/metadata_filter.lua
+++ b/scripts/metadata_filter.lua
@@ -185,10 +185,11 @@ function d1_page_to_list_item(meta, p)
185 } 185 }
186end 186end
187 187
188function d2_page_to_list_item(meta, cat, p) 188function d2_page_to_list_item(meta, cat, p, set_cat_title)
189 return { 189 return {
190 title = p.title, 190 title = p.title,
191 subtitle = p.subtitle, 191 subtitle = p.subtitle,
192 category = set_cat_title and cat.title,
192 date = p.date, 193 date = p.date,
193 position = p.position, 194 position = p.position,
194 url = p.url, 195 url = p.url,
@@ -229,7 +230,7 @@ function generate_list(meta)
229 return meta.pages.all 230 return meta.pages.all
230 :map(function(cat) 231 :map(function(cat)
231 local allItems = ((cat.pages and cat.pages.all) or pandoc.List()) 232 local allItems = ((cat.pages and cat.pages.all) or pandoc.List())
232 :map(function(p) return d2_page_to_list_item(meta, cat, p) end) 233 :map(function(p) return d2_page_to_list_item(meta, cat, p, false) end)
233 234
234 return cat_to_list_cat(cat, allItems) 235 return cat_to_list_cat(cat, allItems)
235 end) 236 end)
@@ -241,7 +242,7 @@ function generate_list(meta)
241 :map(function(cat) 242 :map(function(cat)
242 local allItems = (cat.pages and cat.pages.all or pandoc.List()):flatMap(function(c) 243 local allItems = (cat.pages and cat.pages.all or pandoc.List()):flatMap(function(c)
243 if c.pages then 244 if c.pages then
244 return c.pages.all:map(function(p) return d2_page_to_list_item(cat, c, p) end) 245 return c.pages.all:map(function(p) return d2_page_to_list_item(cat, c, p, true) end)
245 else 246 else
246 return pandoc.List({ d1_page_to_list_item(cat, c) }) 247 return pandoc.List({ d1_page_to_list_item(cat, c) })
247 end 248 end
diff --git a/templates/partials/gallery_card.html b/templates/partials/gallery_card.html
index 81c7745..c0925fc 100644
--- a/templates/partials/gallery_card.html
+++ b/templates/partials/gallery_card.html
@@ -1,6 +1,6 @@
1$if(it.url)$ 1$if(it.url)$
2$if(it.thumbnail)$ 2$if(it.thumbnail)$
3 <a href="$it.url.rel$" class="l-card-list__card c-card" title="$it.title/nowrap$"> 3 <a href="$it.url.rel$" class="l-card-list__card c-card">
4 <div class="c-card__row l-media l-media--flush"> 4 <div class="c-card__row l-media l-media--flush">
5 <div class="c-card__thumbnail"> 5 <div class="c-card__thumbnail">
6 <img 6 <img
diff --git a/templates/partials/small_gallery_card.html b/templates/partials/small_gallery_card.html
index 35d87e4..921d612 100644
--- a/templates/partials/small_gallery_card.html
+++ b/templates/partials/small_gallery_card.html
@@ -1,6 +1,6 @@
1$if(it.url)$ 1$if(it.url)$
2$if(it.thumbnail)$ 2$if(it.thumbnail)$
3 <a href="$it.url.rel$" class="l-card-list__card c-card" title="$it.title/nowrap$"> 3 <a href="$it.url.rel$" class="l-card-list__card c-card">
4 <div class="c-card__row l-media l-media--flush"> 4 <div class="c-card__row l-media l-media--flush">
5 <div class="c-card__thumbnail"> 5 <div class="c-card__thumbnail">
6 <img 6 <img