Standardise on CSS and image locations

config.rb

@@ -8,7 +8,7 @@
 
 # Location of the theme's resources.
 sass_dir = "sass"
-css_dir = "source/css"
+css_dir = "source/assets/css"
 images_dir = "source/assets/images"
 generated_images_dir = images_dir + "/generated"
 javascripts_dir = "source/js"

source/_layouts/default.html.twig

@@ -18,7 +18,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{ site.url }}/css/oliverdavies.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/oliverdavies.css">
         <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
         <link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
         {% block styles %}{% endblock %}

source/_layouts/project.html.twig

@@ -35,7 +35,7 @@
 
     {% if page.image %}
         <div class="project--image">
-            <img src="/images/projects/{{ page.image }}" alt="The {{ page.title }} website.">
+            <img src="/assets/images/projects/{{ page.image }}" alt="The {{ page.title }} website.">
         </div>
     {% endif %}
 {% endblock %}

source/experience.html.twig

@@ -5,7 +5,7 @@ nav: experience
 experiences:
     - name: CTI Digital
       webite: https://www.ctidigital.com
-      logo: /images/experience/cti-digital.png
+      logo: cti-digital.png
       role: Lead Drupal Developer
       location: Remote
       start: November 2015
@@ -23,7 +23,7 @@ experiences:
     - name: Microserve
       website: https://microserve.io
       location: Bristol, England
-      logo: /images/experience/microserve.png
+      logo: microserve.png
       role: Senior Drupal Developer
       start: July 2015
       end: November 2015
@@ -33,7 +33,7 @@ experiences:
 
     - name: Drupal Association
       website: https://assoc.drupal.org
-      logo: /images/experience/drupal-association.png
+      logo: drupal-association.png
       role: Drupal.org Developer
       location: Remote
       start: 2014
@@ -45,7 +45,7 @@ experiences:
     - name: Precedent
       website: http://precedent.com
       location: Cardiff, Wales
-      logo: /images/experience/precedent.jpg
+      logo: precedent.jpg
       role: Senior Drupal Developer
       start: 2013
       end: 2014
@@ -55,7 +55,7 @@ experiences:
     - name: Nomensa
       website: http://www.nomensa.com
       location: Bristol, England
-      logo: /images/experience/nomensa.png
+      logo: nomensa.png
       role: 'Contract Drupal Developer / Application Developer & System Administrator'
       start: 2012
       end: 2013
@@ -66,7 +66,7 @@ experiences:
     - name: 'Proctor & Stevenson'
       website: http://www.proctors.co.uk
       location: Bristol, England
-      logo: /images/experience/proctors.jpg
+      logo: proctors.jpg
       role: 'PHP Developer'
       start: 2011
       end: 2012
@@ -76,7 +76,7 @@ experiences:
     - name: 'Horse & Country TV'
       website: http://www.horseandcountry.tv
       location: Cwmbran, Wales
-      logo: /images/experience/horse-and-country.jpg
+      logo: horse-and-country.jpg
       role: Web Developer
       start: 2010
       end: 2011
@@ -92,7 +92,7 @@ experiences:
                 <h2>{{ experience.name }}</h2>
 
                 {% if experience.logo %}
-                    <img class="experience--logo" src="{{ experience.logo }}" alt="{{ experience.name }} logo">
+                    <img class="experience--logo" src="/assets/images/experience/{{ experience.logo }}" alt="{{ experience.name }} logo">
                 {% endif %}
 
                 {% if experience.website %}

source/testimonials.html.twig

@@ -99,7 +99,7 @@ testimonials:
             <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
             {% if testimonial.image %}
-                <img class="testimonial__image" src="{{ site.url }}/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
+                <img class="testimonial__image" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
             {% endif %}
 
             {% if testimonial.role and company.name is not defined %}