From d908a1e5956fc696909b6f9e54cac5519e78ac12 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 23 Apr 2019 09:19:55 +0100
Subject: [PATCH] Update settings

---
 app/config/sculpin_site.yml                     | 17 ++++-------------
 source/_layouts/app.html.twig                   |  4 ++--
 source/_partials/post/feedback.html.twig        |  2 +-
 .../_partials/post/questions-comments.html.twig |  2 +-
 .../2015-06-18-updating-forked-github-repos.md  |  2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
index 1cf3ba10..476cf8c3 100644
--- a/app/config/sculpin_site.yml
+++ b/app/config/sculpin_site.yml
@@ -2,11 +2,8 @@ title: Oliver Davies
 subtitle: Full Stack Web Developer (Drupal, Symfony, Laravel, Linux)
 description: 'Oliver Davies, Drupal Developer'
 email: oliver+website@oliverdavies.uk
-default_date_format: 'jS F, Y'
-fuzzy_date_format: F Y
 apple_touch_icon_sizes: [ 57, 114, 72, 144, 60, 120, 76, 152 ]
 favicon_sizes: [ 160, 96, 32, 16 ]
-latest_posts: 5
 
 ansible_galaxy:
     url: https://galaxy.ansible.com/opdavies
@@ -214,21 +211,15 @@ favicon:
     url: /images/me-phpnw.png
 
 github:
-    name: opdavies
     url: https://github.com/opdavies
+    user: opdavies
 
 gravatar:
     url: //www.gravatar.com/avatar/e0f6adcd63d8393e689b327e978d0887.png
 
-irc:
-    name: opdavies
-
 joindin:
     url: https://joind.in/user/opdavies
 
-lanyrd:
-    url: http://lanyrd.com/profile/opdavies
-
 linkedin:
     url: http://uk.linkedin.com/in/opdavies
 
@@ -236,19 +227,19 @@ npm:
     url: https://www.npmjs.com/~opdavies
 
 packagist:
-    name: opdavies
+    user: opdavies
     url: https://packagist.org/users/opdavies
 
 speakerdeck:
     url: https://speakerdeck.com/opdavies
 
 twitter:
-    name: opdavies
     url: https://twitter.com/opdavies
+    user: opdavies
 
 wordpress:
-    name: opdavies
     url: https://profiles.wordpress.org/opdavies
+    user: opdavies
 
 work:
     role: Senior Developer
diff --git a/source/_layouts/app.html.twig b/source/_layouts/app.html.twig
index e24bfe3b..6610981d 100644
--- a/source/_layouts/app.html.twig
+++ b/source/_layouts/app.html.twig
@@ -4,9 +4,9 @@
         <title>{% if page.title is defined and page.url != '//' %}{{ page.title }} | {% endif %}{{ site.title }} - {{ site.subtitle }}</title>
         {% include 'meta' %}
         {% block metas %}
-            <meta name="twitter:site" content="@{{ site.twitter.name }}">
+            <meta name="twitter:site" content="@{{ site.twitter.user }}">
             <meta name="twitter:title" content="{{ page.title }}">
-            <meta name="twitter:creator" content="@{{ site.twitter.name }}">
+            <meta name="twitter:creator" content="@{{ site.twitter.user }}">
         {% endblock %}
 
         <link rel="stylesheet" href="/dist/css/app.css">
diff --git a/source/_partials/post/feedback.html.twig b/source/_partials/post/feedback.html.twig
index 38dabff0..e39759ba 100644
--- a/source/_partials/post/feedback.html.twig
+++ b/source/_partials/post/feedback.html.twig
@@ -1,3 +1,3 @@
 <p class="mb-4 italic text-gray-600">
-    <b>Have feedback on this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/intent/tweet?text=@{{ site.twitter.name }}&url={{ site.url }}{{ page.url|url_encode }}">send me a tweet</a>.
+    <b>Have feedback on this post?</b> <a href="mailto:{{ site.email }}?subject=Feedback: {{ page.title }}">Email me</a> or <a href="https://twitter.com/intent/tweet?text=@{{ site.twitter.user }}&url={{ site.url }}{{ page.url|url_encode }}">send me a tweet</a>.
 </p>
diff --git a/source/_partials/post/questions-comments.html.twig b/source/_partials/post/questions-comments.html.twig
index 01347bc1..e822e395 100644
--- a/source/_partials/post/questions-comments.html.twig
+++ b/source/_partials/post/questions-comments.html.twig
@@ -1,6 +1,6 @@
 <div class="mb-4">
     <p>
         Questions? Comments?
-        I’m <a href="https://twitter.com/{{ site.twitter.name }}">@{{ site.twitter.name }}</a> on Twitter.
+        I’m <a href="https://twitter.com/{{ site.twitter.user }}">@{{ site.twitter.user }}</a> on Twitter.
     </p>
 </div>
diff --git a/source/_posts/2015-06-18-updating-forked-github-repos.md b/source/_posts/2015-06-18-updating-forked-github-repos.md
index 819b9820..a6482b83 100644
--- a/source/_posts/2015-06-18-updating-forked-github-repos.md
+++ b/source/_posts/2015-06-18-updating-forked-github-repos.md
@@ -62,7 +62,7 @@ This seems to have worked OK - the commits are still authored by the correct peo
 
 ## Is There a Better Way?
 
-Did I miss something? Is there a recommended and/or better way to update your forked repos, maybe through the UI? Please <a href="https://twitter.com/?status=Rebasing GitHub Forks: @{{ site.twitter.name }}">send me a tweet</a> with any comments.
+Did I miss something? Is there a recommended and/or better way to update your forked repos, maybe through the UI? Please <a href="https://twitter.com/?status=Rebasing GitHub Forks: @{{ site.twitter.user }}">send me a tweet</a> with any comments.
 
 ## Up
 __December 2015:__ I’ve found that PhpStorm has an option available to rebase a fork from within the IDE. This is within the *VCS* > *Git* menu.