diff --git a/css/ebi-industry-colours.css b/css/theme-ebi-industry.css
similarity index 100%
rename from css/ebi-industry-colours.css
rename to css/theme-ebi-industry.css
diff --git a/css/ebi-research-colours.css b/css/theme-ebi-research.css
similarity index 100%
rename from css/ebi-research-colours.css
rename to css/theme-ebi-research.css
diff --git a/css/ebi-services-about-colours.css b/css/theme-ebi-services-about.css
similarity index 100%
rename from css/ebi-services-about-colours.css
rename to css/theme-ebi-services-about.css
diff --git a/css/ebi-training-colours.css b/css/theme-ebi-training.css
similarity index 100%
rename from css/ebi-training-colours.css
rename to css/theme-ebi-training.css
diff --git a/css/embl-petrol-colours.css b/css/theme-embl-petrol.css
similarity index 100%
rename from css/embl-petrol-colours.css
rename to css/theme-embl-petrol.css
diff --git a/css/pdbe-green-colours.css b/css/theme-pdbe-green.css
similarity index 100%
rename from css/pdbe-green-colours.css
rename to css/theme-pdbe-green.css
diff --git a/css/_readme-custom-theme.txt b/css/theme-readme-custom.txt
similarity index 100%
rename from css/_readme-custom-theme.txt
rename to css/theme-readme-custom.txt
diff --git a/css/_template-theme.css b/css/theme-template.css
similarity index 92%
rename from css/_template-theme.css
rename to css/theme-template.css
index 385e48baa743085fe48a8aec17d46d574ef767e7..9258fae9c96496cbcde478cdace247bc1a49adf3 100644
--- a/css/_template-theme.css
+++ b/css/theme-template.css
@@ -1,6 +1,6 @@
/*
Colour palette: EMBL-EBI [project name] [main colour]
- Save as [your-project-name]-colours.css
+ Save as theme-[projectname].css
*/
a {
diff --git a/fonts/index.html b/fonts/index.html
index 136fd91ca6802ac52d5d18af52e13fd3233a8893..9fcd9f732b3b17806c5c88b3fcc352c3e98a760b 100644
--- a/fonts/index.html
+++ b/fonts/index.html
@@ -50,9 +50,9 @@
-->
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background-4.jpg">
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/index.html b/index.html
index c78a6ff2f72a70bd4fe3e97397d3fb772ae210a9..dbb58696e18412c3c2493509740de53d7ff858c2 100755
--- a/index.html
+++ b/index.html
@@ -50,9 +50,9 @@
<meta name="ebi-localmasthead-color" content="#091314">
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background-4.jpg">
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
@@ -329,7 +329,7 @@
<li>Core HTML structure: The basic HTML markkup structure for the page: global-nav black bar, local-nav area, main content div, footer, etc.</li>
<li><a href="css/ebi-global.css">EBI base CSS styles</a>: Our basic look/colours.</li>
<li><a href="https://ebiwd.github.io/EBI-Framework/libraries/foundation-6/css/foundation.css">Foundation base CSS styles</a>: this provides the base grid structure, style resets, and core structure of the page.</li>
- <li><a href="css/embl-petrol-colours.css">Your site's CSS colours</a>: Colours specific to your service/site.</li>
+ <li><a href="css/theme-embl-petrol.css">Your site's CSS colours</a>: Colours specific to your service/site.</li>
<li>Fonts.css</li>
<li>jQuery 1.10.2: Slightly older versions may be compatible.</li>
<ul>
@@ -503,19 +503,19 @@
<p>
<div class="row small-up-1 medium-up-2 large-up-3" data-equalizer>
<div class="column ebi-background white-color" data-equalizer-watch>
- <p><h4 class="white-color">EBI Petrol</h4> The default. <br/><small>Found at css/embl-petrol-colours.css</small></p>
+ <p><h4 class="white-color">EBI Petrol</h4> The default. <br/><small>Found at css/theme-embl-petrol.css</small></p>
</div>
<div class="column services-background white-color" data-equalizer-watch>
- <p><h4 class="white-color">Services</h4> Close to EBI Petrol. <br/><small>Found at css/ebi-services-about-colours.css</small></p>
+ <p><h4 class="white-color">Services</h4> Close to EBI Petrol. <br/><small>Found at css/theme-ebi-services-about.css</small></p>
</div>
<div class="column research-background white-color" data-equalizer-watch>
- <p><h4 class="white-color">Research</h4> Green. <br/><small>Found at css/ebi-research-colours.css</small></p>
+ <p><h4 class="white-color">Research</h4> Green. <br/><small>Found at css/theme-ebi-research.css</small></p>
</div>
<div class="column training-background white-color" data-equalizer-watch>
- <p><h4 class="white-color">Training</h4> Golden. <br/><small>Found at css/ebi-training-colours.css</small></p>
+ <p><h4 class="white-color">Training</h4> Golden. <br/><small>Found at css/theme-ebi-training.css</small></p>
</div>
<div class="column industry-background white-color" data-equalizer-watch>
- <p><h4 class="white-color">Industry</h4> Bright blue ocean. <br/><small>Found at css/ebi-industry-colours.css</small></p>
+ <p><h4 class="white-color">Industry</h4> Bright blue ocean. <br/><small>Found at css/theme-ebi-training.css</small></p>
</div>
</div>
</p>
@@ -544,13 +544,8 @@
<h3>Roll your own colors</h3>
- <p>If you wish to make your own colour palatte, see this set of directions <code>/css/readme-custom-colours.txt</code></p>
+ <p>If you wish to make your own colour palatte, see this set of directions <code>/css/theme-readme-custom.txt</code></p>
-<!-- <div class="callout row">
- <div class="columns small-1"><span class="lead icon icon-generic" data-icon="i"></span></div>
- <div class="columns small-11">If you wish to make your own colour palatte, see this set of directions /css/readme-custom-colours.txt</div>
- </div>
- -->
</section>
<section id="typography" data-magellan-target="typography">
diff --git a/sample-site/boilerplate/blank.html b/sample-site/boilerplate/blank.html
index 63ea2e6baa15454a2f0742488ab4f28a620f700a..98324cb2e52ef7f6b8f97b60c12bf785fa0b2bf6 100755
--- a/sample-site/boilerplate/blank.html
+++ b/sample-site/boilerplate/blank.html
@@ -50,9 +50,9 @@
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background.jpg">
-->
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/boilerplate/ultra-wide.html b/sample-site/boilerplate/ultra-wide.html
index 30821d8628637d7a03259aae1d6f73982dc14729..31ef2801715a32ea80a8aa15c8ec17b708385420 100755
--- a/sample-site/boilerplate/ultra-wide.html
+++ b/sample-site/boilerplate/ultra-wide.html
@@ -50,9 +50,9 @@
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background.jpg">
-->
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/brochure.html b/sample-site/brochure.html
index 686b6ebc6c0decd2d7556511802a60d593903572..2f4c985a4eaf4b38d238c72f83657212088bf58f 100755
--- a/sample-site/brochure.html
+++ b/sample-site/brochure.html
@@ -50,9 +50,9 @@
<meta name="ebi-localmasthead-image" content="http://i.stack.imgur.com/7Wzpq.jpg">
-->
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/errorpages/404.html b/sample-site/errorpages/404.html
index e112b5e050e7b6488ec7e728bec9ae322738c9b0..7175d67b726dd4fd51e2c65f73143146814215a8 100755
--- a/sample-site/errorpages/404.html
+++ b/sample-site/errorpages/404.html
@@ -43,9 +43,9 @@
<!-- Use this CSS file for any custom styling -->
<link rel="stylesheet" href="../../css/custom.css" type="text/css" media="all">
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="../../move-to-cdn/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="../../move-to-cdn/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/front_page.html b/sample-site/front_page.html
index 6025a37d977141e8e7f069ff24ede0a980c348b9..5985e55f4649f82b7e7c0946f126c0e1c46df1b1 100755
--- a/sample-site/front_page.html
+++ b/sample-site/front_page.html
@@ -48,9 +48,9 @@
<meta name="ebi-localmasthead-color" content="#000">
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background.jpg">
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/index.html b/sample-site/index.html
index 623361fd2abad763b69d1f62191b730faef34f0e..ed056d40ffdad25cd1547792b92168e76f4492c0 100644
--- a/sample-site/index.html
+++ b/sample-site/index.html
@@ -50,9 +50,9 @@
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background.jpg">
-->
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--
diff --git a/sample-site/migrations/expression-atlas/expression-atlas-current.html b/sample-site/migrations/expression-atlas/expression-atlas-current.html
index edab1262391972116727104108ee2391597c22e7..c303cbd7e1c4eb308f4461ef405734263ffc3350 100644
--- a/sample-site/migrations/expression-atlas/expression-atlas-current.html
+++ b/sample-site/migrations/expression-atlas/expression-atlas-current.html
@@ -59,7 +59,7 @@ Code copied on 2016-05-06.
<link type="text/css" rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/css/compliance/develop/ebi-global.css">
<link type="text/css" rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/css/compliance/develop/ebi-visual.css">
<link type="text/css" rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/css/compliance/develop/984-24-col-fluid.css">
- <link type="text/css" rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/css/compliance/develop/embl-petrol-colours.css">
+ <link type="text/css" rel="stylesheet" href="//www.ebi.ac.uk/web_guidelines/css/compliance/develop/theme-embl-petrol.css">
<style type="text/css">
/* You have the option of setting a maximum width for your page, and making sure everything is centered */
diff --git a/sample-site/migrations/expression-atlas/expression-atlas-updated.html b/sample-site/migrations/expression-atlas/expression-atlas-updated.html
index 79bcb77dc6178aab15939dacba42289bde19d892..81ce6fc766d6a4c66da18e31abb7c68b753ef6d2 100644
--- a/sample-site/migrations/expression-atlas/expression-atlas-updated.html
+++ b/sample-site/migrations/expression-atlas/expression-atlas-updated.html
@@ -88,7 +88,7 @@ NOTE: This web page:
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/embl-ebi-background.jpg">
-->
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/sample-site/migrations/expression-atlas/expression-atlas-colours.css" type="text/css" media="all">
diff --git a/sample-site/migrations/testMigration.js b/sample-site/migrations/testMigration.js
index 540683b388bd5f107d545310e2f9cf7d1e614fec..49064898e8178fec3289757097ae07b5100e2df0 100644
--- a/sample-site/migrations/testMigration.js
+++ b/sample-site/migrations/testMigration.js
@@ -94,12 +94,12 @@ function testMigration(steppingTimeSpeed) {
// Define array of object pairs
// [what we check for] [what we replace with]
var colourPalettes = [
- { "original" : "link[href$=\"/embl-petrol-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" },
- { "original" : "link[href$=\"/ebi-industry-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/ebi-industry-colours.css" },
- { "original" : "link[href$=\"/ebi-research.colour.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/ebi-research-colours.css" },
- { "original" : "link[href$=\"/ebi-services-about-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/ebi-services-about-colours.css" },
- { "original" : "link[href$=\"/ebi-training-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/ebi-training-colours.css" },
- { "original" : ".no-match", "new" : "//ebiwd.github.io/EBI-Framework/css/embl-petrol-colours.css" }
+ { "original" : "link[href$=\"/embl-petrol-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" },
+ { "original" : "link[href$=\"/ebi-industry-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-ebi-industry.css" },
+ { "original" : "link[href$=\"/ebi-research.colour.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-ebi-research.css" },
+ { "original" : "link[href$=\"/ebi-services-about-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-ebi-services-about.css" },
+ { "original" : "link[href$=\"/ebi-training-colours.css\"]", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-ebi-training.css" },
+ { "original" : ".no-match", "new" : "//ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css" }
];
var i = 0;
// which colour palette is used?
diff --git a/sample-site/research.html b/sample-site/research.html
index 61f22e497ce6fd92cc990f53b9e981078d5849e3..1f8d457953be87714cb1156af23342ddf7c874f3 100755
--- a/sample-site/research.html
+++ b/sample-site/research.html
@@ -48,9 +48,9 @@
<meta name="ebi-localmasthead-color" content="#000">
<meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/research-green-2.jpg">
- <!-- you can replace this with [projectname]-colours.css. See http://www.ebi.ac.uk/web/style/colour for details of how to do this -->
+ <!-- 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="https://ebiwd.github.io/EBI-Framework/css/ebi-research-colours.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebiwd.github.io/EBI-Framework/css/theme-ebi-research.css" type="text/css" media="all">
<!-- for production the above can be replaced with -->
<!--