Commit 13c0190c authored by Ken Hawkins's avatar Ken Hawkins
Browse files

tightened up navigation and quick links

parent 0f9b9fbb
Pipeline #177501 passed with stages
in 1 minute and 54 seconds
......@@ -94,24 +94,26 @@ templateEngineOverride: njk
<nav class="vf-navigation vf-navigation--main | vf-cluster">
<ul class="vf-navigation__list | vf-list | vf-cluster__inner">
<li class="vf-navigation__item">
<span class="vf-badge vf-badge--secondary">Popular destinations</span>
<span class="vf-list__item">Quick links</span>
</li>
<li class="vf-navigation__item">
<a href="JavaScript:Void(0);" class="vf-navigation__link">Careers</a>
<a href="JavaScript:Void(0);" class="vf-list__link">News</a>
</li>
<li class="vf-navigation__item">
<a href="JavaScript:Void(0);" class="vf-navigation__link">People</a>
<a href="JavaScript:Void(0);" class="vf-list__link">Our impact</a>
</li>
<li class="vf-navigation__item">
<a href="JavaScript:Void(0);" class="vf-navigation__link">News</a>
<a href="JavaScript:Void(0);" class="vf-list__link">Careers</a>
</li>
<li class="vf-navigation__item">
<a href="JavaScript:Void(0);" class="vf-navigation__link">Contact us</a>
<a href="JavaScript:Void(0);" class="vf-list__link">People</a>
</li>
<li class="vf-navigation__item">
<a href="JavaScript:Void(0);" class="vf-list__link">Contact us</a>
</li>
</ul>
</nav>
<br/>
<main id="main-content-area" role="main">
{# intro text #}
......@@ -134,77 +136,60 @@ templateEngineOverride: njk
</div>
</section>
<style>
.vf-links__list--easy .vf-list__link { display: inline-block; margin-left: 1rem;}
.vf-sticky {
position: sticky;
top: 0;
background: white;
z-index: 1001;
box-shadow: 0 0 2px 1px rgba(0, 0, 0, .2);
}
</style>
<br/>
<div class="vf-links vf-links__list--easy vf-grid vf-sticky vf-u-fullbleed vf-u-padding__top--400 vf-u-padding__bottom--400">
<ul class="vf-list vf-list--inline">
<li class="vf-navigation__item">
<span class="vf-list__item">On this page</span>
</li>
<li class="vf-list__item">
<a class="vf-list__link active" href="JavaScript:Void(0);">
News
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Similar sections
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Our impact
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Organisation
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Missions
</a>
</li>
</ul>
</div>
<br/>
<hr class="vf-divider">
<br/>
<div class="vf-section-header"><a class="vf-section-header__heading vf-section-header__heading--is-link" href="news">News from EMBL-EBI <svg aria-hidden="true" class="vf-section-header__icon | vf-icon vf-icon-arrow--inline-end" width="1em" height="1em" xmlns="http://www.w3.org/2000/svg"><path d="M0 12c0 6.627 5.373 12 12 12s12-5.373 12-12S18.627 0 12 0C5.376.008.008 5.376 0 12zm13.707-5.209l4.5 4.5a1 1 0 010 1.414l-4.5 4.5a1 1 0 01-1.414-1.414l2.366-2.367a.25.25 0 00-.177-.424H6a1 1 0 010-2h8.482a.25.25 0 00.177-.427l-2.366-2.368a1 1 0 011.414-1.414z" fill="" fill-rule="nonzero"></path></svg></a></div>
<section class="embl-grid ">
{% render '@vf-section-header', {
"section_title": "Our impact",
"href": "",
"id": "impact",
"section__subheading": "",
"vf_section__content": [
"We collaborate with scientists and engineers all over the world, and provide the infrastructure needed to share data openly in the life sciences."
]
} %}
<div class="">
<section class="vf-grid vf-grid__col-3">
{% render '@vf-card', {
"card_heading": "Resources for all",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'EMBL-EBI is enabling scientific discovery, training the next generation of scientists and building long-lasting collaborations.',
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": "COVID-19 response",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'While the physical EMBL-EBI site is closed, staff continue to work from home to tackle COVID-19.',
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": "News",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Updates and announcements from EMBL-EBI.',
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": "Digital bookshelf",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Want to learn more about EMBL-EBI? Download our latest publications and annual reports.',
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": "Public engagement",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Everyone should have the chance to find out more about bioinformatics. Discover how technology and data science accelerate research.',
"card_image__alt": ""
} %}
</section>
</div>
</section>
<br/>
<section class="vf-news-container vf-news-container--featured | vf-grid vf-grid__col-4 | barcelona-news" id="news">
<link rel="import" href="https://www.embl.org/api/v1/pattern.html?pattern=vf-news-item-default&filter-content-type=article&filter-field-value[field_display_publication]=EMBL%20News&sort-field-value[created]=DESC&filter-field-contains[field_embl_taxonomy_terms.entity.title]=EMBL-EBI&limit=4&source=contenthub" data-target="barcelona-news" data-embl-js-content-hub-loader>
</section>
<style>
......@@ -232,7 +217,7 @@ templateEngineOverride: njk
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": " People and groups",
"card_heading": "People and groups",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
......@@ -290,6 +275,78 @@ templateEngineOverride: njk
<br>
<section class="embl-grid ">
{% render '@vf-section-header', {
"section_title": "Our impact",
"href": "our-impact",
"id": "impact",
"section__subheading": "",
"vf_section__content": [
"We collaborate with scientists and engineers all over the world, and provide the infrastructure needed to share data openly in the life sciences."
]
} %}
<div class="">
<section class="vf-grid vf-grid__col-3">
{# {% render '@vf-card', {
"card_heading": "Resources for all",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'EMBL-EBI is enabling scientific discovery, training the next generation of scientists and building long-lasting collaborations.',
"card_image__alt": ""
} %} #}
{% render '@vf-card', {
"card_heading": "COVID-19 response",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'While the physical EMBL-EBI site is closed, staff continue to work from home to tackle COVID-19.',
"card_image__alt": ""
} %}
{# {% render '@vf-card', {
"card_heading": "News",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Updates and announcements from EMBL-EBI.',
"card_image__alt": ""
} %} #}
{% render '@vf-card', {
"card_heading": "Digital bookshelf",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Want to learn more about EMBL-EBI? Download our latest publications and annual reports.',
"card_image__alt": ""
} %}
{% render '@vf-card', {
"card_heading": "Public engagement",
"card_subheading": "",
"variant": "bordered",
"newTheme": "primary",
"card_href": "#",
"card_image": "",
"card_text": 'Everyone should have the chance to find out more about bioinformatics. Discover how technology and data science accelerate research.',
"card_image__alt": ""
} %}
</section>
</div>
</section>
<hr class="vf-divider">
<br>
<section class="embl-grid ">
{% render '@vf-section-header', {
"section_title": "Our organisation",
......@@ -356,6 +413,8 @@ templateEngineOverride: njk
</div>
</section>
<hr class="vf-divider">
<br>
<section class="embl-grid ">
{% render '@vf-section-header', {
......
......@@ -109,19 +109,24 @@ templateEngineOverride: njk
<section class="vf-grid vf-grid__col-3">
<div class="vf-grid__col--span-2 vf-content">
<br/>
<br/>
<h1>Leadership of EMBL-EBI</h1>
<br/>
</div>
</section>
<section class="vf-grid vf-grid__col-3">
<div class="vf-grid__col--span-2 vf-content">
<p>EMBL-EBI is led by joint Directors Rolf Apweiler and Ewan Birney. They are supported by two Associate Directors of Services, Paul Flicek and Johanna McEntyre, the Head of Research, John Marioni, and the Head of Administration and Operations, Rachel Curran.</p>
<div class="vf-grid__col--span-3 vf-content">
<div class="vf-grid vf-grid__col-3 vf-u-padding__bottom--400 vf-u-padding__top--400">
<div class="vf-grid__col--span-2">
<p class="vf-lede">EMBL-EBI is led by joint Directors Rolf Apweiler and Ewan Birney. </p>
<p><br/>They are supported by two Associate Directors of Services, Paul Flicek and Johanna McEntyre, the Head of Research, John Marioni, and the Head of Administration and Operations, Rachel Curran.</p>
</div>
</div>
<div class="vf-grid vf-grid__col-2 vf-u-padding__bottom--400 vf-u-padding__top--400">
<div class="vf-grid vf-grid__col-3 vf-u-padding__bottom--400 vf-u-padding__top--400">
<article>
<link rel="import" href="https://www.embl.org/api/v1/pattern.html?filter-content-type=person&amp;filter-field-contains[field_person_full_name]=Rolf Apweiler&amp;pattern=vf-profile-inline&hide[email,phones,mobile,team,orcid]=1&amp;source=contenthub" data-target="self" data-embl-js-content-hub-loader="">
......@@ -149,13 +154,13 @@ templateEngineOverride: njk
<link rel="import" href="https://www.embl.org/api/v1/pattern.html?filter-content-type=person&amp;filter-field-contains[field_person_embl_id]=CP-60027323&amp;pattern=vf-profile-inline&amp;source=contenthub" data-target="self" data-embl-js-content-hub-loader=""> #}
</div>
<div>
{# <div>
{% render '@vf-figure', {
"text": "EMBL-EBI's Directors: Dr Ewan Birney (left) and Dr Rolf Apweiler (right)",
"alttext": "Ewan Birney and Rolf Apweiler in 2016",
"imageUrl": "//www.ebi.ac.uk/sites/ebi.ac.uk/files/groups/external_relations/images/People/BIRNEY_APWEILER_DiNA_2016.jpg"
} %}
<div>
<div> #}
</section>
<br/>
......@@ -175,34 +180,34 @@ templateEngineOverride: njk
<div class="vf-links vf-links__list--easy vf-grid vf-sticky vf-u-fullbleed vf-u-padding__top--400 vf-u-padding__bottom--400">
<ul class="vf-list vf-list--inline">
<li class="vf-list__item">
{# <li class="vf-list__item">
<span class="vf-badge vf-badge--secondary">
Also on this page
</span>
</li>
</li> #}
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
EMBL Governance {{ svg | safe }}
EMBL Governance
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Group and team leaders {{ svg | safe }}
Group and team leaders
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Scientific Advisory Committee {{ svg | safe }}
Scientific Advisory Committee
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Service advisory boards {{ svg | safe }}
Service advisory boards
</a>
</li>
<li class="vf-list__item">
<a class="vf-list__link" href="JavaScript:Void(0);">
Contact person {{ svg | safe }}
Contact person
</a>
</li>
</ul>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment