From 59d6004cad1f3bd681c8671b72e413003a153bcc Mon Sep 17 00:00:00 2001
From: Ken Hawkins <khawkins98@gmail.com>
Date: Thu, 21 Jan 2016 10:25:23 +0000
Subject: [PATCH] Cleans up structure
---
README.md | 13 ++++++----
html/{demo => }/index.html | 34 +++++++++++++--------------
images/logos/dummy/dummy_logo_32.png | Bin 945 -> 0 bytes
images/logos/dummy/dummy_logo_48.png | Bin 1379 -> 0 bytes
4 files changed, 25 insertions(+), 22 deletions(-)
rename html/{demo => }/index.html (96%)
delete mode 100644 images/logos/dummy/dummy_logo_32.png
delete mode 100644 images/logos/dummy/dummy_logo_48.png
diff --git a/README.md b/README.md
index 2f4eaa4a..9e3125f2 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 cdd02a70..58f33743 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
GIT binary patch
literal 0
HcmV?d00001
literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H111?EKK~z|UwbxCEl~ouA@ZY(P(i9Qplr~T^lJ)`aDpU}Hs6|AO
z4Wv6aZX&3S5N^Vj?P}qoFS1oZ5w40LTNGq2GN`01Qzx5oq)bR{G<BX9@43#IJMW#>
zxn3VQa6bOebN=snpYuQGq=*11rMs{Mmm}i1YqXTo9k>spn82Zkn3xBQ2${qb0#oh2
zUJ9PTZ#h<HIf<=v@ckr!*NVyZ;8{F~O?bN)`vj@41h5`6ImVmq2|6&_3ldxVP2kJy
zKZ8|WFoQUqaT6G5EjqhuETz=Ky4*Y%5l8EA5iyO=b8{FYeIbB5u`Jgo8?Yyf`e?rh
zj288&2JBzggTVQszN{;%vZbY8zX+87d}Ran_R_B}1R~;ZoXO2q4e*hoeym?B03Wv}
zNGWZs1EiEz;L+UtCL$*LsRP3}n`7+5P>lwBU{)*EMMRdviro}e;3B@hiZ4DK5!*Vx
za13u?xk_k0#Ua&ic^qpnjU5s3I_41g%G?BLvY#SiQ)g#NX$Y@i1MbC5xPV`A06R;e
zx<cT3SV}2j2&W=qrVi7Xgej$4Q%bk=o7@$vNu~$z4))`e+0*MBzQfB{y+AS!VV7#T
z+evvIKj1wb2UY2~T$MnVveQAli<hty@8fVD+uddIF_qK?{=i$RBX}2n$^HN0#W@62
zzhZ9&oWXPI&+~+*@O%&3@J4*3V;i;ycN9zgLXSGIyNI!|3udKin+Nu_H$W>dOW+6w
zdL-~qjxpYV`>Y^3+`?*=O2L7MxKx|13s_3&Hr$+>M;hScMSXMtYm1I!HNlsv#H7>C
zMa0E+prXI&KJaHrpk<ahl}vWpld5}MXBjIngGK#91A+fazXAMMbc~p9KdYn_?#JdD
zOu4L!xets}vA?Xy%motYX|oBmrRZ;|zC7@KLyQlL827aDO?6LZv_7S@q2UYWS=Rae
zxw$r_RC_5&DGlPW+?>RCDW4}Yt8a1lVpbrJUGu}_5&WJ9&*D{V!9#dh^~~B^1lU|N
zLGMqq9N>n`@<ajdEMMRmEa|dJi+Y@Py$@t@S)&rFX_ZDCjfm5=4)gu5>UsV@RzSHs
T?s;#~00000NkvXXu0mjf02Z?O
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
GIT binary patch
literal 0
HcmV?d00001
literal 1379
zcmV-p1)TbcP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11mH<TK~!jg)tXCe6=f91e}~>`!BT4MZPh^O1M!IjS0qInHBn-W
zuyBDad?lK=5fX`t52VDz1q%~*1~oAnB_>31p$m<#2tE*kMT~-gg=%TVSh3YYsmH}P
z_jcxV?wxOXuY>-RFE{7=&f`0CzsEUeMpTvm5=3Mca9UN*c=3lF5RomwywLbFs`_zt
zrx-FWQU}}vECLn+mjZKvao{lUeb7Et)wg4nsA{nR-vJtGtHR^eY`~4cL1V96dlzW4
zdUDl%s!0%$8sJ6Xu2A<lunpJ?^a8Vi#XuL(9q=p%_KV0`RozmQ%=#Yy?l(4$1Ix<r
zuLI76_)h@~isM;25IosIV`Gtr+~Y>(&BEA>N|wVk@EFh>qIat5J`cGUaLcTKl_Js&
zWbVKnhJMLMNL2>`dkU?F3>^@WTHFyC#-0=^b{o1Avi%2Iff~~{ltSL}X6`_HOkX7q
z%oCB?EFEYw^suUq$1#?Gb)W`l&C-DpL)WF0kK-T7(t#s}t`m{jDdd|CJ*ujMXVU?I
zmK5@q_Yh>biB)w77&YA&rchydvvnZAw}xJkLUyI0zX39jg>EzYhk#lSxh^9&3^ZjP
z3#m&=J`8o`f%WBNMC3f6$8<lfswaTNd>}6(ZRw_2#DJ=vis^p{_=?Hp+an^Kz#3H@
z4l|0#Wx!TkZcxA>;JG4|u!JgUOUo>Y>r2==0&E9908Ye=Zv!rl=sFt?1h&ovHUMKD
zx{d)W;`G?0ei=|tb?}+0{+`4nA~S(Ym`v&y;*Q$`OeXbxsyY!XA9mpXh^+5{sw1%~
z5!7xvaPfDcH30)af6%^E)gPxbfl8N9xlPuNJHr0PZ`1Aq9sw@$ywqxeC#Y}}$0=?E
zHkVNR6Ye5<Bbe}SF+6KMZ`S=WvK1erOMqXDP(N@xP+wv)O~Bo_I498o;A&vP*mxOe
zjN!c;*k^cu0M41>0B)Vzn$7b-gXfYETyVBLf$x1|V?zReJ@Ao{Sr_NPJBI0VpNXew
zz^%rHZ!mYQkt+ss1%~dJ_15(-IPitBu{njT-7}k1C!^6Dh~hm}-9hzng`u~nkbTS0
zSHa{(w%82zrcmq!5y>+(OgWxH#ektBbs_7(;S`E}QSG`=2S83l<}kHpQ`P|yX~CU3
zr7)tZwv5tY=rL72S<a5ZprPwUq&WwiAH$raxDOW&mqHJ)(Hb=LSb`0UIR1ti!DRk0
z1Fb2Q`=HOzjX}ZJ7kNWZ07rAGsv^>hyWR_!pP=j}qLJ)s;JyTzxMi6Keol}pz!tWS
zsp{!MG`g3l18wCrsp=<TT11w5OyDT)sf8=lEll5mNL|R*>2C?b=&C_oA-CUjUz0+`
z5<^EEcoq0MG}sEPNi#uDY&G<~K0+eW%+$ixYd|Cxx)S({XuQ$xdCfmc^qSvTg0BI0
zo`-oWddX)QA2f`kz{5Z;!N8L~4g|ap7~YCrv)ZbJ1QT8l%nAKn2Z0^9H17cLEA9lD
ziwmKzBYLqtrK+1sEQcKM3a~2F?en4=;7?q>5&xn)<n;x>vw^os>0Y?)0`4S~aFltn
zH{&*<ukP4S4a$~PM5G<Jc{+gw!S8%rK6?^(H1^?A!PixFXGvx8`e)*@xoLmwk-9Dv
leCsevRqgFv6{P*#<{uitU=nhc<eC5g002ovPDHLkV1g)!ca{JE
--
GitLab