summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolpeon <git@volpeon.ink>2021-12-17 17:41:12 +0100
committerVolpeon <git@volpeon.ink>2021-12-17 17:41:12 +0100
commitcb554ebd19322f4bbef75294cdedb09e4c507bb3 (patch)
treefe612f0e87007684489aa46c43c59acc6a76417a
parentUpdate (diff)
downloadvolpeon.ink-cb554ebd19322f4bbef75294cdedb09e4c507bb3.tar.gz
volpeon.ink-cb554ebd19322f4bbef75294cdedb09e4c507bb3.tar.bz2
volpeon.ink-cb554ebd19322f4bbef75294cdedb09e4c507bb3.zip
Fix subpage content
-rw-r--r--Makefile3
-rw-r--r--assets/css/_utils.scss4
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ae1e75d..ac2fec0 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
47 $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -maxdepth 1 -type f -name "*.md" ! -name "index.md") \ 47 $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -maxdepth 1 -type f -name "*.md" ! -name "index.md") \
48 $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -mindepth 2 -maxdepth 2 -type f -name "index.md")) 48 $(shell test -d $(patsubst .cache/meta%,content%,$(1)) && find $(patsubst .cache/meta%,content%,$(1)) -mindepth 2 -maxdepth 2 -type f -name "index.md"))
49 49
50.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) scripts/subpages.lua scripts/subpages.jq scripts/metadata_tpl.json | .cache/meta 50.cache/meta/%.json: content/%.md $$(call subpages,$$(call namespace,$$@,)) filters/*.lua scripts/subpages.lua scripts/subpages.jq scripts/metadata_tpl.json | .cache/meta
51 $(info [META] $< -> $@) 51 $(info [META] $< -> $@)
52 52
53 mkdir -p $(@D) 53 mkdir -p $(@D)
@@ -69,6 +69,7 @@ subpages = $(patsubst content/%.md,.cache/meta/%.json, \
69 --lua-filter scripts/subpages.lua \ 69 --lua-filter scripts/subpages.lua \
70 $(GLOBAL_METADATA) \ 70 $(GLOBAL_METADATA) \
71 --metadata namespace="$(NAMESPACE)" \ 71 --metadata namespace="$(NAMESPACE)" \
72 $(PANDOC_FILTERS) \
72 -o "$@.content" "$<" 73 -o "$@.content" "$<"
73 jq '. + { content: $$content }' --rawfile content "$@.content" "$@.meta" > "$@" 74 jq '. + { content: $$content }' --rawfile content "$@.content" "$@.meta" > "$@"
74 rm "$@.pages" 75 rm "$@.pages"
diff --git a/assets/css/_utils.scss b/assets/css/_utils.scss
index 14d32a1..da090dd 100644
--- a/assets/css/_utils.scss
+++ b/assets/css/_utils.scss
@@ -60,6 +60,10 @@
60 flex-shrink: 0; 60 flex-shrink: 0;
61} 61}
62 62
63@include utility('g-span-row') {
64 grid-column: 1 / -1;
65}
66
63@include utility('elp') { 67@include utility('elp') {
64 overflow: hidden; 68 overflow: hidden;
65 text-overflow: ellipsis; 69 text-overflow: ellipsis;