Merge branch 'master' into talks

This commit is contained in:
Oliver Davies 2015-09-10 01:30:48 +01:00
commit 3d91db28c2
3 changed files with 11 additions and 13 deletions

View file

@ -56,7 +56,6 @@ default_date_format: jS F, Y
fuzzy_date_format: F Y fuzzy_date_format: F Y
title_separator: "|" title_separator: "|"
html_lang: en-GB html_lang: en-GB
bootswatch: lumen
availability: availability:
status: status:

View file

@ -33,7 +33,6 @@ I maintain several contrib projects on Drupal.org, and have contributed to numer
<a href="{{ site.drupalorg.url }}/people-mentored">I mentor new Drupal contributors</a> online and in person at local sprints, DrupalCamps and DrupalCons, and have helped several new contributors to get their first commits to Drupal core. <a href="{{ site.drupalorg.url }}/people-mentored">I mentor new Drupal contributors</a> online and in person at local sprints, DrupalCamps and DrupalCons, and have helped several new contributors to get their first commits to Drupal core.
I'm also the [Git Documentation Maintainer](https://www.drupal.org/node/2248627#comment-8887789) for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team). I'm also the [Git Documentation Maintainer](https://www.drupal.org/node/2248627#comment-8887789) for the Drupal project, and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
I organise Drupal user group events such as talk nights and code sprints in <a href="{{ site.meetups.swdug.url }}">South Wales</a> and <a href="{{ site.meetups.drupalbristol.url }}">Bristol</a>, and am a founding [DrupalCamp Bristol](http://2015.drupalcampbristol.co.uk) organising committee member. I also regularly attend and speak at other meetups and conferences related to Drupal, PHP, Linux, DevOps, and web development and accessibility. I organise Drupal user group events such as talk nights and code sprints in <a href="{{ site.meetups.swdug.url }}">South Wales</a> and <a href="{{ site.meetups.drupalbristol.url }}">Bristol</a>, and am a founding [DrupalCamp Bristol](http://2015.drupalcampbristol.co.uk) organising committee member. I also regularly attend and speak at other meetups and conferences related to Drupal, PHP, Linux, DevOps, and web development and accessibility.

View file

@ -18,7 +18,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}"> <link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}">
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/{{ site.bootswatch }}/bootstrap.min.css"> <link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css">
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css"> <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
{% for size in site.apple_touch_icon_sizes %} {% for size in site.apple_touch_icon_sizes %}
@ -30,7 +30,7 @@
{% endfor %} {% endfor %}
</head> </head>
<body class="{% block body_classes %}{% endblock %}"> <body class="{% block body_classes %}{% endblock %}">
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">