From a98f2c4bd2c16c50ecd92970f5608de078fa29a9 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 14:55:41 -0800 Subject: [PATCH 01/10] Rename layout `base` to `default` This allows to not have to list it as boilerplate everywhere... --- _layouts/about.html | 2 +- _layouts/{base.html => default.html} | 0 _layouts/portfolio.html | 2 +- _layouts/post.html | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename _layouts/{base.html => default.html} (100%) diff --git a/_layouts/about.html b/_layouts/about.html index 49b96121..adb7c242 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -1,5 +1,5 @@ --- -layout: base +layout: default ---
diff --git a/_layouts/base.html b/_layouts/default.html similarity index 100% rename from _layouts/base.html rename to _layouts/default.html diff --git a/_layouts/portfolio.html b/_layouts/portfolio.html index 711eff3a..2438a43c 100644 --- a/_layouts/portfolio.html +++ b/_layouts/portfolio.html @@ -1,5 +1,5 @@ --- -layout: base +layout: default ---
diff --git a/_layouts/post.html b/_layouts/post.html index 22124f27..54ec7ee9 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,5 +1,5 @@ --- -layout: base +layout: default ---
From 3cc5cf90c1bc6565645a486816579f9fd70563e8 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 15:18:21 -0800 Subject: [PATCH 02/10] Add to include `head.html` --- _includes/head.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index afa3ac7e..dc89c316 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,11 +1,12 @@ + - {{ site.title }} + {% seo %} - + From c4dec310c6cbee2fb6768e37fa0efd5ea24de8d0 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 15:18:46 -0800 Subject: [PATCH 03/10] Add defaults to `about.html` --- _layouts/about.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/about.html b/_layouts/about.html index adb7c242..a07d7d23 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -4,10 +4,10 @@
- {{ site.author.name }} + {{ site.author.name | default: site.author }}
-
{{ site.author.name }}
-
{{ site.author.desc }}
+
{{ site.author.name | default: site.author }}
+
{{ site.author.desc | default: site.description | default: site.github.project_tagline }}
From d3dd3ec66a145269f0b16c64433c420785ba73ff Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 15:18:38 -0800 Subject: [PATCH 04/10] Add defaults to `base.html` --- _layouts/default.html | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index f57228a0..1b35ef31 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,20 +1,23 @@ - + {% include head.html %} - + +
+
{{ content }} @@ -22,7 +25,7 @@

{{ site.title }}

- © {{ site.author.name }}. A.P theme by kssim. + © {{ site.author.name | default: site.author }}. A.P theme by kssim.
From 611f9dfd5fb883900300c27a97e8fba86b65d4e2 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 15:32:09 -0800 Subject: [PATCH 05/10] Allow include `head-custom.html` --- _includes/head-custom-google-analytics.html | 20 ++++++++++++++++++++ _includes/head-custom.html | 2 ++ _includes/head.html | 21 +-------------------- 3 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 _includes/head-custom-google-analytics.html create mode 100644 _includes/head-custom.html diff --git a/_includes/head-custom-google-analytics.html b/_includes/head-custom-google-analytics.html new file mode 100644 index 00000000..0055fb32 --- /dev/null +++ b/_includes/head-custom-google-analytics.html @@ -0,0 +1,20 @@ + + {% if site.google_analytics %} + + {% endif %} diff --git a/_includes/head-custom.html b/_includes/head-custom.html new file mode 100644 index 00000000..6cecfbc7 --- /dev/null +++ b/_includes/head-custom.html @@ -0,0 +1,2 @@ + +{% include head-custom-google-analytics.html %} diff --git a/_includes/head.html b/_includes/head.html index dc89c316..8c70e401 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -15,25 +15,6 @@ - - {% if site.google_analytics %} - - {% endif %} + {% include head-custom.html %} From 6e5cb4cc5dbe426e6864be30d43a1a904217a648 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 16:04:55 -0800 Subject: [PATCH 06/10] Section about --- _layouts/about.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/_layouts/about.html b/_layouts/about.html index a07d7d23..26c78326 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -11,15 +11,14 @@
-
+
{{ content }} -
-
+
From c80c3437c08f22dc01f3c9b324326e0774319f1d Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 20:00:18 -0800 Subject: [PATCH 07/10] Add defaults to `icons` --- _includes/icons.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_includes/icons.html b/_includes/icons.html index 7a9ad0f4..6fecd54e 100644 --- a/_includes/icons.html +++ b/_includes/icons.html @@ -1,6 +1,6 @@ {% if site.social.email %}
  • - + @@ -64,9 +64,9 @@
    • {% endif %} -{% if site.social.github %} +{% if site.social.github or site.github_username %}
  • - + @@ -196,9 +196,9 @@
    • {% endif %} -{% if site.social.twitter %} +{% if site.social.twitter or site.twitter_username %}
  • - + From 76e1024a0efa722d09d80cc0e663b35193c42643 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 20:01:15 -0800 Subject: [PATCH 08/10] Rename `icons.html` to `social.html` --- _includes/{icons.html => social.html} | 0 _layouts/about.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename _includes/{icons.html => social.html} (100%) diff --git a/_includes/icons.html b/_includes/social.html similarity index 100% rename from _includes/icons.html rename to _includes/social.html diff --git a/_layouts/about.html b/_layouts/about.html index 26c78326..6373c16e 100644 --- a/_layouts/about.html +++ b/_layouts/about.html @@ -17,7 +17,7 @@ From 4f8ca7ffb348057dc89b272a0c14ad3d4dd86be6 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 20:45:21 -0800 Subject: [PATCH 09/10] Remove trailing foward slash from portfolio link in nav bar --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 1b35ef31..1064a412 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -13,7 +13,7 @@

    {{ site.title | default: site.github.repository_name }}

    • From c5ea57055a090e3e64661f143ca487773c3d82cd Mon Sep 17 00:00:00 2001 From: John D Pell Date: Thu, 13 Jan 2022 21:25:04 -0800 Subject: [PATCH 10/10] Sectionate `post` layout --- _layouts/post.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/post.html b/_layouts/post.html index 54ec7ee9..52b1970d 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,13 +2,13 @@ layout: default --- -
    +

    {{ page.title }}

    -
    +
    {{ content }} -
    +