diff --git a/README.md b/README.md index 6222cb64bd3ca2c3dac3ae301b29e2ab7bc0fb28..07ae775bb6a0e7b2b7eb210d5db1ca303c5eddb9 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ v1.3 is in beta and is targeted for a January 2018 release. Homed here are the v To view plans for v1.3 (and to join the discussion), [see issue 103](https://github.com/ebiwd/EBI-Framework/issues/103). Code is available for usage at: -- http://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/ -- http://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/js -- http://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3 +- http://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/ +- http://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/js +- http://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3 Guidance on using is available at: - https://www.ebi.ac.uk/style-lab/ @@ -48,7 +48,7 @@ See a [full overview of changes in v1.3 here](https://github.com/ebiwd/EBI-Frame - For web guidelines, [check out the Style Labe](https://www.ebi.ac.uk/style-lab/websites/sample-site/) for guidance on making your site look proper and correct. 1. Building directly from the CSS and JS: - If you'd like to look into making direct use of the CSS and JS, see the programatically built documentation (this is an ongoing effort): - - [CSS](http://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/styleguide/section-components.html) + - [CSS](https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/styleguide/section-components.html) - [JS](https://github.com/ebiwd/EBI-Framework/blob/v1.3/js/documenation.md#table-of-contents) 1. Help! - Check out the [issue queue](https://github.com/ebiwd/EBI-Framework/issues) or contact [Ken Hawkins](https://www.ebi.ac.uk/about/people/ken-hawkins) in the Web Development team. @@ -126,11 +126,11 @@ There are no officially supported variants. An Angular-specific variant is being ### Deployment Files are hosted in this pattern: ``` -//www.ebi.ac.uk/web_guidelines/[repo-name]/[branch]/[repo-files] +https://ebi.emblstatic.net/web_guidelines/[repo-name]/[branch]/[repo-files] ``` That is: ``` -//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/js/script.js +https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/js/script.js ``` #### Building from NPM diff --git a/_includes/footer.html b/_includes/footer.html index 282053e47c89f08d446dc68d7c8035d52e3ee307..569c8bd245166af2b3335cf294f6166ddd2a5362 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -17,14 +17,14 @@ --> <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="//ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/js/script.js"></script> --> <script defer="defer" src="{{ site.baseurl }}/js/script.js"></script> <!-- The Foundation theme JavaScript --> <script src="{{ site.baseurl }}/libraries/foundation-6/js/foundation.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 src="//ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/js/foundation.js"></script> --> +<!-- <script src="//ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/js/foundationExtendEBI.js"></script> --> <script type="text/JavaScript">$(document).foundation();</script> <script type="text/JavaScript">$(document).foundationExtendEBI();</script> diff --git a/_includes/head.html b/_includes/head.html index c0e82b42f163cf4dade46a705880a98833077479..3986d9a46e8781b017df1c93c2819e6d27e4f72c 100755 --- a/_includes/head.html +++ b/_includes/head.html @@ -28,22 +28,22 @@ <!-- 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.2/images/logos/EMBL-EBI/favicons/favicon.ico" /> - <link rel="icon" type="image/png" href="https://www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/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.2/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.2/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.2/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.2/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.2/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.2/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.2/images/logos/EMBL-EBI/favicons/favicon.ico" /> + <link rel="icon" type="image/png" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/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.2/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.2/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.2/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.2/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.2/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.2/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.2/images/logos/EMBL-EBI/favicons/mstile-144x144.png"> + <meta name="msapplication-TileImage" content="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/mstile-144x144.png"> <!-- CSS: implied media=all --> <!-- CSS concatenated and minified via ant build script--> <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="none" onload="if(media!=='all')media='all'"> + <!-- <link rel="stylesheet" href="//ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css" type="text/css" media="all"> --> + <link rel="stylesheet" href="//ebi.emblstatic.net/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 --> <!-- @@ -62,7 +62,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="none" onload="if(media!=='all')media='all'"> + <link rel="stylesheet" href="//ebi.emblstatic.net/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 --> <!-- diff --git a/css/styleguide/index.html b/css/styleguide/index.html index 51ac45199895b35b551f4af60bb66d3bfdd856fd..2ec5ec65920d3e37d15f75cc8230e3a958c092f7 100644 --- a/css/styleguide/index.html +++ b/css/styleguide/index.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width"> <link rel="stylesheet" href="kss-assets/kss.css"> - <link rel="stylesheet" href="https://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> + <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> </head> <body id="kss-node" > diff --git a/css/styleguide/item-components-button.html b/css/styleguide/item-components-button.html index 5e5e75e926f74bc4db10bb415cedea6caaa42380..7f21c251832797457eacf7bfc5e0cab31e6d2718 100644 --- a/css/styleguide/item-components-button.html +++ b/css/styleguide/item-components-button.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width"> <link rel="stylesheet" href="kss-assets/kss.css"> - <link rel="stylesheet" href="https://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> + <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> </head> <body id="kss-node" class="kss-fullscreen-mode"> diff --git a/css/styleguide/item-components.html b/css/styleguide/item-components.html index 1b0e5b085235b3ff9b0200ae65283fd679c46bb6..3be6483cd748b1cb351dc3b4248b174347205d26 100644 --- a/css/styleguide/item-components.html +++ b/css/styleguide/item-components.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width"> <link rel="stylesheet" href="kss-assets/kss.css"> - <link rel="stylesheet" href="https://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> + <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> </head> <body id="kss-node" class="kss-fullscreen-mode"> diff --git a/css/styleguide/section-components.html b/css/styleguide/section-components.html index 9699e7b095a6614f4b54beeccede6535d0453d3e..c0141bcca5b5c943784f06aa6ad015c4f8f734d8 100644 --- a/css/styleguide/section-components.html +++ b/css/styleguide/section-components.html @@ -9,7 +9,7 @@ <meta name="viewport" content="width=device-width"> <link rel="stylesheet" href="kss-assets/kss.css"> - <link rel="stylesheet" href="https://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> + <link rel="stylesheet" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"> </head> <body id="kss-node" > diff --git a/package.json b/package.json index 7e898d4b5edae229811370269214fd2b20f912e9..39868ac670c151ecf1be89c11319b71a80a79761 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "tablesorter": "wget https://github.com/Mottie/tablesorter/archive/master.zip -d ./libraries/tablesorter.zip && extract-zip ./libraries/tablesorter.zip ./libraries/ && del ./libraries/tablesorter && mve ./libraries/tablesorter-master ./libraries/tablesorter && del ./libraries/tablesorter.zip", "foundation-update": "npm install foundation-sites && echo \"Latest version of foundation downloaded, you'll need to run 'npm run scss' and 'npm run js' to build\"", "motion-ui-update": "wget https://github.com/zurb/motion-ui/archive/v1.2.2.zip -d ./libraries/motion-ui.zip && del ./libraries/motion-ui && extract-zip ./libraries/motion-ui.zip ./libraries/motion-ui/ && del ./libraries/motion-ui.zip && echo \"Copying Motion UI files one level up as they've moved...\" && ncp ./libraries/motion-ui/motion-ui-1.2.2/ ./libraries/motion-ui/ && del ./libraries/motion-ui/motion-ui-master/ && echo \"Latest version of Motion UI downloaded, you'll need to run 'npm run scss' to build\"", - "documentation": " ./node_modules/documentation/bin/documentation.js build ./js/** -f md -o js/documenation.md -g && echo \"Updated JS docs.\" && kss --source ./css --destination ./css/styleguide --css https://wwwdev.ebi.ac.uk/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css && echo \"Updated CSS docs.\"", + "documentation": " ./node_modules/documentation/bin/documentation.js build ./js/** -f md -o js/documenation.md -g && echo \"Updated JS docs.\" && kss --source ./css --destination ./css/styleguide --css https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css && echo \"Updated CSS docs.\"", "message_finished": "echo \"All done\"" }, "description": "Homed here are the various assets that make the EBI Visual Framework (CSS, JS, and a few images and build scripts).",