Merge branch 'source' into cv

build.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -x
-
-rm -rf ./output_prod
-/usr/local/bin/sculpin generate --env=prod
-
-LOG=$(git log --oneline -n 1)
-
-rm -rf ./gh-pages-deployment/
-git clone git@github.com:opdavies/opdavies.github.io.git ./gh-pages-deployment/
-
-pushd ./gh-pages-deployment/
-
-git checkout -B master
-
-rsync --quiet --archive --filter="P .git*" --delete ../output_prod/ ./
-
-git add -A .
-git commit -m "${LOG}"
-git push origin master --force
-
-popd

deploy.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -x
+
+ENV='prod'
+REPO='git@github.com:opdavies/opdavies.github.io.git'
+BRANCH='master'
+BUILD_DIR='./gh-pages-deployment/'
+
+rm -rf ./output_${ENV}
+sculpin generate --env=${ENV}
+
+LOG=$(git log --oneline -n 1)
+
+rm -rf ${BUILD_DIR}
+git clone ${REPO} ${BUILD_DIR}
+
+pushd ${BUILD_DIR}
+git checkout -B ${BRANCH}
+rsync --quiet --archive --filter="P .git*" --delete ../output_${ENV}/ ./
+git add -A .
+git commit -m "${LOG}"
+git push origin ${BRANCH} --force
+popd

source/404.html.twig

@@ -0,0 +1,14 @@
+---
+layout: default
+title: Page Not Found
+permalink: /404.html
+---
+{% block content_wrapper %}
+  <div class="col-md-12">
+    {% block content %}
+      <h1>Page Not Found</h1>
+    {% endblock %}
+  </div> {# .col.md-12 #}
+{% endblock %}
+
+{% block sidebar %}{% endblock %}

source/company-information.md

@@ -2,6 +2,8 @@
 layout: default
 title: Company Information
 nav: company
+meta:
+  description: 'Company information for Oliver Davies Ltd.'
 ---
 # Company Information
 

source/contact.md

@@ -4,6 +4,8 @@ title: Contact
 nav: contact
 use:
   - posts
+meta:
+  description: 'Information about how to get in touch with Oliver.'
 ---
 # Contact
 

source/index.md

@@ -5,6 +5,8 @@ nav: about
 front: true
 use:
   - posts
+meta:
+  description: 'The personal website and blog of Oliver Davies, a Drupal Developer and Systems Administrator from Wales, UK.'
 ---
 # About
 

source/services.md

@@ -4,6 +4,8 @@ title: Services
 nav: services
 use:
   - posts
+meta:
+  description: 'Information about freelance services that Oliver offers.'
 ---
 # Services
 

source/talks.md

@@ -4,6 +4,8 @@ title: Talks
 nav: talks
 use:
   - posts
+meta:
+  description: 'Information about previous and upcoming talks that Oliver has presented at conferences and user groups.'
 ---
 # Talks
 

source/themes/opdavies/opdavies/_layouts/default.html.twig

@@ -4,7 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="{% if page.front == true %}{{ site.description }}{% else %}{{ page.description }}{% endif %}">
+    {% if page.meta.description %}
+      <meta name="description" content="{{ page.meta.description|e('html') }}">
+    {% endif %}
     <link rel="author" href="{{ site.url }}/humans.txt" />
     <title>{% if (page.front == true) and (site.subtitle) %}{{ site.subtitle }}{% else %}{{ page.title }}{% endif %} | {{ site.title }}</title>
     

source/work.md

@@ -4,6 +4,8 @@ title: Work
 nav: work
 use:
   - posts
+meta:
+  description: "Information about Oliver's current work."
 ---
 # Work