Improve loading of JS/CSS

_includes/footer.html

@@ -18,11 +18,11 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <!-- Your custom JavaScript file scan go here... change names accordingly -->
 <!-- <script defer="defer" src="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/js/script.js"></script> -->
-<script defer="defer" src="js/script.js"></script>
+<script defer="defer" src="{{ site.baseurl }}/js/script.js"></script>
 
 <!-- The Foundation theme JavaScript -->
 <script src="libraries/foundation-6/js/foundation.js"></script>
-<script src="js/foundationExtendEBI.js"></script>
+<script src="{{ site.baseurl }}/js/foundationExtendEBI.js"></script>
 <!-- <script src="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/js/foundation.js"></script> -->
 <!-- <script src="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/js/foundationExtendEBI.js"></script> -->
 <script type="text/JavaScript">$(document).foundation();</script>
@@ -33,11 +33,6 @@
 <script src="{{js}}"></script>
 {% endfor %}
 
-{% comment %} Custom Component Scripts (from individual .md files) go here: {% endcomment %}
-{% for js in page.javascript %}
-<script src="{{js}}"></script>
-{% endfor %}
-
 <!-- Google Analytics details... -->
 <!-- Change UA-XXXXX-X to be your site's ID -->
 <!--

_includes/head.html

@@ -33,9 +33,9 @@
 
   <!-- CSS: implied media=all -->
   <!-- CSS concatenated and minified via ant build script-->
-  <link rel="stylesheet" href="css/ebi-global.min.css" type="text/css" media="all" />
+  <link rel="stylesheet" href="{{ site.baseurl }}/css/ebi-global.min.css" type="text/css" media="all" />
   <!-- <link rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css" type="text/css" media="all"> -->
-  <link rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css" type="text/css" media="all">
+  <link rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css" type="text/css" media="none" onload="if(media!=='all')media='all'">
 
   <!-- Use this CSS file for any custom styling -->
   <!--
@@ -54,7 +54,7 @@
 
     <!-- you can replace this with theme-[projectname].css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
   <!-- also inform ES so we can host your colour palette file -->
-  <link rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/theme-embl-petrol.css" type="text/css" media="all">
+  <link rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/theme-embl-petrol.css" type="text/css" media="none" onload="if(media!=='all')media='all'">
 
   <!-- for production the above can be replaced with -->
   <!--