From f3890e3dadf0ab256170fcadba84ea10a3287a22 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 10 Mar 2017 18:06:39 +0000
Subject: [PATCH] Standardise file extensions

---
 gulpfile.js                                          |  6 +++++-
 source/_partials/experience-item.twig                | 12 ++++++------
 source/{contact.html.twig => contact.twig}           |  0
 source/{experience.html.twig => experience.twig}     |  0
 source/{projects.html.twig => projects.twig}         |  0
 source/{talks.html.twig => talks.twig}               |  0
 source/{testimonials.html.twig => testimonials.twig} |  0
 7 files changed, 11 insertions(+), 7 deletions(-)
 rename source/{contact.html.twig => contact.twig} (100%)
 rename source/{experience.html.twig => experience.twig} (100%)
 rename source/{projects.html.twig => projects.twig} (100%)
 rename source/{talks.html.twig => talks.twig} (100%)
 rename source/{testimonials.html.twig => testimonials.twig} (100%)

diff --git a/gulpfile.js b/gulpfile.js
index c01e720c..a370073f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -35,7 +35,11 @@ gulp.task('styles', function() {
             cascade: false
         }))
         .pipe(plugins.concat('site.css'))
-        .pipe(plugins.if(!config.production, plugins.purifycss(['./source/*.html', './source/*.md', './source/*.twig', './ssource/*.html.twig'])))
+        .pipe(plugins.if(!config.production, plugins.purifycss([
+            'source/*.html',
+            'source/*.md',
+            'source/*.twig',
+        ])))
         .pipe(plugins.if(config.production, plugins.cleanCss()))
         .pipe(plugins.if(!config.production, plugins.sourcemaps.write('.')))
         .pipe(plugins.if(!config.production, plugins.refresh()))
diff --git a/source/_partials/experience-item.twig b/source/_partials/experience-item.twig
index 85b7fe12..b9818347 100644
--- a/source/_partials/experience-item.twig
+++ b/source/_partials/experience-item.twig
@@ -6,6 +6,12 @@
 
 <div class="{{ classes|sort|join(' ') }}">
     <div class="inner">
+        {% if company.logo %}
+            <div class="experience__logo">
+                <img src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.name }} logo">
+            </div>
+        {% endif %}
+
         <h2>{{ company.name }}</h2>
 
         {% if company.website %}
@@ -27,10 +33,4 @@
             {{ experience.description|raw }}
         </div>
     </div>{# /.inner #}
-
-    {% if company.logo %}
-        <div class="experience__logo">
-            <img src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.name }} logo">
-        </div>
-    {% endif %}
 </div>
diff --git a/source/contact.html.twig b/source/contact.twig
similarity index 100%
rename from source/contact.html.twig
rename to source/contact.twig
diff --git a/source/experience.html.twig b/source/experience.twig
similarity index 100%
rename from source/experience.html.twig
rename to source/experience.twig
diff --git a/source/projects.html.twig b/source/projects.twig
similarity index 100%
rename from source/projects.html.twig
rename to source/projects.twig
diff --git a/source/talks.html.twig b/source/talks.twig
similarity index 100%
rename from source/talks.html.twig
rename to source/talks.twig
diff --git a/source/testimonials.html.twig b/source/testimonials.twig
similarity index 100%
rename from source/testimonials.html.twig
rename to source/testimonials.twig