aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2022-04-12 14:06:23 -0300
committerEuAndreh <eu@euandre.org>2022-04-12 14:06:23 -0300
commitb29a2ca64a3d0536986693b6ad54b7aea8be7330 (patch)
treef4f06a2ef5fa9b5e16013cd08117a75f5d223e7c
parent_config.yml: Explicitly include .well-known/ directory (diff)
downloadeuandre.org-b29a2ca64a3d0536986693b6ad54b7aea8be7330.tar.gz
euandre.org-b29a2ca64a3d0536986693b6ad54b7aea8be7330.tar.xz
Rename favicon to lord-favicon
Diffstat (limited to '')
-rw-r--r--.gitignore3
-rw-r--r--Makefile14
-rw-r--r--_includes/feed.atom2
-rw-r--r--_layouts/default.html2
-rw-r--r--_layouts/slides.html2
-rw-r--r--_plugins/linter.rb6
-rw-r--r--_tils/2020-12-29-svg-favicon.md9
-rw-r--r--static/lord-favicon.svg (renamed from static/favicon.svg)0
8 files changed, 22 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index f653bb6..9d67eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,9 +13,10 @@
*.ogg
*.torrent
*.checksum
-/static/favicon.png
+/static/lord-favicon.png
/music/*.pdf
/music/*.midi
+/static/lord-favicon.ico
/favicon.ico
/drafts/
diff --git a/Makefile b/Makefile
index b5c85e4..2163b68 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ lilypond = \
$(lilypond.midi) \
$(lilypond.ogg)
-favicons = static/favicon.png favicon.ico
+favicons = static/lord-favicon.png static/lord-favicon.ico favicon.ico
podcasts.flac = \
resources/podcasts/2020-12-19-a-test-entry.flac
@@ -70,11 +70,15 @@ deps.mk: torrent-files.txt
$(torrents): files.mk deps.mk
$(MAKE) -f dynamic.mk torrents
-static/favicon.png: static/favicon.svg
- inkscape -o $@ -w 2048 -h 2048 -b white static/favicon.svg
+static/lord-favicon.png: static/lord-favicon.svg
+ inkscape -o $@ -w 2048 -h 2048 -b white static/lord-favicon.svg
+
+static/lord-favicon.ico: static/lord-favicon.svg
+ convert static/lord-favicon.svg $@
+
+favicon.ico: static/lord-favicon.ico
+ ln -fs static/lord-favicon.ico $@
-favicon.ico: static/favicon.svg
- convert static/favicon.svg $@
diff --git a/_includes/feed.atom b/_includes/feed.atom
index 83187d7..6ea84b3 100644
--- a/_includes/feed.atom
+++ b/_includes/feed.atom
@@ -20,7 +20,7 @@
<author>{{ site.author.name | xml_escape }} 3</author>
<webMaster>{{ site.author.email | xml_escape }} ({{ site.author.name | xml_escape }})</webMaster>
<image>
- <url>{{ '/' | absolute_url | xml_escape }}static/favicon.png</url>
+ <url>{{ '/' | absolute_url | xml_escape }}static/lord-favicon.png</url>
<link>{{ page.url | absolute_url | xml_escape }}</link>
<title>{{ site.t[include.kind].feed.title[include.lang] }}</title>
</image>
diff --git a/_layouts/default.html b/_layouts/default.html
index 38578b7..991d239 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" type="text/css" href="/styles.css" />
- <link rel="icon" type="image/svg+xml" href="/static/favicon.svg" />
+ <link rel="icon" type="image/svg+xml" href="/static/lord-favicon.svg" />
<link rel="alternate" type="application/atom+xml" href="{{ site.t.articles.feed.url[page.lang] | absolute_url }}" hreflang="{{ page.lang }}" title="{{ site.t.articles.feed.title[page.lang] }}" />
<link rel="alternate" type="application/atom+xml" href="{{ site.t.pastebins.feed.url[page.lang] | absolute_url }}" hreflang="{{ page.lang }}" title="{{ site.t.pastebins.feed.title[page.lang] }}" />
<link rel="alternate" type="application/atom+xml" href="{{ site.t.tils.feed.url[page.lang] | absolute_url }}" hreflang="{{ page.lang }}" title="{{ site.t.tils.feed.title[page.lang] }}" />
diff --git a/_layouts/slides.html b/_layouts/slides.html
index 1cc5cc5..7fb0953 100644
--- a/_layouts/slides.html
+++ b/_layouts/slides.html
@@ -2,7 +2,7 @@
<html lang="{{ page.lang }}">
<head>
<meta charset="UTF-8">
- <link rel="icon" type="image/svg+xml" href="/static/favicon.svg">
+ <link rel="icon" type="image/svg+xml" href="/static/lord-favicon.svg">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="alternate" type="application/atom+xml" href="{{ site.t.slides.feed.url[page.lang] | absolute_url }}" hreflang="{{ page.lang}}" title="{{ site.t.slides.feed.title[page.lang] }}" />
diff --git a/_plugins/linter.rb b/_plugins/linter.rb
index 0ccc92d..ad9b38e 100644
--- a/_plugins/linter.rb
+++ b/_plugins/linter.rb
@@ -151,11 +151,11 @@ module Jekyll
end
end
- check_cover_cmd = "metaflac #{file} --export-picture-to=- | diff - static/favicon.png"
+ check_cover_cmd = "metaflac #{file} --export-picture-to=- | diff - static/lord-favicon.png"
`#{check_cover_cmd}`
unless $?.success? then
- add_cover_cmd = "metaflac --remove-all #{file}\nmetaflac #{file} --import-picture-from=static/favicon.png"
- raise "Cover art from '#{file}' doesn't match 'static/favicon.png'.\nFix it with:\n\n#{add_cover_cmd}\n\nCheck with:\n #{check_cover_cmd}"
+ add_cover_cmd = "metaflac --remove-all #{file}\nmetaflac #{file} --import-picture-from=static/lord-favicon.png"
+ raise "Cover art from '#{file}' doesn't match 'static/lord-favicon.png'.\nFix it with:\n\n#{add_cover_cmd}\n\nCheck with:\n #{check_cover_cmd}"
end
elsif name == 'screencasts' then
stdout = `mediainfo #{file} | awk -F: '/^Movie name/ { print $2 }'`.strip
diff --git a/_tils/2020-12-29-svg-favicon.md b/_tils/2020-12-29-svg-favicon.md
index 2b9ff23..54cca9a 100644
--- a/_tils/2020-12-29-svg-favicon.md
+++ b/_tils/2020-12-29-svg-favicon.md
@@ -91,8 +91,9 @@ getting the final result I manually cleaned-up the generated XML:
</svg>
```
-The good thing about this new favicon (at [`/static/favicon.svg`](/static/favicon.svg))
-is that a) it is simple enough that I feel
+The good thing about this new favicon
+(at [`/static/lord-favicon.svg`](/static/lord-favicon.svg)) is that
+a) it is simple enough that I feel
comfortable editing it manually and b) it is an SVG, which means I can generate
any desired size.
@@ -129,5 +130,5 @@ end
```
I had to increase the priority of the generator so that it would run before
-other places that would use a `{% link /static/favicon.png %}`, otherwise the
-file would be considered missing.
+other places that would use a `{% link /static/lord-favicon.png %}`, otherwise
+the file would be considered missing.
diff --git a/static/favicon.svg b/static/lord-favicon.svg
index ce566b2..ce566b2 100644
--- a/static/favicon.svg
+++ b/static/lord-favicon.svg