diff --git a/README.md b/README.md index 2f4eaa4ad6926ca4c0844c43bbb4fc85930baedd..9e3125f2ce61f17707ca401df26e3772cf48beeb 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ The current idea is to develop a framework drawing heavily off print styles and In all, an evolutionary step of the current EMBL-EBI web compliance kit, this project aims to continue the efforts of the existing guidance by providing: -- Modularisation of framework components that will: - - require fewer roll-your-own solutions - - be more robust out of the box - - standardise of tooling +- Modularization of framework components that will: + - Require fewer roll-your-own solutions + - Be more robust out of the box + - Standardization of tooling - Update visual assets to make use of contemporary web browser features for: - More consistency with print visual language - Enhanced mobile support @@ -15,4 +15,7 @@ In all, an evolutionary step of the current EMBL-EBI web compliance kit, this pr - A versioning system for the framework to help track changes, features, and usage - A more collaborative code base (such as hosting on GitHub) to offer a better path for code collaboration and integration -View the /html/demo/index.html for more information and living style guide. +View /html/demo/index.html for more information and living style guide. + +## Roadmap +v1.5: Add animation guidance and tooling diff --git a/html/demo/index.html b/html/index.html similarity index 96% rename from html/demo/index.html rename to html/index.html index cdd02a7050d1ce8e5dc0ee398a8dff03e72067d3..58f33743ad9beb68d361a7fc088987267287ae24 100755 --- a/html/demo/index.html +++ b/html/index.html @@ -15,28 +15,28 @@ <link rel="dns-prefetch" href="//embl.de" /> <!-- Place any custom favicon.ico and apple-touch-icon.png in the root directory: mathiasbynens.be/notes/touch-icons --> - <link rel="icon" type="image/x-icon" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/favicon.ico" /> - <link rel="icon" type="image/png" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/favicon-32x32.png" /> - <link rel="icon" type="image/png" sizes="192×192" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) --> - <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-114x114.png"> <!-- For iPhone 4 Retina display (114px) --> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-72x72.png"> <!-- For iPad (72px) --> - <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-144x144.png"> <!-- For iPad retinat (144px) --> - <link rel="apple-touch-icon-precomposed" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-57x57.png"> <!-- For iPhone (57px) --> - <link rel="mask-icon" href="../../move-to-cdn/images/logos/EMBL-EBI/favicons/safari-pinned-tab.svg" color="#ffffff"> <!-- Safari icon for pinned tab --> + <link rel="icon" type="image/x-icon" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/favicon.ico" /> + <link rel="icon" type="image/png" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/favicon-32x32.png" /> + <link rel="icon" type="image/png" sizes="192×192" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) --> + <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-114x114.png"> <!-- For iPhone 4 Retina display (114px) --> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-72x72.png"> <!-- For iPad (72px) --> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-144x144.png"> <!-- For iPad retinat (144px) --> + <link rel="apple-touch-icon-precomposed" href="../move-to-cdn/images/logos/EMBL-EBI/favicons/apple-icon-57x57.png"> <!-- For iPhone (57px) --> + <link rel="mask-icon" href="../move-to-cdn/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="../../move-to-cdn/images/logos/EMBL-EBI/favicons/mstile-144x144.png"> + <meta name="msapplication-TileImage" content="../move-to-cdn/images/logos/EMBL-EBI/favicons/mstile-144x144.png"> <!-- CSS: implied media=all --> <!-- CSS concatenated and minified via ant build script--> - <link rel="stylesheet" href="../../move-to-cdn/css/ebi-global.css" type="text/css" media="all"> - <link rel="stylesheet" href="../../move-to-cdn/fonts/fonts.css" type="text/css" media="all"> + <link rel="stylesheet" href="../move-to-cdn/css/ebi-global.css" type="text/css" media="all"> + <link rel="stylesheet" href="../move-to-cdn/fonts/fonts.css" type="text/css" media="all"> <!-- <link rel="stylesheet" href="http://www.ebi.ac.uk/web_guidelines/css/compliance/develop/984-24-col-fluid.css" type="text/css" media="screen"> --> - <link rel="stylesheet" href="../../move-to-cdn/libraries/foundation-6/css/foundation.css" type="text/css" media="all"> + <link rel="stylesheet" href="../move-to-cdn/libraries/foundation-6/css/foundation.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 --> <!-- 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/embl-petrol-colours.css" type="text/css" media="all"> <!-- for production the above can be replaced with --> <!-- @@ -47,7 +47,7 @@ <!-- All JavaScript at the bottom, except for Modernizr --> - <script src="../../move-to-cdn/libraries/modernizr/modernizr.custom.49274.js"></script> + <script src="../move-to-cdn/libraries/modernizr/modernizr.custom.49274.js"></script> </head> @@ -1017,7 +1017,7 @@ Base font size for body text is 13px with a line height of 20px. Across the site <script>window.jQuery || document.write('<script src="../js/libs/jquery-1.10.2.min.js"><\/script>')</script> --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> - <script src="../../move-to-cdn/libraries/foundation-6/js/foundation.js"></script> + <script src="../move-to-cdn/libraries/foundation-6/js/foundation.js"></script> <script type="text/JavaScript">$(document).foundation();</script> <!-- --> @@ -1027,8 +1027,8 @@ Base font size for body text is 13px with a line height of 20px. Across the site <script defer="defer" src="//www.ebi.ac.uk/web_guidelines/js/plugins.js"></script> <script defer="defer" src="//www.ebi.ac.uk/web_guidelines/js/script.js"></script> --> - <script defer="defer" src="../../move-to-cdn/js/cookiebanner.js"></script> - <script defer="defer" src="../../move-to-cdn/js/foot.js"></script> + <script defer="defer" src="../move-to-cdn/js/cookiebanner.js"></script> + <script defer="defer" src="../move-to-cdn/js/foot.js"></script> <!-- Google Analytics details... --> <!-- Change UA-XXXXX-X to be your site's ID --> diff --git a/images/logos/dummy/dummy_logo_32.png b/images/logos/dummy/dummy_logo_32.png deleted file mode 100644 index 834b2620289bb2c52ac23dbbfc14b7727b9a0023..0000000000000000000000000000000000000000 Binary files a/images/logos/dummy/dummy_logo_32.png and /dev/null differ diff --git a/images/logos/dummy/dummy_logo_48.png b/images/logos/dummy/dummy_logo_48.png deleted file mode 100644 index c620f9d87c3f3b2b1f7e820070ff3dd28e75edcb..0000000000000000000000000000000000000000 Binary files a/images/logos/dummy/dummy_logo_48.png and /dev/null differ