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 @@

-
+