From 2f8db5c223496d4c3018a889c81808a0779e6395 Mon Sep 17 00:00:00 2001
From: khawkins98 <khawkins98@gmail.com>
Date: Wed, 14 Feb 2018 09:17:50 +0000
Subject: [PATCH] Cleanup links, use ebi.emblstatic.net CDN
---
templates/index.html | 77 ++++++++++++++++++++------------------------
1 file changed, 35 insertions(+), 42 deletions(-)
diff --git a/templates/index.html b/templates/index.html
index 1fe5bed..f2f4740 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -19,32 +19,32 @@
<!-- If you have custom icon, replace these as appropriate.
You can generate them at realfavicongenerator.net -->
- <link rel="icon" type="image/x-icon" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/favicon.ico" />
- <link rel="icon" type="image/png" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/favicon-32x32.png" />
- <link rel="icon" type="image/png" sizes="192×192" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) -->
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-114x114.png"> <!-- For iPhone 4 Retina display (114px) -->
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-72x72.png"> <!-- For iPad (72px) -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-144x144.png"> <!-- For iPad retinat (144px) -->
- <link rel="apple-touch-icon-precomposed" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-57x57.png"> <!-- For iPhone (57px) -->
- <link rel="mask-icon" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/safari-pinned-tab.svg" color="#ffffff"> <!-- Safari icon for pinned tab -->
+ <link rel="icon" type="image/x-icon" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/favicon.ico" />
+ <link rel="icon" type="image/png" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/favicon-32x32.png" />
+ <link rel="icon" type="image/png" sizes="192×192" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) -->
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-114x114.png"> <!-- For iPhone 4 Retina display (114px) -->
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-72x72.png"> <!-- For iPad (72px) -->
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-144x144.png"> <!-- For iPad retinat (144px) -->
+ <link rel="apple-touch-icon-precomposed" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/apple-icon-57x57.png"> <!-- For iPhone (57px) -->
+ <link rel="mask-icon" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/safari-pinned-tab.svg" color="#ffffff"> <!-- Safari icon for pinned tab -->
<meta name="msapplication-TileColor" content="#2b5797"> <!-- MS Icons -->
- <meta name="msapplication-TileImage" content="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/mstile-144x144.png">
+ <meta name="msapplication-TileImage" content="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/logos/EMBL-EBI/favicons/mstile-144x144.png">
<!-- CSS: implied media=all -->
<!-- CSS concatenated and minified via ant build script-->
- <link rel="stylesheet" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/libraries/foundation-6/css/foundation.css" type="text/css" media="all">
- <link rel="stylesheet" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/css/ebi-global.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/libraries/foundation-6/css/foundation.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/css/ebi-global.css" type="text/css" media="all">
<link rel="stylesheet" href="fonts.css" type="text/css" media="all">
<!-- If you have a custom header image or colour -->
<!--
<meta name="ebi:localmasthead-color" content="#000">
-->
- <meta name="ebi:localmasthead-image" content="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/images/backgrounds/embl-ebi-background-4.jpg">
+ <meta name="ebi:localmasthead-image" content="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/images/backgrounds/embl-ebi-background-4.jpg">
<!-- 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://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/css/theme-embl-petrol.css" type="text/css" media="all">
+ <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/css/theme-embl-petrol.css" type="text/css" media="all">
</head>
<body class="level2"><!-- add any of your classes or IDs -->
@@ -104,7 +104,7 @@
<!-- local-title -->
<div class="columns medium-7" id="local-title">
- <h1><a href="http://ebiwd.github.io/EBI-Pattern-library/" title="Back to EBI Visual framework">EBI Visual Framework</a></h1>
+ <h1><a href="https://www.ebi.ac.uk/style-lab/" title="Back to the EBI Style Lab">EBI Style Lab</a></h1>
</div>
<!-- /local-title -->
<!-- local-nav -->
@@ -125,7 +125,7 @@
<section>
<nav aria-label="You are here:" role="navigation">
<ul class="breadcrumbs">
- <li><a href="http://ebiwd.github.io/EBI-Pattern-library/">Framework overview</a></li>
+ <li class=""><a href="https://www.ebi.ac.uk/style-lab/">Framework overview</a></li>
<li>
<span class="show-for-sr">Current: </span> Font icons
</li>
@@ -154,9 +154,9 @@
<div class="tabs-panel is-active" id="panel1">
<p>To use these on a website, include the fonts.css stylesheet listed below, and use the HTML code examples listed in the gallery further down the page.</p>
<ul>
- <li>You can load the default CSS by linking to the v1.2 release at <a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css">www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/fonts.css</a></li>
+ <li>You can load the default CSS by linking to the v1.2 release at <a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/fonts.css">ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/fonts.css</a></li>
<ul>
- <li>Releases are homed at <a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts">www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/</a></li>
+ <li>Releases are homed at <a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts">ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/</a></li>
<li>NPM users can get the code from <a href="https://www.npmjs.com/package/EBI-Icon-fonts">npmjs.com/package/EBI-Icon-fonts</a></li>
<li>React users that are working with the EBI Species icons should check out <a href="https://www.npmjs.com/package/react-ebi-species">react-ebi-species</a></li>
</ul>
@@ -165,19 +165,19 @@
<p>The browser's CSS parser will read the data-icon parameter and use the icon pictogram corresponding to "4":</p>
<p><strong><i class="icon icon-generic" data-icon="4"></i> This is an example icon</strong></p>
</li>
- <li>The EBI Visual framework no longer adds automatic padding to icons (in most scenarios), if you want to add padding, use the <a href="https://ebiwd.github.io/EBI-Pattern-library/patterns/helper-classes/">helper classes</a> or add <code>.icon-spacer</code> to the <code>.icon</code>'s element.</li>
+ <li>The EBI Visual framework no longer adds automatic padding to icons (in most scenarios), if you want to add padding, use the <a href="https://www.ebi.ac.uk/style-lab/websites/patterns/formatting.html/">helper classes</a> or add <code>.icon-spacer</code> to the <code>.icon</code>'s element.</li>
</ul>
</div>
<div class="tabs-panel" id="panel2">
<p>If your computer does not already have these fonts installed, use the links to download TTF files. <a href="https://www.google.co.uk/search?q=how+do+i+install+ttf+fonts">Need help installing?</a></p>
<p>Note: You can preview the icons below.</p>
<ul>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-Conceptual/fonts/EBI-Conceptual.ttf">The Conceptual font</a>: icons for things like "DNA", "Chemical biology' and "Ontologies"</li>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-Functional/fonts/EBI-Functional.ttf">The Functional font</a>: icons for "compare", "align", "approve", "download" and so forth.</li>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-Generic/fonts/EBI-Generic.ttf">The Generic font</a>: icons for things like "info", "New", "link" and "location".</li>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-SocialMedia/fonts/EBI-SocialMedia.ttf">Social Media</a>: handily enough, the Social Media font has icons for... social media!</li>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-Species/fonts/EBI-Species.ttf">Species</a>: where you can find an icon for yeast.</li>
- <li><a href="https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.2/EBI-Chemistry/fonts/EBI-Chemistry.ttf">Chemistry</a>: you guessed it.</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-Conceptual/fonts/EBI-Conceptual.ttf">The Conceptual font</a>: icons for things like "DNA", "Chemical biology' and "Ontologies"</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-Functional/fonts/EBI-Functional.ttf">The Functional font</a>: icons for "compare", "align", "approve", "download" and so forth.</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-Generic/fonts/EBI-Generic.ttf">The Generic font</a>: icons for things like "info", "New", "link" and "location".</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-SocialMedia/fonts/EBI-SocialMedia.ttf">Social Media</a>: handily enough, the Social Media font has icons for... social media!</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-Species/fonts/EBI-Species.ttf">Species</a>: where you can find an icon for yeast.</li>
+ <li><a href="https://ebi.emblstatic.net/web_guidelines//EBI-Icon-fonts/v1.2/EBI-Chemistry/fonts/EBI-Chemistry.ttf">Chemistry</a>: you guessed it.</li>
</ul>
</div>
<div class="tabs-panel" id="panel3">
@@ -196,7 +196,7 @@
<p><a href="https://github.com/ebiwd/EBI-Icon-fonts/issues" class="button readmore">Head to the issue queue</a></p>
<h3><i class="icon icon-generic" data-icon="}"></i> Just a bit of guidance?</h3>
- <p>For more information on using fonts with the EMBL-EBI Visual Framework and making the most of the framework, <a class="readmore" href="https://ebiwd.github.io/EBI-Pattern-library/">view the EBI Pattern Library</a></p>
+ <p>For more information on using fonts with the EMBL-EBI Visual Framework and making the most of the framework, <a class="readmore" href="https://ebi.ac.uk/style-lab/">view the EBI Style Lab</a></p>
<h3><i class="icon icon-generic" data-icon="&"></i> Looking for "Corporate" fonts?</h3>
<p>If you are making official EMBL-EBI documents, including slides and posters, it's best if you use Helvetica Neue Pro in your headings.</p>
@@ -206,7 +206,7 @@
<section id="icons" class="" data-magellan-target="icons">
<!-- Include live filtering -->
- <script defer src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/libraries/LiveFilter/js/jquery.liveFilter.js"></script>
+ <script defer src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/libraries/LiveFilter/js/jquery.liveFilter.js"></script>
<script type="text/javascript">
window.onload = function() {
$(document).ready(function() {
@@ -251,28 +251,17 @@
include "EBI-Species.html"
include "EBI-SocialMedia.html"
-
-
</div>
</div>
</section>
-
-
</div>
-
-
-
</div>
-
-
-
</section>
<!-- End suggested layout containers -->
</div>
-
<footer>
<!-- Optional local footer (insert citation / project-specific copyright / etc here -->
<!-- <div id="local-footer">
@@ -295,14 +284,18 @@
<!-- JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
- <script defer="defer" src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/js/cookiebanner.js"></script>
- <script defer="defer" src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/js/foot.js"></script>
- <script defer="defer" src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/js/script.js"></script>
+ <script defer="defer" src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/js/cookiebanner.js"></script>
+ <script defer="defer" src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/js/foot.js"></script>
+ <script defer="defer" src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/js/script.js"></script>
<!-- The Foundation theme JavaScript -->
- <script src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/libraries/foundation-6/js/foundation.js"></script>
- <script src="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.1/js/foundationExtendEBI.js"></script>
+ <script src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/libraries/foundation-6/js/foundation.js"></script>
+ <script src="https://ebi.emblstatic.net/web_guidelines//EBI-Framework/v1.1/js/foundationExtendEBI.js"></script>
<script type="text/JavaScript">$(document).foundation();</script>
<script type="text/JavaScript">$(document).foundationExtendEBI();</script>
+
+ <!-- Google Analytics details... -->
+ <!-- Change UA-XXXXX-X to be your site's ID -->
+ <script type="text/javascript">!function(e,a,n,t,i,o,c){e.GoogleAnalyticsObject=i,e[i]=e[i]||function(){(e[i].q=e[i].q||[]).push(arguments)},e[i].l=1*new Date,o=a.createElement(n),c=a.getElementsByTagName(n)[0],o.async=1,o.src="//www.google-analytics.com/analytics.js",c.parentNode.insertBefore(o,c)}(window,document,"script",0,"ga"),ga("create","UA-629242-1",{cookieDomain:"auto"}),ga("require","linkid","linkid.js"),ga("set","anonymizeIp",!0),ga("send","pageview");</script>
</body>
</html>
--
GitLab