From 7ae014f7e8e6b9e28cc9b8d08aaeb96cb3a2c2bf Mon Sep 17 00:00:00 2001 From: Volpeon Date: Sun, 12 Jun 2022 08:46:20 +0200 Subject: Update --- Makefile | 27 +++++++++- assets/css/components/_hnav.scss | 3 +- assets/css/layouts/_card-list.scss | 6 ++- content/snow.js | 2 +- content/symbols.svg | 93 --------------------------------- filters/icons.lua | 2 +- templates/base.html | 6 +-- templates/layouts/categorized_list.html | 29 +++++----- templates/partials/gallery_card.html | 4 +- templates/partials/grid_card.html | 4 +- templates/partials/list_card.html | 6 +-- 11 files changed, 60 insertions(+), 122 deletions(-) diff --git a/Makefile b/Makefile index f9d36bc..52adc1d 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ STATIC_FILES := $(patsubst content/%,out/%,$(shell find content -type f # TARGETS # -all: content_meta content_files feed_files static_files font_files css_files +all: content_meta content_files feed_files static_files font_files css_files icons content_meta: $(CONTENT_META) content_files: $(CONTENT_FILES) @@ -34,6 +34,7 @@ feed_files: $(FEED_FILES) static_files: $(STATIC_FILES) font_files: $(FONT_FILES) css_files: $(CSS_FILES) +icons: out/icons.svg # # RULES @@ -136,6 +137,30 @@ out/%.css: assets/css/%.scss $(CSS_SRC) | out sass --load-path=node_modules "$<" | ./node_modules/.bin/postcss --use autoprefixer --no-map -o "$@" +out/icons.svg: | out + $(info [ICON] $< -> $@) + + node ./node_modules/iro-icons/scripts/create_sprite.js \ + asterisk \ + arrow-left \ + arrow-right \ + arrow-up-right \ + envelope \ + hash \ + messages \ + parallelogram \ + globe \ + image \ + graph \ + git-branch \ + smile \ + link \ + x \ + chevron-left \ + chevron-right \ + "$@" + + out/%: content/% | out $(info [COPY] $< -> $@) diff --git a/assets/css/components/_hnav.scss b/assets/css/components/_hnav.scss index 5f8157b..34835e9 100644 --- a/assets/css/components/_hnav.scss +++ b/assets/css/components/_hnav.scss @@ -15,6 +15,7 @@ --font-size: .9em, --margin-top: fn.global-dim(--paragraph --margin-top), --margin-bottom: fn.global-dim(--size --1000), + --pad-top: calc(fn.global-dim(--paragraph --margin-top) * .5), ) ), 'dims'); @@ -24,7 +25,7 @@ gap: fn.dim(--gap); align-items: baseline; margin: fn.dim(--margin-top) 0 fn.dim(--margin-bottom); - padding-top: fn.dim(--margin-top); + padding-top: fn.dim(--pad-top); border-top: 1px solid fn.color(--border); color: fn.color(--fg); diff --git a/assets/css/layouts/_card-list.scss b/assets/css/layouts/_card-list.scss index 6d388e6..7a09c54 100644 --- a/assets/css/layouts/_card-list.scss +++ b/assets/css/layouts/_card-list.scss @@ -4,7 +4,7 @@ @include iro.props-namespace('card-list') { @include iro.props-store(( --dims: ( - --margin-top: fn.global-dim(--size --600), + --margin-top: fn.global-dim(--size --700), --spacing: fn.global-dim(--size --200), --gap: fn.global-dim(--size --25), --grid: ( @@ -30,6 +30,10 @@ margin-top: fn.dim(--margin-top); } + @include iro.bem-elem('footer') { + margin-top: fn.dim(--spacing); + } + @include iro.bem-elem('cards') { display: flex; flex-direction: column; diff --git a/content/snow.js b/content/snow.js index 5913d1e..562e9c0 100644 --- a/content/snow.js +++ b/content/snow.js @@ -10,7 +10,7 @@ const snowFlakeInner = document.createElementNS("http://www.w3.org/2000/svg", "use"); const aniDuration = (Math.random() * 3 + 2) * 1000; - snowFlakeInner.setAttribute("href", "/symbols.svg#icon-asterisk"); + snowFlakeInner.setAttribute("href", "/icons.svg#asterisk"); snowFlake.classList.add("o-icon", "o-icon--snow"); snowFlake.setAttribute("aria-hidden", "true"); diff --git a/content/symbols.svg b/content/symbols.svg index 5058606..4995ee2 100644 --- a/content/symbols.svg +++ b/content/symbols.svg @@ -5,98 +5,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/filters/icons.lua b/filters/icons.lua index 490d406..3f8cb64 100644 --- a/filters/icons.lua +++ b/filters/icons.lua @@ -3,7 +3,7 @@ function Str(el) if icon then return pandoc.RawInline('html', - '') end diff --git a/templates/base.html b/templates/base.html index be796de..4319d43 100644 --- a/templates/base.html +++ b/templates/base.html @@ -85,7 +85,7 @@ ${layouts/page()}
@@ -93,13 +93,13 @@ ${layouts/page()} diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html index 52e0d88..68decf6 100644 --- a/templates/layouts/categorized_list.html +++ b/templates/layouts/categorized_list.html @@ -7,6 +7,7 @@ $body$ $if(notoc)$$else$
diff --git a/templates/partials/grid_card.html b/templates/partials/grid_card.html index b3763e4..c5924e1 100644 --- a/templates/partials/grid_card.html +++ b/templates/partials/grid_card.html @@ -6,7 +6,7 @@ $if(it.url)$ $endif$ $if(it.icon)$ $endif$
@@ -32,7 +32,7 @@ $if(it.url)$
$if(it.post_icon)$ $endif$ diff --git a/templates/partials/list_card.html b/templates/partials/list_card.html index af17725..438659c 100644 --- a/templates/partials/list_card.html +++ b/templates/partials/list_card.html @@ -6,12 +6,12 @@ $if(it.url)$ $endif$ $if(it.icon)$ $endif$
$it.title$ -
+ $if(it.subtitle)$
@@ -36,7 +36,7 @@ $if(it.url)$ $endif$ $if(it.post_icon)$ $endif$
-- cgit v1.2.3-70-g09d2