Merge branch 'master' into hotfix/images

This commit is contained in:
Oliver Davies 2015-06-03 12:39:16 +01:00
commit b8d5fd6298
7 changed files with 20 additions and 10 deletions

View file

@ -1,4 +1,3 @@
oliverdavies.co.uk
==================
# oliverdavies.co.uk
My personal website, built with [Sculpin](http://sculpin.io).

View file

@ -1,5 +1,5 @@
<div class="about-author">
<h2>About the Author</h2>
<img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle">
<img src="{{ site.gravatar_url }}?s=50" alt="Picture of Oliver" class="img-circle">
<p>{{ site.bio|raw }}</p>
</div>

View file

@ -6,9 +6,11 @@
</a>
</section>
<!--
<section class="block block--drupalcon_la">
<h2>DrupalCon LA</h2>
<img src="/assets/images/drupalcon-la-attending.png" alt="">
<img src="/assets/images/drupalcon-la-sprinter.png" alt="">
</section>
-->
</div>

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,8 @@
.about-author {
@include clearfix;
img {
float: left;
margin: 0 1em 1em 0;
}
}

View file

@ -17,11 +17,11 @@ meta:
<!-- <img src="{{ site.gravatar_url }}" alt="Picture of Oliver" class="img-circle"> -->
Oliver Davies is a [Drupal Developer](https://www.drupal.org/u/opdavies) and Linux System Administrator based in the UK. He works for the [Drupal Association](https://assoc.drupal.org) and also provides part-time consultancy services.
Oliver Davies is a <a href="{{ site.drupalorg_nice }}">Drupal Developer</a> and Linux System Administrator based in the UK. He works for the [Drupal Association](https://assoc.drupal.org) and also provides part-time consultancy services.
An active community member, Oliver co-organises [SWDUG](https://groups.drupal.org/wales-uk) and the [Bristol Drupal user group](https://groups.drupal.org/bristol-west-uk), and is a founding member of the [DrupalCamp Bristol](http://2015.drupalcampbristol.co.uk) organising committee. He also attends other Drupal events and conferences as well as local PHP, Linux and web accessibility user groups.
A contributor to [Drupal 7](http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep&q=opdavies) and [Drupal 8](http://cgit.drupalcode.org/drupal/log/?h=8.0.x&qt=grep&q=opdavies) core, Oliver also [mentors new contributors](https://www.drupal.org/user/381388/people-mentored) online and in person at local sprints, DrupalCamps and DrupalCons. He maintains several projects on Drupal.org, and has contributed to numerous others. He is also the Git Documentation Maintainer for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
A contributor to [Drupal 7](http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep&q=opdavies) and [Drupal 8](http://cgit.drupalcode.org/drupal/log/?h=8.0.x&qt=grep&q=opdavies) core, Oliver also <a href="{{ site.drupalorg }}/people-mentored">mentors new contributors</a> online and in person at local sprints, DrupalCamps and DrupalCons. He maintains several projects on Drupal.org, and has contributed to numerous others. He is also the Git Documentation Maintainer for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
You can follow him on <a href="{{ site.twitter }}">Twitter</a> and <a href="{{ site.linkedin }}">LinkedIn</a>, and you can view his code on <a href="{{ site.drupalorg }}/track/code">Drupal.org</a> and <a href="{{ site.github }}?tab=activity">GitHub</a>.
You can follow him on <a href="{{ site.twitter }}">Twitter</a> and <a href="{{ site.linkedin }}">LinkedIn</a>, and you can view his code on
<a href="{{ site.drupalorg }}/track/code">Drupal.org</a> and <a href="{{ site.github }}?tab=activity">GitHub</a>.

View file

@ -22,7 +22,8 @@ meta:
## System Administration
* [CentOS](http://www.centos.org), [RHEL](http://www.redhat.com/en/technologies/linux-platforms/enterprise-linux) and [Ubuntu](http://www.ubuntu.com/server) server configuration, including [Apache](http://apache.org), [Nginx](http://nginx.org), [PHP](http://php.net), [MySQL](http://mysql.com) and [MariaDB](https://mariadb.org).
* Configuration management using [Puppet](http://puppetlabs.com) or [Ansible](http://www.ansible.com).
* Server configuration and management using [Puppet](http://puppetlabs.com) and/or [Ansible](http://www.ansible.com).
* Continuous integration using [Jenkins](http://jenkins-ci.org).
* Virtual machine setup using [Vagrant](http://vagrantup.com) for development or server testing.
* Domain name and DNS management.
* Domain name and DNS management.