From 249aa9af5b3497aaeb37e453e703aa83000cbd61 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 26 Mar 2022 18:09:34 +0100 Subject: modernize to use tags nav and footer (not div with classes topbar and footer) --- Makefile | 8 ++++---- nav.md | 7 +++++++ style.scss | 4 ++-- topbar.md | 7 ------- 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 nav.md delete mode 100644 topbar.md diff --git a/Makefile b/Makefile index 995868a..d3e4d04 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -markdown-snippets := topbar.md footer.md +markdown-snippets := nav.md footer.md hypertext-snippets = $(markdown-snippets:%.md=%.html) markdown := $(filter-out $(markdown-snippets),$(wildcard *.md */*.md */*/*.md)) hypertext = $(subst index/index,index,$(markdown:%.md=%/index.html)) @@ -16,7 +16,7 @@ update: .git $(hypertext-snippets): %.html: %.md Makefile pandoc -f markdown -t html -o $@ $< - sed -i -e '1i
' -e '$$ a
' $@ + sed -i -e '1i <$*>' -e '$$ a ' $@ $(vectorimage-graph): %.svg: %.dot Makefile dot -Tsvg -o$@ $< @@ -25,14 +25,14 @@ $(vectorimage-graph): %.svg: %.dot Makefile $(eval title = $(shell head --lines=1 $< \ | grep --perl-regexp --only-matching '^\#\s*\K(\S+(\s\S+)*)+')) $(if $(filter-out ./,$(dir $@)),mkdir -p $(dir $@)) - pandoc -f markdown -t html -s \ + pandoc -f markdown -t html5 -s \ --metadata lang=da \ $(if $(title),\ $(if $(filter-out $(sitetitle),$(title)),$(strip \ --metadata pagetitle='$(sitetitle) -- $(title)'),$(strip \ --metadata pagetitle='$(title)'))) \ -c $(shell realpath --relative-to=$(dir $@) style.css) \ - -B topbar.html \ + -B nav.html \ -A footer.html \ -o $@ $< diff --git a/nav.md b/nav.md new file mode 100644 index 0000000..e465fab --- /dev/null +++ b/nav.md @@ -0,0 +1,7 @@ +* [Oversigt](/) +* [Sted](/sted) +* [Bygning](/bygning) +* [Beboere](/beboere) +* [Bæredygtighed] +* [Økonomi](/oekonomi) +* [Baggrund] diff --git a/style.scss b/style.scss index 8ab9b17..9ee5f6b 100644 --- a/style.scss +++ b/style.scss @@ -23,14 +23,14 @@ a { @include hover-link; } -.topbar { +nav { @media print { display: none !important; } @include inline-list; } -.footer { +footer { margin-left: -1em; margin-right: -1em; background-color: lightgrey; diff --git a/topbar.md b/topbar.md deleted file mode 100644 index e465fab..0000000 --- a/topbar.md +++ /dev/null @@ -1,7 +0,0 @@ -* [Oversigt](/) -* [Sted](/sted) -* [Bygning](/bygning) -* [Beboere](/beboere) -* [Bæredygtighed] -* [Økonomi](/oekonomi) -* [Baggrund] -- cgit v1.2.3