This commit is contained in:
Oliver Davies 2019-01-05 00:08:45 +00:00
parent a3dcda88b3
commit 37c766a802
24 changed files with 82 additions and 125 deletions

View file

@ -20,7 +20,7 @@
>
<a
v-for="item in items"
class="block text-black focus:outline-none p-4 border-l-3 sm:border-l-0 sm:border-b-3 border-transparent hover:border-grey-light sm:ml-4 sm:mr-0 sm:p-0 hover:no-underline text-sm"
class="block text-black no-underline focus:outline-none p-4 border-l-3 sm:border-l-0 sm:border-b-3 border-transparent hover:border-grey-light sm:ml-4 sm:mr-0 sm:p-0 hover:no-underline text-sm"
:class="{'border-blue hover:border-blue': isActive(item)}"
:href="item.href"
>

View file

@ -2,10 +2,6 @@
@import '~highlightjs/styles/github-gist'
@tailwind preflight
@import 'base/base'
@import 'base/images'
@tailwind components
@import 'components/blockquote'

View file

@ -1,35 +0,0 @@
a
@apply text-blue no-underline
&:focus,
&:hover
@apply underline
b,
strong
@apply font-bold
main a
@apply underline
&:focus,
&:hover
@apply no-underline
&:focus
@apply text-white bg-blue outline-none px-px -mx-px
h1, h2, h3
@apply text-black mb-2 font-bold
.content h2,
.content h3
@apply mt-6
p,
ul,
ol,
blockquote,
table,
pre
@apply mb-6

View file

@ -1,14 +0,0 @@
img
&.has-border,
&.with-border
@apply border border-solid border-grey-light
&.has-padding,
&.with-padding
@apply p-2
&.avatar
@apply border p-1 rounded-full
svg
fill: currentColor

View file

@ -19,6 +19,27 @@
p:last-child
@apply mb-0
p,
ul,
ol,
blockquote,
table
@apply mb-4
pre
@apply my-8
a,
.link
@apply text-blue underline
&:focus,
&:hover
@apply no-underline
&:focus
@apply text-white bg-blue outline-none px-px -mx-px
pre code,
.hljs
@apply block leading-loose overflow-x-scroll p-6

View file

@ -7,8 +7,10 @@
<div class="mt-24 max-w-xl px-4 mx-auto">
<main id="main-content">
{% block page_title %}
<h1>{{ page.title }}</h1>
{% block page_title_wrapper %}
<h1 class="mb-4">
{% block page_title %}{{ page.title }}{% endblock %}
</h1>
{% endblock %}
{% block content_wrapper %}

View file

@ -1,5 +0,0 @@
{% extends 'default' %}
{% block content_top %}
<h1>{{ page.title }}</h1>
{% endblock %}

View file

@ -1,6 +1,6 @@
{% extends 'page' %}
{% extends 'default' %}
{% block page_title %}{% endblock %}
{% block page_title_wrapper %}{% endblock %}
{% block metaTags %}
<meta name="twitter:card" content="summary">

View file

@ -1,5 +1,5 @@
<div class="widget">
<h2>Availability</h2>
<h2 class="mb-2">Availability</h2>
<ul class="pl-5">
{% for type, value in site.availability %}

View file

@ -11,7 +11,7 @@
<div class="px-4">
<div class="widget bg-grey-light p-4 rounded">
<div class="-mb-3">
<div class="markup -mb-3">
<h2 class="visuallyhidden">Certifications</h2>
{% include 'certification' with {

View file

@ -0,0 +1,14 @@
<h2 class="text-2xl mb-1">{{ post.draft ? 'Draft: '|upper }}{{ post.title }}</h2>
<p class="text-sm text-grey-dark mb-4">Posted on {{ post.date|date('jS F Y') }}</p>
{% include 'post/intro-image' with { page: post } %}
<div class="markup mb-4">
<p>{{ post.excerpt }}</p>
</div>
<a href="{{ post.url }}" class="button">
Read more
<span class="visuallyhidden">about {{ post.title }}</span>
</a>

View file

@ -1,13 +1,13 @@
<footer class="border-grey-light border-t mb-8 mt-10 pt-5 text-sm">
<div class="md:flex md:justify-between">
<div class="markup md:flex md:justify-between">
<div>
<p>&copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}</p>
</div>
<div>
<p>
Built with <a href="https://sculpin.io">Sculpin</a> and <a href="https://tailwindcss.com">Tailwind CSS</a>,
and hosted on <a href="https://www.netlify.com">Netlify</a>.
Built with <a class="no-underline hover:underline" href="https://sculpin.io">Sculpin</a> and <a class="no-underline hover:underline" href="https://tailwindcss.com">Tailwind CSS</a>,
and hosted on <a class="no-underline hover:underline" href="https://www.netlify.com">Netlify</a>.
</p>
</div>
</div>

View file

@ -1,13 +1,13 @@
<div>
<div class="markup">
<h2>About the Author</h2>
<div class="flex items-center">
<div class="mr-4 flex-none leading-none">
<img src="{{ site.avatar.url }}" alt="Picture of Oliver" class="avatar w-16">
<img src="{{ site.avatar.url }}" alt="Picture of Oliver" class="w-16 rounded-full border border-grey">
</div>
<p class="text-sm mb-0">
Oliver Davies is a Web Developer and System Administrator based in the UK.
Oliver Davies is a Full Stack Web Developer and System Administrator based in the UK.
He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].url }}?utm_source={{ site.short_url }}&amp;utm_medium=about-author" class="link">{{ site.companies[site.work.company].name }}</a> and a part-time freelancer specialising in Drupal, Symfony and Laravel development and Linux systems administration.
</p>
</div>

View file

@ -1,8 +1,7 @@
{% set title_tag = title_tag ?: 'h1' %}
<{{ title_tag }} class="leading-tight mb-1">
{{ page.title }}
</{{ title_tag }}>
<div class="mb-8 bg-blue-light">
<h1 class="leading-tight mb-2">{{ page.title }}</h1>
<p class="text-grey-dark">
<p class="text-grey-dark">
<span class="visuallyhidden">Posted on </span>{{ page.date|date('jS F Y') }}
</p>
</p>
</div>

View file

@ -1,4 +1,4 @@
<div class="mb-4">
<div class="markup mb-4">
<p>
Questions? Comments?
Im <a href="https://twitter.com/{{ site.twitter.name }}">@{{ site.twitter.name }}</a> on Twitter.

View file

@ -1,6 +1,6 @@
{% if data.posts and page.url != '/blog' %}
<div class="widget lh-copy">
<h2>Latest Blog Posts</h2>
<div class="markup">
<h2 class="mb-2">Latest Blog Posts</h2>
<ul class="pl-4">
{% for post in data.posts|slice(0, site.latest_posts) %}

View file

@ -27,7 +27,7 @@
</td>
{% if not talk_page %}
<td class="whitespace-no-wrap xl:whitespace-normal">
<td class="markup whitespace-no-wrap xl:whitespace-normal">
{% if talk.talk.url is not empty %}
<a href="{{ talk.talk.url }}">
{{ talk.talk.title }}
@ -46,7 +46,7 @@
</td>
{% endif %}
<td class="whitespace-no-wrap xl:whitespace-normal">
<td class="markup whitespace-no-wrap xl:whitespace-normal">
{% if talk.event.url is not empty %}
<a href="{{ talk.event.url }}">
{{ talk.event.name }}
@ -67,7 +67,7 @@
{% if talk.event.joindin and talk.event.date <= 'today'|date('Y-m-d') %}
<a
href="{{ talk.event.joindin }}"
class="button no-underline"
class="button"
title="Read or leave feedback for this talk"
>
<i class="fa fa-comment-o"></i> joind.in

View file

@ -13,10 +13,8 @@ permalink: /
{% block content %}
<div class="md:flex -mx-6">
<div class="w-auto md:flex-1 px-6 mb-12 md:mb-0">
<h1 class="mb-6">About Me</h1>
<div class="markup mb-8">
<div class="mb-4 w-32"><img src="/images/me-precedent.jpg" alt="Picture of Oliver" class="avatar"></div>
<div class="mb-4 w-32"><img src="/images/me-precedent.jpg" alt="Picture of Oliver" class="rounded-full border border-grey"/></div>
<p>Hi, Im Oliver Davies (aka <a href="https://www.google.com/#q=opdavies">opdavies</a>) - a Full Stack Web Developer and System Administrator based in Wales, UK.</p>
@ -38,5 +36,3 @@ permalink: /
</div>
</div>
{% endblock %}
{% block page_title %}{% endblock %}

View file

@ -4,22 +4,10 @@ title: Blog
use: [posts]
---
{% block content %}
<ul class="list-reset -mx-4">
<ul class="list-reset -mt-2 -mx-4">
{% for post in data.posts %}
<li class="p-4 mb-12 {{ post.draft ? 'bg-blue-lighter' }}">
<h2 class="text-2xl mb-1">{{ post.draft ? 'Draft: '|upper }}{{ post.title }}</h2>
<p class="text-sm text-grey-dark mb-4">Posted on {{ post.date|date('jS F Y') }}</p>
{% include 'post/intro-image' with { page: post } %}
<div class="markup">
<p>{{ post.excerpt }}</p>
<a href="{{ post.url }}" class="button">
Read more
<span class="visuallyhidden">about {{ post.title }}</span>
</a>
</div>
{% include 'blog/post-summary' %}
</li>
{% endfor %}
</ul>

View file

@ -4,7 +4,7 @@ layout: default
use: [posts]
---
{% block content %}
<div>
<div class="mt-2 mb-6">
<p>To send me an email, complete the form below.</p>
</div>

View file

@ -1,5 +1,5 @@
---
layout: page
layout: default
title: Curriculum Vitae
experience:
- company: microserve

View file

@ -34,13 +34,12 @@ talks:
date: '2019-01-28'
---
{% block content %}
<p>
I regularly speak at conferences and user groups about a range of subjects including PHP, Drupal, automated testing, Git and systems administration.
If you would like to me to speak at your group or conference, please <a href="/contact">get in touch</a>.
</p>
<div class="markup mb-6">
<p>I regularly speak at conferences and user groups about a range of subjects including PHP, Drupal, automated testing, Git and systems administration.</p>
</div>
<div class="mb-6">
<h2>Upcoming Talks</h2>
<h2 class="mb-2">Upcoming Talks</h2>
{% set upcoming_talks = getUpcomingTalks(data.talks|merge(page.talks), site.events) %}
{% if not upcoming_talks.empty %}
@ -54,7 +53,7 @@ talks:
</div>
<div>
<h2>Previous Talks</h2>
<h2 class="mb-2">Previous Talks</h2>
{% include "talks-table" with {
talks: getPastTalks(data.talks|merge(page.talks), site.events)

View file

@ -5,7 +5,7 @@ mailchimp_url: 'https://oliverdavi.us18.list-manage.com/subscribe/post?u=b4ac8dd
contact_email: 'oliver@testdrivendrupal.com'
---
{% block content %}
<div class="markdown" markdown="1">
<div class="markdown mb-6" markdown="1">
Having [given talks][1] and workshops, been a guest on podcasts and [written blog posts][0] about automated testing in Drupal, Im currently in the planning phase of a book and potentially some accompanying screencasts about it, focussing on Drupal 8.
Im still thinking about what use-cases to cover and examples to include, but here are some of the things Im considering:

View file

@ -3,24 +3,20 @@ var colors = {
'transparent': 'transparent',
'black': '#222b2f',
'grey-darkest': '#364349',
'grey-darker': '#596a73',
'grey-dark': '#70818a',
'blue': '#0678be',
'blue-dark': '#2779bd',
'blue-lighter': '#bcdefa',
'green-dark': '#1f9d55',
'grey': '#9babb4',
'grey-dark': '#70818a',
'grey-darker': '#596a73',
'grey-darkest': '#364349',
'grey-light': '#dae4e9',
'grey-lighter': '#f2f2f2',
'grey-lightest': '#fafcfc',
'white': '#ffffff',
'blue-dark': '#2779bd',
'blue': '#0678be',
'blue-lighter': '#bcdefa',
'red-dark': '#cc1f1a',
'orange': '#f6993f',
'green-dark': '#1f9d55',
'red-dark': '#cc1f1a',
'white': '#ffffff',
}
module.exports = {