Merge branch 'master' into add-skills

This commit is contained in:
Oliver Davies 2017-06-24 06:29:42 +01:00
commit 51251dc3fc
5 changed files with 31 additions and 14 deletions

View file

@ -15,3 +15,7 @@
.list-style-none
list-style: none
@each $value in 'block' 'inline' 'inline-block'
.display-#{$value}
display: #{$value}

View file

@ -1,9 +1,15 @@
<div class="panel badges">
<a class="badges__badge--da-member" href="https://assoc.drupal.org/membership" title="Im a Drupal Association member.">
<div class="panel badges text-center">
<a class="badge--da-member" href="https://assoc.drupal.org/membership" title="Im a Drupal Association member.">
<img src="{{ site.images_url }}/assets/images/da-individual-member.png" alt="Drupal Association Individual Member">
</a>
<a href="https://www.drupal.org/8">
<a href="http://drupalcores.com/#{{ site.drupalorg.name }}">
<img alt="I built Drupal 8 with hand holding a wrench on blue background" src="{{ site.images_url }}/assets/images/drupal-8.jpg"/>
</a>
<img
src="{{ site.images_url }}/assets/images/badges/acquia-certified-developer-drupal-8.png"
alt="Acquia Certified Developer - Drupal 8 Exam Badge"
height="147" width="147"
/>
</div>

View file

@ -12,7 +12,9 @@
{% for event in events %}
<tr>
<td class="column-date">
{{ event.date|date('j F Y') }}
<div class="event-date display-block">
{{ event.date|date('j F Y') }}
</div>
{% if event.time %}
<small class="talk-type">
@ -23,13 +25,15 @@
{% if not hide_talk %}
<td>
{% if not event.talk.hide_page %}
<a href="{{ event.talk.url }}">
<div class="display-block">
{% if not event.talk.hide_page %}
<a href="{{ event.talk.url }}">
{{ event.talk.title }}
</a>
{% else %}
{{ event.talk.title }}
</a>
{% else %}
{{ event.talk.title }}
{% endif %}
{% endif %}
</div>
{% if event.talk.type %}
<small class="talk-type">
@ -40,9 +44,11 @@
{% endif %}
<td class="column-event">
{% if event.url %}<a href="{{ event.url }}">{% endif %}
{{ event.title }}
{% if event.url %}</a>{% endif %}
<div class="display-block">
{% if event.url %}<a href="{{ event.url }}">{% endif %}
{{ event.title }}
{% if event.url %}</a>{% endif %}
</div>
{% if event.location %}
<small class="event-location">

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

View file

@ -23,7 +23,7 @@ use: [posts, testimonials]
<img src="{{ site.images_url }}{{ site.avatar.url }}" alt="Picture of Oliver" class="me img-circle">
My name is Oliver Davies (aka [opdavies][1]) - a Web Developer and System Administrator based in Wales, UK. Im a PHP specialist, a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][20], former Developer at the [{{ site.companies.drupal_association.name }}][39], part-time freelancer, open source contributor and advocate, mentor and conference speaker.
My name is Oliver Davies (aka [opdavies][1]) - a Web Developer and System Administrator based in Wales, UK. Im a PHP specialist and [Acquia certified Drupal Developer][41], a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][20], former Developer at the [{{ site.companies.drupal_association.name }}][39], part-time freelancer, open source contributor and advocate, mentor and conference speaker.
Im a provisional member of the [Drupal Security team][14] and a webmaster and documentation maintainer for Drupal.org. [I speak at various user groups and conferences][40], and co-organise the [Drupal Bristol user group][15], [PHPSW][17] and [DrupalCamp Bristol][18].
@ -94,3 +94,4 @@ Im a provisional member of the [Drupal Security team][14] and a webmaster and
[38]: https://disqus.com/by/opdavies
[39]: {{site.companies.drupal_association.url}}
[40]: {{site.url}}/talks
[41]: http://certification.acquia.com/registry?fname=Oliver&lname=Davies&country=United+Kingdom