Commit 6594c9f1 authored by Jacek Lebioda's avatar Jacek Lebioda
Browse files

Merge branch 'improve-posts' into 'master'

Improve posts

See merge request !55
parents fcf5be16 cbc8c5d8
...@@ -15,7 +15,7 @@ layout: default ...@@ -15,7 +15,7 @@ layout: default
<div class="index-flex"> <div class="index-flex">
{% if page.introduction %} {% if page.introduction %}
<div class="index-gray-box"> <div class="index-box index-gray-box">
{{ page.introduction }} {{ page.introduction }}
</div> </div>
{% endif %} {% endif %}
...@@ -36,7 +36,7 @@ layout: default ...@@ -36,7 +36,7 @@ layout: default
<div class="index-flex"> <div class="index-flex">
<a href="{{ '/events/' | relative_url }}"> <a href="{{ '/events/' | relative_url }}">
<div class="index-box"> <div class="index-box index-smaller-gray-box">
<img src="{{ '/assets/buttons/index_events.jpg' | relative_url }}" alt="Events image" /> <img src="{{ '/assets/buttons/index_events.jpg' | relative_url }}" alt="Events image" />
<div class="index-box-caption"> <div class="index-box-caption">
Events Events
...@@ -45,7 +45,7 @@ layout: default ...@@ -45,7 +45,7 @@ layout: default
</a> </a>
<a href="{{ '/about-node/vacancies' | relative_url }}"> <a href="{{ '/about-node/vacancies' | relative_url }}">
<div class="index-box"> <div class="index-box index-smaller-gray-box">
<img src="{{ '/assets/buttons/index_jobs.jpg' | relative_url }}" alt="Job vacancies image" /> <img src="{{ '/assets/buttons/index_jobs.jpg' | relative_url }}" alt="Job vacancies image" />
<div class="index-box-caption"> <div class="index-box-caption">
Job vacancies Job vacancies
...@@ -54,7 +54,7 @@ layout: default ...@@ -54,7 +54,7 @@ layout: default
</a> </a>
<a href="https://webdav-r3lab.uni.lu/public/elixir/website/pdf/ELIXIR-LU_Flyer_VF.pdf"> <a href="https://webdav-r3lab.uni.lu/public/elixir/website/pdf/ELIXIR-LU_Flyer_VF.pdf">
<div class="index-box"> <div class="index-box index-smaller-gray-box">
<img src="{{ '/assets/buttons/index_flyer.jpg' | relative_url }}" alt="Flyer image" /> <img src="{{ '/assets/buttons/index_flyer.jpg' | relative_url }}" alt="Flyer image" />
<div class="index-box-caption"> <div class="index-box-caption">
Download flyer Download flyer
......
...@@ -7,27 +7,27 @@ layout: default ...@@ -7,27 +7,27 @@ layout: default
<div id="left-column"> <div id="left-column">
<h2>{{ page.section }}</h2> <h2>{{ page.section }}</h2>
<ul> <ul>
{%- for link in page.pages -%} {% for link in page.pages %}
<li> <li>
<a href="{{ link.href | relative_url }}" <a href="{{ link.href | relative_url }}"
class="{% if link.active %}active {% endif %}{% if link.smaller %}smaller {% endif %}"> class="{% if link.active %}active {% endif %}{% if link.smaller %}smaller {% endif %}">
{{ link.title }} {{ link.title }}
</a> </a>
</li> </li>
{%- endfor -%} {% endfor %}
</ul> </ul>
</div> </div>
<div id="right-column" {%- if page.wider -%}class="right-column-wider"{%- endif -%}> <div id="right-column" {% if page.wider %}class="right-column-wider"{% endif %}>
<header> <header>
<h1 {%- if page.section contains "Events" -%}class="no-caps"{%- endif -%} data-section="{{ page.section }}"> <h1 {% if page.section contains "Events" %}class="no-caps"{% endif %} data-section="{{ page.section }}">
{{ page.title | escape }} {{ page.title | escape }}
{%- if page.date -%}<small>({{ page.date | date: '%F' }})</small>{%- endif -%} {% if page.date %}<small>({{ page.date | date: '%F' }})</small>{% endif %}
</h1> </h1>
</header> </header>
{%- if page.image -%} {% if page.image %}
<img class="event-small-image" src="{{ page.image | relative_url }}" /> <img class="event-small-image" src="{{ page.image | relative_url }}" />
{%- endif -%} {% endif %}
{{ content }} {{ content }}
</div> </div>
......
#site-footer-primary { #site-footer-primary {
line-height: 1.5;
#site-footer-primary-wrapper { #site-footer-primary-wrapper {
background: #3e3e3e; background: #3e3e3e;
font-size: 0.875rem; font-size: 0.875rem;
......
...@@ -25,36 +25,34 @@ ...@@ -25,36 +25,34 @@
div.narrower-article-div { div.narrower-article-div {
.index-flex { .index-flex {
margin-top: 75px; margin-top: 75px;
.index-gray-box { .index-smaller-gray-box {
padding: 20px; margin-right: 1%;
border-radius: 6px; margin-left: 1%;
min-width: 200px;
background: #efefef; background: #efefef;
border: 1px solid #ebebeb; border: 1px solid #ebebeb;
width: auto; padding: 0px !important;
margin-right: 2%;
margin-bottom: 15px;
} }
.index-photo { .index-box {
border: solid 0 black;
flex-grow: 1; flex-grow: 1;
margin-right: 2%; margin-right: unquote("min(5%, 20px)");
margin-bottom: unquote("min(5%, 20px)");
border-radius: 0 0 12px 12px;
img { padding: 20px;
width: -webkit-fill-available; width: auto;
max-width: 100%;
min-width: 200px; &.index-gray-box {
background: #efefef;
border: 1px solid #ebebeb;
} }
}
.index-box { &.index-white-box {
flex-grow: 1; background: none;
margin-right: 2%; border: 1px solid #ebebeb;
margin-bottom: 2%; }
border-radius: 0 0 12px 12px;
background: #efefef;
border: 1px solid #ebebeb;
img { img {
width: 100%; width: 100%;
...@@ -71,6 +69,24 @@ ...@@ -71,6 +69,24 @@
} }
} }
} }
.index-photo {
border: solid 0 black;
flex-grow: 1;
margin-right: 2%;
img {
width: -webkit-fill-available;
max-width: 100%;
min-width: 180px;
}
&.index-box img {
padding-top: 30px;
padding-bottom: 10px;
}
}
} }
} }
...@@ -81,9 +97,9 @@ ...@@ -81,9 +97,9 @@
} }
#right-column { #right-column {
padding-left: 20px; padding-left: 40px;
padding-right: 20px; padding-right: 20px;
min-width: 220px; min-width: 240px;
margin-top: 23px; margin-top: 23px;
} }
...@@ -171,11 +187,13 @@ table { ...@@ -171,11 +187,13 @@ table {
div.post { div.post {
width: 100%; width: 100%;
border-left: solid 5px #f4f4f4; border-left: solid 20px #f4f4f4;
border-bottom: solid 2px #f4f4f4; border-bottom: solid 6px #f4f4f4;
padding-left: 10px; padding-left: 15px;
padding-bottom: 10px;
margin-top: 20px; margin-top: 20px;
margin-bottom: 30px; margin-bottom: 35px;
line-height: 23px;
.post-title { .post-title {
font-size: 14pt; font-size: 14pt;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Gem::Specification.new do |spec| Gem::Specification.new do |spec|
spec.name = "jekyll-elixir-theme" spec.name = "jekyll-elixir-theme"
spec.version = "0.9.29" spec.version = "0.10.1"
spec.authors = ["jacek.lebioda"] spec.authors = ["jacek.lebioda"]
spec.email = ["jacek.lebioda@uni.lu"] spec.email = ["jacek.lebioda@uni.lu"]
......
...@@ -10,39 +10,38 @@ introduction: >- ...@@ -10,39 +10,38 @@ introduction: >-
--- ---
## Services <div class="index-flex">
<div class="index-box index-white-box">
<h2>Projects</h2>
<p>ELIXIR-LU is involved in several large EU funded projects.</p><p> <a href="projects">To know more, please click here.</a></p>
<p>&nbsp;</p>
<h2>Support and user training</h2>
<p>Workshops and courses on data management, curation, analytics and visualisation. Continuous education of software developers, data managers and researchers.</p>
</div>
<div class="index-photo index-box index-white-box">
<h2>Services</h2>
<strong>Repository for high quality Translational Medicine data</strong>
<p>Integration of well-curated clinical and molecular data from cohorts and large consortia. Implementation of standardised electronic data capture, data harmonisation and curation.</p>
<strong>High-performance data access and computing services</strong>
<p>Sustainable access management according to well-defined criteria, in order to meet the security and accountability requirements of ELIXIR, of the General European data protection regulation (GDPR), and of the research community. Platforms and tools to allow efficient data access and analysis.
</p>
<a class="no-underline" href="{{ '/sustainability-data/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/data_catalog_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/data_catalog.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/data_catalog.jpg' | relative_url }}" alt="Data catalog" style="width:155px;" />
</picture></a>
<a class="no-underline" href="{{ '/sustainability-tools/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/tools_registry_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/tools_registry.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/tools_registry.jpg' | relative_url }}" alt="Tools Registry" style="width:155px;" />
</picture></a>
<a class="no-underline" href="{{ '/gdpr-activities/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/gdpr_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/gdpr.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/gdpr.jpg' | relative_url }}" alt="GDPR activities" style="width:155px;" />
</picture></a>
</div>
</div>
**Repository for high quality Translational Medicine data**
Integration of well-curated clinical and molecular data from cohorts and large consortia. Implementation of standardised electronic data capture, data harmonisation and curation.
----
**High-performance data access and computing services**
Sustainable access management according to well-defined criteria, in order to meet the security and accountability requirements of ELIXIR, of the General European data protection regulation (GDPR), and of the research community. Platforms and tools to allow efficient data access and analysis.
---
<a href="{{ '/sustainability-data/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/data_catalog_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/data_catalog.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/data_catalog.jpg' | relative_url }}" alt="Data catalog" style="width:155px;" />
</picture></a>
<a href="{{ '/sustainability-tools/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/tools_registry_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/tools_registry.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/tools_registry.jpg' | relative_url }}" alt="Tools Registry" style="width:155px;" />
</picture></a>
<a href="{{ '/gdpr-activities/' | relative_url }}"><picture>
<source media="(max-width: 600px)" srcset="{{ '/assets/buttons/gdpr_small.jpg' | relative_url }}" />
<source media="(min-width: 600px)" srcset="{{ '/assets/buttons/gdpr.jpg' | relative_url }}" />
<img src="{{ '/assets/buttons/gdpr.jpg' | relative_url }}" alt="GDPR activities" style="width:155px;" />
</picture></a>
---
## Support and user training
Workshops and courses on data management, curation, analytics and visualisation. Continuous education of software developers, data managers and researchers.
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