From 547dfe4eb3c5ac819a52d90493af8b4a83458e9e Mon Sep 17 00:00:00 2001 From: Andrew Conlin Date: Sun, 30 Apr 2023 13:41:06 +0100 Subject: [PATCH] [30/04/23] sorted category styling and added mastodon link --- _config.yml | 12 +- _data/categories.yml | 2 +- _data/icons.yml | 4 +- _includes/category-style.html | 17 --- _includes/nav.html | 11 +- _includes/style.html | 16 +++ _layouts/category.html | 49 ++++++++ _layouts/default.html | 6 +- _layouts/post.html | 2 +- _layouts/til-post.html | 24 ---- .../2023-04-29-links-arent-performances.md | 2 +- ...-04-19-running-python-in-cron-in-docker.md | 2 +- _site/2023/01/14/index.html | 117 ------------------ _site/2023/01/index.html | 117 ------------------ _site/2023/03/01/index.html | 117 ------------------ _site/2023/03/05/index.html | 117 ------------------ _site/2023/03/10/index.html | 117 ------------------ _site/2023/03/index.html | 117 ------------------ _site/2023/04/19/index.html | 117 ------------------ _site/2023/04/29/index.html | 117 ------------------ _site/2023/04/index.html | 117 ------------------ _site/2023/index.html | 117 ------------------ .../01/14/musings-on-the-cinema/index.html | 52 ++++---- .../2023/03/05/yuri-felsen-on-love/index.html | 50 ++++---- .../putting-thoughts-into-action/index.html | 56 ++++----- .../04/29/links-arent-performances/index.html | 58 +++++---- _site/blog/category/links/index.html | 103 ++++++++------- _site/blog/category/quotes/index.html | 103 ++++++++------- _site/blog/category/thoughts/index.html | 117 +++++++++++------- _site/blog/category/til/index.html | 117 +++++++++++------- _site/blog/index.html | 48 ++++--- _site/blog/tag/bootstrap/index.html | 117 ------------------ _site/blog/tag/cinema/index.html | 117 ------------------ _site/blog/tag/copyright/index.html | 117 ------------------ _site/blog/tag/cron/index.html | 117 ------------------ _site/blog/tag/css/index.html | 117 ------------------ _site/blog/tag/docker-compose/index.html | 117 ------------------ _site/blog/tag/docker/index.html | 117 ------------------ _site/blog/tag/film/index.html | 117 ------------------ _site/blog/tag/html/index.html | 117 ------------------ _site/blog/tag/jekyll/index.html | 117 ------------------ _site/blog/tag/journal/index.html | 117 ------------------ _site/blog/tag/kindle/index.html | 117 ------------------ _site/blog/tag/law/index.html | 117 ------------------ _site/blog/tag/love/index.html | 117 ------------------ _site/blog/tag/nextcloud/index.html | 117 ------------------ _site/blog/tag/php/index.html | 117 ------------------ _site/blog/tag/pluralistic/index.html | 117 ------------------ _site/blog/tag/python/index.html | 117 ------------------ _site/blog/tag/webdev/index.html | 117 ------------------ _site/blog/tag/yuri-felsen/index.html | 117 ------------------ _site/index.html | 46 ++++--- _site/til/index.html | 100 +++++---------- _site/til/nextcloud-php-errors/index.html | 56 ++++----- .../index.html | 60 +++++---- til.html | 6 +- 56 files changed, 594 insertions(+), 4035 deletions(-) delete mode 100644 _includes/category-style.html create mode 100644 _includes/style.html create mode 100644 _layouts/category.html delete mode 100644 _layouts/til-post.html delete mode 100644 _site/2023/01/14/index.html delete mode 100644 _site/2023/01/index.html delete mode 100644 _site/2023/03/01/index.html delete mode 100644 _site/2023/03/05/index.html delete mode 100644 _site/2023/03/10/index.html delete mode 100644 _site/2023/03/index.html delete mode 100644 _site/2023/04/19/index.html delete mode 100644 _site/2023/04/29/index.html delete mode 100644 _site/2023/04/index.html delete mode 100644 _site/2023/index.html diff --git a/_config.yml b/_config.yml index 1739265..53c6032 100644 --- a/_config.yml +++ b/_config.yml @@ -2,7 +2,7 @@ plugins: - jekyll-archives permalink: pretty -baseurl: "/andrewconl.in" +baseurl: "/" url: "https://andrwcnln.github.io" defaults: @@ -20,11 +20,15 @@ defaults: values: permalink: til/:title/ category: til - layout: til-post + layout: post jekyll-archives: - enabled: all - layout: default + enabled: + - categories + - tags + layouts: + category: category + tag: tag permalinks: category: "/blog/category/:name/" tag: "/blog/tag/:name/" diff --git a/_data/categories.yml b/_data/categories.yml index 32e47e7..26e09d8 100644 --- a/_data/categories.yml +++ b/_data/categories.yml @@ -9,4 +9,4 @@ quotes: textColor: black links: backColor: "#36b" - textColor: white \ No newline at end of file + textColor: black \ No newline at end of file diff --git a/_data/icons.yml b/_data/icons.yml index 3140c92..91b31cc 100644 --- a/_data/icons.yml +++ b/_data/icons.yml @@ -1,5 +1,5 @@ -- link: https://twitter.com/andrwcnln - icon: fab fa-twitter +- link: https://mastodon.scot/@andrwcnln + icon: fab fa-mastodon - link: https://instagram.com/conlinsta icon: fab fa-instagram - link: https://github.com/andrwcnln diff --git a/_includes/category-style.html b/_includes/category-style.html deleted file mode 100644 index ea18b8e..0000000 --- a/_includes/category-style.html +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/_includes/nav.html b/_includes/nav.html index 7b33928..d2f1616 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -1,8 +1,7 @@ -{% assign categories = page.categories %} -{% assign primaryCategory = site.data.categories[categories.first] %} +{% assign primaryCategory = site.data.categories[include.a] %} -

- {% if categories %} +

+ {% if primaryCategory %} ac {% else %} ac @@ -10,7 +9,7 @@

-
+