From fe36f6d726393fc157868f438aa31ae81c77e316 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 28 Jul 2017 12:18:22 +0100 Subject: [PATCH 1/4] Update about text --- source/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/index.md b/source/index.md index 31fc043ad..917303306 100644 --- a/source/index.md +++ b/source/index.md @@ -19,7 +19,7 @@ redirect: My name is Oliver Davies (aka [opdavies][1]) - a full-stack Web Developer and System Administrator based in Wales, UK. -I specialise in open-source PHP technologies. I’m an [Acquia certified Drupal Developer][41] but also work with Symfony, Silex, Laravel and Sculpin. I’m 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. +I specialise in open-source PHP technologies. I primarily work with Drupal and am an [Acquia certified Drupal Developer][41] but also work with Symfony, Silex, Laravel and Sculpin. I’m 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. I’m a webmaster and documentation maintainer for [Drupal.org][42], and a provisional member of the [Drupal Security team][14]. [I speak at various user groups and conferences][40], and co-organise the [Drupal Bristol user group][15], [PHPSW][17] and [DrupalCamp Bristol][18]. From 35f4e071ac7e3b798127c7a9c132cd4bbfbb40bd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 29 Jul 2017 08:00:20 +0100 Subject: [PATCH 2/4] Update speaker info page --- source/speaker-info.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/source/speaker-info.md b/source/speaker-info.md index 44df6624c..4e0912386 100644 --- a/source/speaker-info.md +++ b/source/speaker-info.md @@ -11,9 +11,9 @@ use: [posts] ## Bio -[Oliver Davies][1] ([@{{ site.twitter.name }}][2]) has been building websites since 2007, specialising in PHP and Drupal since 2008, and more recently also working with Symfony, Silex, Laravel and Sculpin. He is a {{ site.work.role }} at [{{ company.name }}][0], a Drupal core contributor and mentor, and an open source and contribution advocate. +[Oliver Davies][1] ([@{{ site.twitter.name }}][2]) has been building websites and web applications since 2007 - primarily with Drupal, though more recently also with Symfony, Silex, Laravel and Sculpin. He is a {{ site.work.role }} at [{{ company.name }}][0], a Drupal core contributor and mentor, and an open source and contribution advocate. -He regularly blogs and gives talks about web development and systems administration, maintains and contributes to various open source projects, and co-organises the Drupal Bristol and PHPSW meetups and DrupalCamp Bristol conference. +He regularly blogs and gives talks about web development and systems administration, maintains and contributes to various open source projects, and co-organises DrupalCamp Bristol as well as the Drupal Bristol and PHPSW user groups. ## Photo @@ -29,14 +29,11 @@ Here are some of the events that I’ve spoken at: - PHP South Coast 2016 - DrupalCamp Bristol 2016 - Nomad PHP + ## Videos -Here are some videos of my previous talks: - -- -- -- +Here is a YouTube playlist of some of my previous talks: . [0]: {{company.url}} [1]: {{site.url}} From fd8434c9e5bab2f47e538a191e7049d8fd9afeca Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 29 Jul 2017 08:38:56 +0100 Subject: [PATCH 3/4] Figure out badge widths dynamically --- assets/sass/components/_badges.sass | 10 ++++++++++ source/_includes/badges.html.twig | 24 +++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/assets/sass/components/_badges.sass b/assets/sass/components/_badges.sass index a2519d582..c652a511f 100644 --- a/assets/sass/components/_badges.sass +++ b/assets/sass/components/_badges.sass @@ -2,4 +2,14 @@ margin: 0 auto 10px .badges img + height: auto max-width: 100% + +.acquia-badges + border-collapse: collapse + display: table + + .badge + background: none + display: table-cell + padding: 0 diff --git a/source/_includes/badges.html.twig b/source/_includes/badges.html.twig index b23bc6758..fdcb45b5a 100644 --- a/source/_includes/badges.html.twig +++ b/source/_includes/badges.html.twig @@ -7,18 +7,20 @@ /> -
- Acquia Certified Developer - Drupal 8 Exam Badge +
+
+ Acquia Certified Developer - Drupal 8 Exam Badge +
- Acquia Certified Back End Specialist - Drupal 8 Exam Badge +
+ Acquia Certified Back End Specialist - Drupal 8 Exam Badge +
From c75125ca52594416cbb97ab6b1b8aac1944b031c Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 29 Jul 2017 19:12:05 +0100 Subject: [PATCH 4/4] Add npm run watch script --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d310aa8c8..68ee44cb5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "build": "npm run clean && npm-run-all -p sass js fonts:copy", "clean": "npm-run-all -p sass:clean fonts:clean js:clean", "dev": "npm run development", - "development": "cross-env ENV=dev npm run build && npm-run-all -p sass:watch js:watch", + "development": "cross-env ENV=dev npm run build", "fonts:clean": "rm -rf $npm_package_config_fontsDir output_*/assets/fonts/", "fonts:copy": "mkdir -p $npm_package_config_fontsDir && cp -R node_modules/font-awesome/fonts/* $npm_package_config_fontsDir", "js": "npm run js:concat", @@ -29,7 +29,8 @@ "sass:prod:compile": "node-sass assets/sass/main.sass $npm_package_config_cssOutputFile", "sass:prod:move": "mv $npm_package_config_cssOutputFile $npm_package_config_cssOutputDir && npm run sass:uglify", "sass:uglify": "uglifycss --ugly-comments $npm_package_config_cssOutputDir/$npm_package_config_cssOutputFile --output $npm_package_config_cssOutputDir/$npm_package_config_cssOutputFile", - "sass:watch": "onchange $npm_package_config_sassDir -v -- npm run sass" + "sass:watch": "onchange $npm_package_config_sassDir -v -- npm run sass", + "watch": "npm run dev && cross-env ENV=dev npm-run-all -p sass:watch js:watch" }, "devDependencies": { "autoprefixer": "^7.1.2",