Skip to content

Commit

Permalink
Merge pull request #181 from ebiwd/update_v3_footer
Browse files Browse the repository at this point in the history
Added EMBL-EBI Licencing link under services - v1.3
  • Loading branch information
sandykadam authored Dec 8, 2021
2 parents a1ba52e + dd5d18f commit e955e68
Show file tree
Hide file tree
Showing 19 changed files with 4,732 additions and 1,969 deletions.
12 changes: 6 additions & 6 deletions css/styleguide/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta charset="utf-8"/>
<title>KSS Style Guide</title>

<meta name="description" content="">
<meta name="generator" content="kss-node">
<meta name="viewport" content="width=device-width">
<meta name="description" content=""/>
<meta name="generator" content="kss-node"/>
<meta name="viewport" content="width=device-width"/>

<link rel="stylesheet" href="kss-assets/kss.css">
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css">
<link rel="stylesheet" href="kss-assets/kss.css"/>
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"/>

</head>
<body id="kss-node" >
Expand Down
14 changes: 7 additions & 7 deletions css/styleguide/item-components-button.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta charset="utf-8"/>
<title>KSS Style Guide</title>

<meta name="description" content="">
<meta name="generator" content="kss-node">
<meta name="viewport" content="width=device-width">
<meta name="description" content=""/>
<meta name="generator" content="kss-node"/>
<meta name="viewport" content="width=device-width"/>

<link rel="stylesheet" href="kss-assets/kss.css">
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css">
<link rel="stylesheet" href="kss-assets/kss.css"/>
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"/>

</head>
<body id="kss-node" class="kss-fullscreen-mode">
Expand Down Expand Up @@ -128,7 +128,7 @@ <h2 class="kss-title kss-title--level-2">
</details>

<div class="kss-source kss-style">
Source: <code>ebi-css-build/_ebi_base_styles.scss</code>, line 202
Source: <code>css/ebi-css-build/_ebi_base_styles.scss</code>, line 202
</div>

</div>
Expand Down
12 changes: 6 additions & 6 deletions css/styleguide/item-components.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta charset="utf-8"/>
<title>KSS Style Guide</title>

<meta name="description" content="">
<meta name="generator" content="kss-node">
<meta name="viewport" content="width=device-width">
<meta name="description" content=""/>
<meta name="generator" content="kss-node"/>
<meta name="viewport" content="width=device-width"/>

<link rel="stylesheet" href="kss-assets/kss.css">
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css">
<link rel="stylesheet" href="kss-assets/kss.css"/>
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"/>

</head>
<body id="kss-node" class="kss-fullscreen-mode">
Expand Down
14 changes: 7 additions & 7 deletions css/styleguide/section-components.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<meta charset="utf-8"/>
<title>KSS Style Guide</title>

<meta name="description" content="">
<meta name="generator" content="kss-node">
<meta name="viewport" content="width=device-width">
<meta name="description" content=""/>
<meta name="generator" content="kss-node"/>
<meta name="viewport" content="width=device-width"/>

<link rel="stylesheet" href="kss-assets/kss.css">
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css">
<link rel="stylesheet" href="kss-assets/kss.css"/>
<link rel="stylesheet" href="https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css"/>

</head>
<body id="kss-node" >
Expand Down Expand Up @@ -179,7 +179,7 @@ <h2 class="kss-title kss-title--level-2">
</details>

<div class="kss-source kss-style">
Source: <code>ebi-css-build/_ebi_base_styles.scss</code>, line 202
Source: <code>css/ebi-css-build/_ebi_base_styles.scss</code>, line 202
</div>

</section>
Expand Down
164 changes: 83 additions & 81 deletions js/documenation.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/ebi-global-includes/script/4_ebiFrameworkContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function ebiFrameworkUpdateFoot() {
'</div>' +
'<div class="medium-up-5 small-up-2">' +
'<div class="column">' +
'<h5 class="services"><a class="services-color" href="https://www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="https://www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/support">Help &amp; Support</a></li> ' + '</ul></div>' +
'<h5 class="services"><a class="services-color" href="https://www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="https://www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/support">Help &amp; Support</a></li> ' + ' <li class="first"><a href="https://www.ebi.ac.uk/licencing">Licencing</a></li> ' + '</ul></div>' +
'<div class="column">' +
'<h5 class="research"><a class="research-color" href="https://www.ebi.ac.uk/research">Research</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/research/publications">Publications</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/research/groups">Research groups</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/research/postdocs">Postdocs</a> &amp; <a href="https://www.ebi.ac.uk/research/eipp">PhDs</a></li> ' +
'</ul></div>' +
Expand Down
2 changes: 1 addition & 1 deletion js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ function ebiFrameworkInsertEMBLdropdown() {
* Insert EBI Footer into `#global-nav-expanded`
*/
function ebiFrameworkUpdateFoot() {
var html = '<div class="columns small-12">' + '<h4 class="inline-block"><a href="https://www.ebi.ac.uk" class="no-underline" title="EMBL-EBI">EMBL-EBI</a></h4>' + '<span class="small inline-block padding-left-large"><a class="readmore" href="http://intranet.ebi.ac.uk"><span class="icon icon-functional" data-icon="L"></span> Intranet for staff</a></span>' + '</div>' + '<div class="medium-up-5 small-up-2">' + '<div class="column">' + '<h5 class="services"><a class="services-color" href="https://www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="https://www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/support">Help &amp; Support</a></li> ' + '</ul></div>' + '<div class="column">' + '<h5 class="research"><a class="research-color" href="https://www.ebi.ac.uk/research">Research</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/research/publications">Publications</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/research/groups">Research groups</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/research/postdocs">Postdocs</a> &amp; <a href="https://www.ebi.ac.uk/research/eipp">PhDs</a></li> ' + '</ul></div>' + '<div class="column"> ' + '<h5 class="training"><a class="training-color" href="https://www.ebi.ac.uk/training">Training</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/training/live-events">Live training</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/on-demand">On-demand training</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/trainer-support">Support for trainers</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/contact-us">Contact organisers</a></li> ' + '</ul></div> ' + '<div class="column"> ' + '<h5 class="industry"><a class="industry-color" href="https://www.ebi.ac.uk/industry">Industry</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/industry/private">Members Area</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/workshops">Workshops</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/sme-forum"><abbr title="Small Medium Enterprise">SME</abbr> Forum</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/industry/contact">Contact Industry programme</a></li> ' + '</ul></div> ' + '<div class="column"> ' + '<h5 class="about"><a class="ebi-color" href="https://www.ebi.ac.uk/about">About</a></h5><ul> ' + ' <li><a href="https://www.ebi.ac.uk/about/contact">Contact us</a>' + '<li><a href="https://www.ebi.ac.uk/about/events">Events</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/jobs" title="Jobs, postdocs, PhDs...">Jobs</a></li> ' + ' <li class="first"><a href="https://www.ebi.ac.uk/about/news">News</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/people">People &amp; groups</a></li> ' + '</ul></div>' + '</div>';
var html = '<div class="columns small-12">' + '<h4 class="inline-block"><a href="https://www.ebi.ac.uk" class="no-underline" title="EMBL-EBI">EMBL-EBI</a></h4>' + '<span class="small inline-block padding-left-large"><a class="readmore" href="http://intranet.ebi.ac.uk"><span class="icon icon-functional" data-icon="L"></span> Intranet for staff</a></span>' + '</div>' + '<div class="medium-up-5 small-up-2">' + '<div class="column">' + '<h5 class="services"><a class="services-color" href="https://www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="https://www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/support">Help &amp; Support</a></li> ' + ' <li class="first"><a href="https://www.ebi.ac.uk/licencing">Licencing</a></li> ' + '</ul></div>' + '<div class="column">' + '<h5 class="research"><a class="research-color" href="https://www.ebi.ac.uk/research">Research</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/research/publications">Publications</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/research/groups">Research groups</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/research/postdocs">Postdocs</a> &amp; <a href="https://www.ebi.ac.uk/research/eipp">PhDs</a></li> ' + '</ul></div>' + '<div class="column"> ' + '<h5 class="training"><a class="training-color" href="https://www.ebi.ac.uk/training">Training</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/training/live-events">Live training</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/on-demand">On-demand training</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/trainer-support">Support for trainers</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/contact-us">Contact organisers</a></li> ' + '</ul></div> ' + '<div class="column"> ' + '<h5 class="industry"><a class="industry-color" href="https://www.ebi.ac.uk/industry">Industry</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/industry/private">Members Area</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/workshops">Workshops</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/sme-forum"><abbr title="Small Medium Enterprise">SME</abbr> Forum</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/industry/contact">Contact Industry programme</a></li> ' + '</ul></div> ' + '<div class="column"> ' + '<h5 class="about"><a class="ebi-color" href="https://www.ebi.ac.uk/about">About</a></h5><ul> ' + ' <li><a href="https://www.ebi.ac.uk/about/contact">Contact us</a>' + '<li><a href="https://www.ebi.ac.uk/about/events">Events</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/jobs" title="Jobs, postdocs, PhDs...">Jobs</a></li> ' + ' <li class="first"><a href="https://www.ebi.ac.uk/about/news">News</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/people">People &amp; groups</a></li> ' + '</ul></div>' + '</div>';

function init() {
try {
Expand Down
2 changes: 1 addition & 1 deletion js/script.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit e955e68

Please sign in to comment.