opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Oliver Davies 2017-09-04 17:55:53 +01:00
parent 04b28136df
commit 62b1dc15d2
30 changed files with 286 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/_includes/availability.html.twig
View file

@ -1,11 +1,9 @@
<div class="availability panel panel-default">
<div class="panel-heading">Availability</div>
<div class="lh-copy">
<h2>Availability</h2>
<div class="panel-block">
<div>
{% for key, availability in site.availability %}
{% include 'availability/' ~ availability with { value: key } %}
{% endfor %}
</div>
</div>
<ul class="list pa0">
{% for key, availability in site.availability %}
{% include 'availability/' ~ availability with { value: key } %}
{% endfor %}
</ul>
</div>

8
source/_includes/availability/limited.html.twig
View file

@ -1,8 +1,6 @@
<p>
<span class="icon is-small">
<i class="fa fa-thumbs-o-up is-warning"></i>
</span>
<li>
<i class="mr1 fa fa-thumbs-o-up orange"></i>
{{ value == 'full' ? 'Currently have limited full-time capacity' }}
{{ value == 'part' ? 'Currently have limited part-time capacity' }}
</p>
</li>

8
source/_includes/availability/no.html.twig
View file

@ -1,8 +1,6 @@
<p>
<span class="icon is-small">
<i class="fa fa-thumbs-o-down is-danger"></i>
</span>
<li>
<i class="mr1 fa fa-thumbs-o-down dark-red"></i>
{{ value == 'full' ? 'Currently no spare full-time capacity.' }}
{{ value == 'part' ? 'Currently no spare part-time capacity.' }}
</p>
</li>

8
source/_includes/availability/yes.html.twig
View file

@ -1,8 +1,6 @@
<p>
<span class="icon is-small">
<i class="fa fa-thumbs-o-up is-success"></i>
</span>
<li>
<i class="mr1 fa fa-thumbs-o-up dark-green"></i>
{{ value == 'full' ? 'Currently have available full-time capacity' }}
{{ value == 'part' ? 'Currently have available part-time capacity' }}
</p>
</li>

32
source/_includes/badges.html.twig
View file

@ -1,5 +1,5 @@
<div class="panel badges has-text-centered">
<a href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member." class="is-block">
<div>
<a href="https://assoc.drupal.org/membership" title="I’m a Drupal Association member." class="db mb3 tc">
<img
src="{{ site.images_url }}/assets/images/badges/da-individual-member.png"
alt="Drupal Association Individual Member"
@ -7,23 +7,21 @@
/>
</a>
<div class="acquia-badges">
<div class="badge">
<img
src="{{ site.images_url }}/assets/images/badges/acquia-d8-developer.png"
alt="Acquia Certified Developer - Drupal 8 Exam Badge"
/>
</div>
<div class="badge">
<img
src="{{ site.images_url }}/assets/images/badges/acquia-d8-back-end.png"
alt="Acquia Certified Back End Specialist - Drupal 8 Exam Badge"
/>
</div>
<div class="db mb3 dt">
{% for badge in [
{ image: 'acquia-d8-developer.png', alt: 'Acquia Certified Developer - Drupal 8 Exam Badge' },
{ image: 'acquia-d8-back-end.png', alt: 'Acquia Certified Back End Specialist - Drupal 8 Exam Badge' }
] %}
<div class="dtc">
<img
src="{{ site.images_url }}/assets/images/badges/{{ badge.image }}"
alt="{{ badge.alt }}"
/>
</div>
{% endfor %}
</div>
<a href="http://conference.phpnw.org.uk/phpnw17" class="is-block">
<a href="http://conference.phpnw.org.uk/phpnw17" class="db">
<img src="{{ site.images_url }}/assets/images/badges/phpnw17.png" alt="">
</a>
</div>

15
source/_includes/meetups.html.twig
View file

@ -1,12 +1,17 @@
<div class="meetups">
<h2>Things that I organise</h2>
<ul>
<div class="mt4">
<h2 class="mb3">Things that I organise</h2>
<ul class="list flex pa0 mt0">
{% for meetup in site.meetups %}
<li class="meetups--{{ meetup.name|lower|replace({ ' ': '-' }) }}">
<a href="{{ meetup.url }}" title="{{ meetup.name }}">
<li>
<a
href="{{ meetup.url }}"
title="{{ meetup.name }}"
class="dib {% if not loop.last %}mr2{% endif %}">
<img
src="{{ site.images_url }}/assets/images/meetups/{{ meetup.logo }}"
alt="{{ meetup.name }} logo"
class="h3"
>
</a>
</li>

60
source/_includes/nav.html.twig
View file

@ -1,45 +1,31 @@
<nav class="nav has-shadow" id="top">
<div class="container">
<div class="nav-left">
<a class="nav-item">
<div class="nav-item">
<a href="{{ site.url }}">
{{ site.title }}
</a>
</div>
<header class="w-100 pa3 ph5-ns bg-white">
<div class="db dt-ns mw9 center w-100">
<div class="db dtc-ns v-mid tl w-50">
<a href="/" class="dib f5 f4-ns mt0 mb1 link black-70" title="Home">
{{ site.title }}
</a>
</div>
<span class="nav-toggle">
<span></span>
<span></span>
<span></span>
</span>
<nav class="db dtc-ns v-mid w-100 tl tr-ns mt2 mt0-ns">
<a href="/" class="f6 hover-blue link black-70 ml2 ml-m ml4-l dib">
About
</a>
<div class="nav-right nav-menu">
<a class="nav-item is-tab {{ page.url == '/.' ? 'is-active' }}" href="/">
About
</a>
<a href="/components/" class="f6 hover-blue link black-70 ml2 ml-m ml4-l dib">
Experience
</a>
<a class="nav-item is-tab {{ page.url == '/experience' ? 'is-active' }}" href="/experience">
Experience
</a>
<a href="/gallery/" class="f6 hover-blue link black-70 ml2 ml-m ml4-l dib">
Testimonials
</a>
<a class="nav-item is-tab {{ page.url == '/testimonials' ? 'is-active' }}" href="/testimonials">
Testimonials
</a>
<a href="/resources/" class="f6 hover-blue link black-70 ml2 ml-m ml4-l dib">
Talks
</a>
<a class="nav-item is-tab {{ page.url == '/talks' or '/talks/' in page.url ? 'is-active' }}" href="/talks">
Talks
</a>
<a class="nav-item is-tab {{ page.url == '/blog' or '/blog/' in page.url ? 'is-active' }}" href="/blog">
Blog
</a>
<a class="nav-item is-tab {{ page.url == '/contact' or '/contact/' in page.url ? 'is-active' }}" href="/contact">
Contact
</a>
</div>
<a href="http://github.com/tachyons-css/tachyons/" class="f6 hover-blue link black-70 ml2 ml-m ml4-l dn dib-l">
Contact
</a>
</nav>
</div>
</nav>
</header>

4
source/_includes/post/about-author.html.twig
View file

@ -1,7 +1,7 @@
<div class="about-author is-clearfix mt-2">
<div class="cf mt2">
<h2>About the Author</h2>
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="is-circle is-pulled-left mr-1 mb-1">
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="w3 mr3 br-100 fl">
<p>Oliver Davies is a Web Developer, System Administrator and Drupal specialist based in the UK. He is a {{ site.work.role }} at <a href="{{ site.companies[site.work.company].url }}">{{ site.companies[site.work.company].name }}</a> and also provides freelance consultancy services for Drupal websites, PHP applications and Linux servers.</p>
</div>

8
source/_includes/post/header.html.twig
View file

@ -1,4 +1,8 @@
{% set title_tag = title_tag ?: 'h1' %}
<{{ title_tag }}>{{ page.title }}</{{ title_tag }}>
<{{ title_tag }} class="mb1">
{{ page.title }}
</{{ title_tag }}>
<p class="posted">{{ page.date|date('jS F Y') }}</p>
<p class="mt0 black-50">
{{ page.date|date('jS F Y') }}
</p>

2
source/_includes/post/intro-image.html.twig
View file

@ -1,5 +1,5 @@
{% if page.blocks.intro_image %}
<div class="has-text-centered">
<div class="mv3 tc">
{{ page.blocks.intro_image|raw }}
</div>
{% endif %}

10
source/_includes/post/pager.html.twig
View file

@ -1,15 +1,15 @@
<div class="post-pager is-clearfix is-flex mt-2">
<div class="flex mt3">
{% if page.previous_post %}
<div class="is-half flex">
<a href="{{ page.previous_post.url }}">
<div class="w-50-ns">
<a href="{{ page.previous_post.url }}" class="blue1">
&laquo; {{ page.previous_post.title }}
</a>
</div>
{% endif %}
{% if page.next_post %}
<div class="is-half flex has-text-right">
<a href="{{ page.next_post.url }}">
<div class="w-50-ns tr">
<a href="{{ page.next_post.url }}" class="blue1">
{{ page.next_post.title }} &raquo;
</a>
</div>

25
source/_includes/posts/latest.html.twig
View file

@ -1,18 +1,15 @@
{% if data.posts and page.url != '/blog' %}
<div class="latest-posts panel panel-default">
<div class="latest-posts__heading panel-heading">Latest blog posts</div>
<div class="lh-copy">
<h2>Latest blog posts</h2>
{% for post in data.posts|slice(0, site.latest_posts) %}
<div class="post panel-block">
<div>
<span class="post__title">
<a href="{{ post.url }}">
{{ post.title }}
</a>
</span> -
<span class="post__date">{{ post.date|date(site.default_date_format) }}</span>
</div>
</div>
{% endfor %}
<ul class="list pa0">
{% for post in data.posts|slice(0, site.latest_posts) %}
<li>
<a href="{{ post.url }}">
{{ post.title }}
</a>
</li>
{% endfor %}
</ul>
</div>
{% endif %}

38
source/_includes/talks-table.html.twig
View file

@ -1,17 +1,17 @@
<div class="table-responsive">
<table class="talks-table table is-striped">
<table class="w-100 ba b--moon-gray">
<thead>
<tr>
<th style="width: 20%">Date</th>
<tr class="striped--light-gray">
<th class="w-20 pa2 tl">Date</th>
{% if not talk_page %}
<th style="width: 40%">Talk</th>
<th class="w-40 pa2 tl">Talk</th>
{% endif %}
<th>Event</th>
<th class="pa2 tl">Event</th>
{% if not upcoming %}
<th style="width: 10%">Feedback</th>
<th class="w-12 pa2 tl">Feedback</th>
{% endif %}
</tr>
</thead>
@ -23,54 +23,52 @@
{% for item in row.talks if key == item.filename|split('.')|first %}
{% set talk = item %}
{% endfor %}
<tr>
<td class="vertical-middle">
<tr class="striped--near-white">
<td class="pa2">
{{ row.date.date|date(row.date.fuzzy_date ? 'F Y' : 'j F Y') }}
{% if row.date.time %}
<small class="is-block">{{ row.date.time }}</small>
<small class="db">{{ row.date.time }}</small>
{% endif %}
</td>
{% if not talk_page %}
<td>
<td class="pa2">
{% if row.date.talk.title is defined %}
{{ row.date.talk.title }}
{% else %}
<a href="{{ talk.url }}">{{ talk.title }}</a>
<a href="{{ talk.url }}" class="blue">{{ talk.title }}</a>
{% endif %}
<small class="is-block">
<small class="db">
{{ row.date.talk.type ?: talk.type }}
</small>
</td>
{% endif %}
<td class="vertical-middle">
<td class="pa2">
{% if row.event.website %}
<a href="{{ row.event.website }}">
<a href="{{ row.event.website }}" class="blue">
{{ row.event.name }}
</a>
{% else %}
{{ row.event.name }}
{% endif %}
<small class="is-block">
<small class="db">
{{ row.event.location }}
</small>
</td>
{% if not upcoming %}
<td class="vertical-middle">
<td class="">
{% if row.date.feedback %}
<a
href="{{ row.date.feedback }}"
class="button is-primary"
class="bg-blue br2 pa2 white-90 no-underline dib dim"
title="Read or leave feedback for this talk"
>
<!-- <span class="icon is-small">
<i class="fa fa-comment-o" style="margin-right: 8px"></i>
</span> -->
<i class="fa fa-comment-o mr1"></i>
joind.in
</a>
{% endif %}