Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • elixir/jekyll-elixir-theme
  • roland.krause/jekyll-elixir-theme
2 results
Show changes
Commits on Source (66)
Hide whitespace changes
Inline Side-by-side
Showing
with 445 additions and 178 deletions
_includes/footer.html
View file @ 52009cc7
......@@ -5,8 +5,9 @@
<a href="{{ '/about-node/' | relative_url }}">About the Node</a>
</h3>
<ul>
<li><a href="{{ '/about-node/team' | relative_url }}">Team</a></li>
<li><a href="{{ '/about-node/team' | relative_url }}">Our team</a></li>
<li><a href="{{ '/about-node/collaborations' | relative_url }}">Collaborations</a></li>
<li><a href="{{ '/projects' | relative_url }}">Projects</a></li>
<li><a href="{{ '/about-node/funding-and-governance' | relative_url }}">Funding and governance</a></li>
<li><a href="{{ '/about-node/vacancies' | relative_url }}">Vacancies</a></li>
<li><a href="{{ '/contact' | relative_url }}">Contact</a></li>
......@@ -17,10 +18,11 @@
<a href="{{ '/services/' | relative_url }}">Services</a>
</h3>
<ul>
<li><a href="{{ '/sustainability-data/' | relative_url }}">Sustainability of data</a></li>
<li><a href="{{ '/sustainability-tools/' | relative_url }}">Sustainability of tools</a></li>
<li><a href="{{ '/gdpr-activities/' | relative_url }}">GDPR activities</a></li>
<li><a href="{{ '/gdpr-activities/' | relative_url }}">DAISY</a></li>
<li><a href="{{ '/services/catalog/data-hosting' | relative_url }}">Data hosting</a></li>
<li><a href="{{ '/services/catalog/daisy' | relative_url }}">DAISY</a></li>
<li><a href="{{ '/services/catalog/minerva' | relative_url }}">Disease maps</a></li>
<li><a href="{{ '/services/catalog/faircookbook' | relative_url }}">FAIR Cookbook</a></li>
<li><a href="{{ '/services/catalog/r3' | relative_url }}">R3</a></li>
</ul>
</div>
<div>
......@@ -38,12 +40,11 @@
</h3>
<ul>
<li><a href="{{ '/privacy/policy' | relative_url }}">Privacy policy</a></li>
<li><a href="{{ '/privacy/cookies' | relative_url }}">Cookies</a></li>
<li><a href="{{ '/privacy/' | relative_url }}">Privacy policy</a></li>
<li><a href="{{ '/privacy/terms_of_use' | relative_url }}">Terms of use</a></li>
{% if site.siteID > 0 %}
{%- include policy.html -%}
{% endif %}
<li><a href="{{ '/privacy/terms_of_use' | relative_url }}">Terms of use</a></li>
</ul>
</div>
<div>
......@@ -70,4 +71,4 @@
{% if site.siteID > 0 %}
{%- include gdpr-banner.html -%}
{% endif %}
\ No newline at end of file
{% endif %}
_includes/gdpr-banner.html
View file @ 52009cc7
......@@ -4,7 +4,7 @@
<a class="lap-refuse"><i class="fa fa-times" aria-hidden="true"></i></a>
</div>
<div class="banner-img">
<img src="{{ site.logo_policy }}" type="image/svg+xml" />
<img src="{{ site.logo_policy | relative_url }}" type="image/svg+xml" />
</div>
<div class="banner-title">{{ site.banner_title }}</div>
<div class="banner-text">{{ site.banner_text }}</div>
......
_includes/header.html
View file @ 52009cc7
......@@ -11,6 +11,7 @@
<li><a {% if page.section == 'About' %} class="active" {% endif %} href="{{ '/about-node' | relative_url }}">About</a></li>
<li><a {% if page.section == 'Services' %} class="active" {% endif %} href="{{ '/services' | relative_url }}">Services</a></li>
<li><a {% if page.section == 'Training' %} class="active" {% endif %} href="{{ '/training' | relative_url }}">Training</a></li>
<li><a {% if page.section == 'Projects' %} class="active" {% endif %} href="{{ '/projects' | relative_url }}">Projects</a></li>
<li><a {% if page.section == 'Events' %} class="active" {% endif %} href="{{ '/events' | relative_url }}">Events</a></li>
<li><a {% if page.section == 'News' %} class="active" {% endif %} href="{{ '/news' | relative_url }}">News</a></li>
<li><a {% if page.section == 'Contact' %} class="active" {% endif-%} href="{{ '/contact' | relative_url }}">Contact</a></li>
......
_includes/policy.html
View file @ 52009cc7
<li>- <span id="doNotTrack-text"><span id="gdpr-result-text"></span> - <a href="javascript: showBanner();">change</a></span></li>
\ No newline at end of file
<li>
<a href="{{ '/privacy/cookies' | relative_url }}">
Cookies</a> -
<a href="javascript: showBanner();">
change settings</a>
<br>&nbsp;&nbsp;(<span id="gdpr-result-text"></span>)</span>
</li>
<li>
<span id="doNotTrack-text"></span>
</li>
\ No newline at end of file
_layouts/index.html
View file @ 52009cc7
......@@ -15,7 +15,7 @@ layout: default
<div class="index-flex">
{% if page.introduction %}
<div class="index-gray-box">
<div class="index-box index-gray-box">
{{ page.introduction }}
</div>
{% endif %}
......@@ -36,7 +36,7 @@ layout: default
<div class="index-flex">
<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" />
<div class="index-box-caption">
Events
......@@ -45,7 +45,7 @@ layout: default
</a>
<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" />
<div class="index-box-caption">
Job vacancies
......@@ -54,7 +54,7 @@ layout: default
</a>
<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" />
<div class="index-box-caption">
Download flyer
......
_layouts/left_col.html
View file @ 52009cc7
......@@ -18,13 +18,16 @@ layout: default
</ul>
</div>
<div id="right-column">
<div id="right-column" {% if page.wider %}class="right-column-wider"{% endif %}>
<header>
<h1 {% if page.section contains "Events" %}class="no-caps"{% endif %} data-section="{{ page.section }}">
{{ page.title | escape }}
{% if page.date %}<small>({{ page.date | date: '%F' }})</small>{% endif %}
{% if page.section contains "Events" %}{% else %}{% if page.date %}<small>({{ page.date | date: '%F' }})</small>{% endif %}{% endif %}
</h1>
</header>
{% if page.image %}
<img class="event-small-image" src="{{ page.image | relative_url }}" />
{% endif %}
{{ content }}
</div>
......
_layouts/paginated_left_col.html
View file @ 52009cc7
......@@ -33,7 +33,7 @@ layout: default
<span class="post-date">Published on: {{ post.date | date: '%B %d, %Y' }}</span>
<div class="content">
{{ post.content | truncate: 220 }}
{{ post.content | strip_html | truncatewords: 52 }}
</div>
</div>
{% endfor %}
......
_sass/elixir.scss
View file @ 52009cc7
@import
"elixir/accordion",
"elixir/base",
"elixir/accordion",
"elixir/cards",
"elixir/eventinfo",
"elixir/footer",
......@@ -8,5 +8,6 @@
"elixir/helpers",
"elixir/layout",
"elixir/responsive",
"elixir/services",
"elixir/lap"
;
_sass/elixir/_accordion.scss
View file @ 52009cc7
......@@ -56,7 +56,7 @@
color: #2c3e50;
background: white;
transition: all .35s;
font-size: larger;
font-size: 16px;
}
}
}
_sass/elixir/_cards.scss
View file @ 52009cc7
......@@ -6,8 +6,14 @@
height: 175px;
}
.card-id {
width: 185px;
&.card-id-sab {
width: 220px;
border: 0;
}
width: 190px;
height: 350px;
border: solid 2px #e6e6e6;
border-radius: 7px 7px 0px 0px;
......@@ -17,22 +23,26 @@
.card-id-smallphoto img {
width: auto;
padding-left: 4px;
padding-bottom: 8px;
padding-bottom: 3px;
}
.card-id-photo img {
width: 120px;
padding-left: 4px;
padding-bottom: 8px;
margin: 0px auto;
display: block;
}
.card-id-name {
font-weight: 600;
font-size: 18px;
text-align: center;
}
.card-id-description {
font-size: 14px;
text-align: center;
}
}
}
_sass/elixir/_eventinfo.scss
View file @ 52009cc7
......@@ -5,8 +5,9 @@
border: solid 2px rgb(2, 52, 82);
border-radius: 5px;
padding: 10px;
margin-bottom: 100px;
margin-left: 15px;
margin-bottom: 60px;
margin-left: 50px;
text-align: center;
span {
display: block;
......@@ -25,7 +26,31 @@
&:after {
content: ')';
}
font-size: smaller;
text-align: center;
}
.event-info-no-participants {
text-align: center;
}
.event-info-register-link {
a {
font-size: x-large;
color: $COLOR_LINK_ELIXIR;
text-align: center;
}
}
.event-info-image {
max-width: 220px;
margin-top: 40px;
border: solid 1px #f5f5f5;
}
}
.event-small-image {
max-width: 100px;
border: solid 1px #f5f5f5;
}
\ No newline at end of file
_sass/elixir/_footer.scss
View file @ 52009cc7
#site-footer-primary {
line-height: 1.5;
#site-footer-primary-wrapper {
background: #3e3e3e;
font-size: 0.875rem;
......
_sass/elixir/_helpers.scss
View file @ 52009cc7
......@@ -17,4 +17,22 @@ h1.no-caps {
.no-underline {
text-decoration: none;
}
\ No newline at end of file
}
.nowrap {
white-space: nowrap;
}
.justify {
text-align:justify;
}
.center {
margin: 0 auto;
text-align: center;
}
.centercolumns {
justify-content: center;
column-gap: 15px;
}
_sass/elixir/_lap.scss
View file @ 52009cc7
#lap-cookies-banner {
position: fixed;
bottom: 0;
background-color: #fff;
padding-top: 1em;
padding-bottom: 1em;
z-index: 1000;
left: 0;
text-align: center;
border-top: 1px solid #023452;
width: 100%;
display: none;
/* hidden by default */
}
$primary-color: #198cdc;
$background-color: #fff;
#lap-cookies-banner .banner-intro {
#lap-cookies-banner {
position: fixed;
bottom: 0;
background-color: $background-color;
padding-top: 1em;
padding-bottom: 1em;
z-index: 1000;
left: 0;
text-align: center;
border-top: 1px solid $primary-color;
width: 100%;
/* hidden by default */
transition : 180ms transform ease-out;
transform : translateY(+100%);
flex-direction: column;
&.shown {
transform : translateY(0);
transition : 150 transform ease-in;
}
.banner-intro {
width: 40%;
position: relative;
left: 30%;
text-align: left;
}
#lap-cookies-banner .banner-img {
width: 90px;
padding-top: 0;
height: 90px;
.lap-close {
opacity: 0.5;
display: inline-block;
width: 14px;
height: 14px;
&:hover {
opacity: 1;
}
&:before, &:after {
position: absolute;
left: 5px;
content: ' ';
height: 15px;
width: 3px;
background-color: $primary-color;
}
&:before {
transform: rotate(45deg);
}
&:after {
transform: rotate(-45deg);
}
}
}
.banner-img {
width: 50px;
position: absolute;
padding-left: 10px;
}
padding-top: 5px;
height: 50px;
}
#lap-cookies-banner .banner-title {
padding-left: 110px;
}
.banner-title {
font-size: 120%;
font-weight: bold;
text-align: left;
padding-left: 60px;
}
#lap-cookies-banner .banner-text {
padding-left: 110px;
padding-bottom: 1em;
}
.banner-text {
min-height: 40px;
padding-left: 60px;
font-size: 80%;
text-align: left;
}
#lap-cookies-banner .banner-buttons {
padding-top: 5px;
height: 20px;
.banner-buttons {
padding-top: 25px;
margin-bottom: 10px;
}
#lap-cookies-banner .close-button {
position: absolute;
left: 100%;
}
.lap-accept,
.lap-refuse,
.lap-cookies-more,
.btn.active {
border: 1px solid $primary-color;
font-weight: bold;
background-color: $primary-color;
color: $background-color !important;
box-sizing: border-box;
transition: background-color 350ms ease-in-out;
}
#lap-cookies-banner .banner-buttons .lap-accept,
#lap-cookies-banner .banner-buttons .lap-refuse,
#lap-cookies-banner .banner-buttons .lap-cookies-more,
#lap-cookies-banner .banner-buttons .btn.active {
border: 1px solid #023452;
font-weight: bold;
background-color: #023452;
color: #ffffff !important;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.lap-accept:hover,
.lap-refuse:hover,
.lap-cookies-more:hover,
.btn.selected {
background: white;
color: $primary-color !important;
border: 1px solid currentColor;
box-sizing: border-box;
text-decoration: none;
}
}
#lap-cookies-banner .banner-buttons .lap-accept:hover,
#lap-cookies-banner .banner-buttons .lap-refuse:hover,
#lap-cookies-banner .banner-buttons .lap-cookies-more:hover,
#lap-cookies-banner .banner-buttons .btn.selected {
background: white;
color: #023452 !important;
border: 1px solid #023452;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
text-decoration: none;
}
.close-button {
position: absolute;
left: 100%;
cursor: pointer;
}
#lap-cookies-banner .btn {
.btn {
text-decoration: none;
display: inline-block;
margin-bottom: 0;
text-align: center;
vertical-align: middle;
touch-action: manipulation;
......@@ -94,75 +130,38 @@
margin-right: 10px;
margin-bottom: 10px;
cursor: pointer;
}
}
#lap-cookies-banner .banner-checkboxes {
.banner-checkboxes {
font-size: 80%;
margin-top: 1em;
}
}
#lap-cookies-banner .checkbox-label {
.checkbox-label {
margin-left: 0.3em;
margin-right: 1.5em;
top: -0.2em;
position: relative;
}
}
@media(max-width: 500px) {
#lap-cookies-banner {
position: fixed;
bottom: 0;
background-color: #fff;
padding-top: 1em;
padding-bottom: 1em;
z-index: 1000;
left: 0;
text-align: center;
border-top: 1px solid #023452;
width: 100%;
display: none;
height: 280px;
overflow: auto;
/* hidden by default */
}
#lap-cookies-banner .banner-intro {
width: 60%;
position: relative;
left: 20%;
text-align: left;
}
}
@media(max-width: 1100px) {
#lap-cookies-banner .banner-intro {
width: 90%;
position: relative;
left: 5%;
text-align: left;
}
#lap-cookies-banner .banner-buttons {
padding-top: 5px;
height: 60px;
margin-bottom: 10px;
@media(max-width: 500px) {
font-size: 80%;
.btn {
font-size: 80%;
}
}
@media(max-width: 1600px) {
#lap-cookies-banner .banner-intro {
width: 60%;
position: relative;
left: 20%;
text-align: left;
.banner-intro {
width: 80%;
position: relative;
left: 10%;
text-align: left;
}
}
/* ultra-wide screen */
@media(min-width: 2400px) {
#lap-cookies-banner .banner-intro {
position: relative;
text-align: left;
max-width: 800px;
left: 35%;
}
@media(max-width: 1000px) {
.banner-intro {
width: 80%;
position: relative;
left: 10%;
text-align: left;
}
}
}
_sass/elixir/_layout.scss
View file @ 52009cc7
......@@ -25,36 +25,34 @@
div.narrower-article-div {
.index-flex {
margin-top: 75px;
.index-gray-box {
padding: 20px;
border-radius: 6px;
.index-smaller-gray-box {
margin-right: 1%;
margin-left: 1%;
min-width: 200px;
background: #efefef;
border: 1px solid #ebebeb;
width: auto;
margin-right: 2%;
margin-bottom: 15px;
padding: 0px !important;
}
.index-photo {
border: solid 0 black;
.index-box {
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 {
width: -webkit-fill-available;
max-width: 100%;
min-width: 200px;
padding: 20px;
width: auto;
&.index-gray-box {
background: #efefef;
border: 1px solid #ebebeb;
}
}
.index-box {
flex-grow: 1;
margin-right: 2%;
margin-bottom: 2%;
border-radius: 0 0 12px 12px;
background: #efefef;
border: 1px solid #ebebeb;
&.index-white-box {
background: none;
border: 1px solid #ebebeb;
}
img {
width: 100%;
......@@ -71,6 +69,27 @@
}
}
}
.index-photo {
border: solid 0 black;
flex-grow: 1;
margin-right: 2%;
img {
width: -webkit-fill-available;
max-width: 510px;
min-width: 155px;
border-bottom-left-radius: 12px;
border-bottom-right-radius: 12px;
}
&.index-box img {
padding-top: 10px;
padding-bottom: 10px;
max-width: 160px;
}
}
}
}
......@@ -81,9 +100,9 @@
}
#right-column {
padding-left: 20px;
padding-left: 40px;
padding-right: 20px;
min-width: 220px;
min-width: 240px;
margin-top: 23px;
}
......@@ -170,12 +189,13 @@ table {
}
div.post {
width: 100%;
border-left: solid 5px #f4f4f4;
border-bottom: solid 2px #f4f4f4;
padding-left: 10px;
border-left: solid 20px #f4f4f4;
border-bottom: solid 6px #f4f4f4;
padding-left: 15px;
padding-bottom: 10px;
margin-top: 20px;
margin-bottom: 30px;
margin-bottom: 35px;
line-height: 23px;
.post-title {
font-size: 14pt;
......
_sass/elixir/_responsive.scss
View file @ 52009cc7
......@@ -84,6 +84,9 @@ $HD_RES: 1930px;
div#right-column {
width: calc(65% - 240px);
}
div#right-column.right-column-wider {
width: calc(87% - 240px);
}
}
@media only screen and (min-width: $HD_RES) {
......@@ -97,4 +100,7 @@ $HD_RES: 1930px;
div#right-column {
width: calc(60% - 240px);
}
div#right-column.right-column-wider {
width: calc(80% - 240px);
}
}
_sass/elixir/_services.scss 0 → 100644
View file @ 52009cc7
div.services-menu {
width: 95%;
margin: 18px auto;
border-style: solid;
border-color: transparent;
border-width: 3px;
border-radius: 15px;
text-align: center;
&:hover {
box-shadow: 2px 2px 2px;
background: #1a252f;
font-weight: bold;
}
& a.entry {
display: block;
font-size: 23px;
color: white;
padding: 19px;
}
& a.subtitle {
color: white;
display: block;
padding-bottom: 6px;
text-decoration: none;
font-size: 14px;
margin-bottom: 10px;
}
}
ul.services-navbar {
margin:0;
padding:0;
font-size:smaller;
& li {
display:inline;
&.active {
color:#f47d22;
}
}
& li a {
text-decoration: none;
}
}
a.services-button {
background-color: #4c7aa7;
text-decoration: none;
text-align: center;
color: white;
display: block;
border: solid transparent 1px;
border-radius: 10px;
padding: 12px;
&:hover {
box-shadow: 2px 2px 2px black;
font-weight: bold;
color: white;
}
}
.services-menu-button {
background-color: #35506b;
border-radius: 15px;
min-width: 200px;
color: white;
padding: 25px 30px;
text-decoration: none;
display: inline-block;
margin: auto;
margin-left: 15px;
margin-bottom: 10px;
&:hover {
box-shadow: 2px 2px 2px black;
font-weight: bold;
color: white;
}
}
/**
* Services catalog boxes
*/
div.service-box-container {
display: flex;
width: 94%;
border: solid 2px transparent;
border-radius: 15px;
margin: 30px auto;
padding:15px;
&:nth-child(even) {
background-color: #4c7aa7;
}
&:nth-child(odd) {
background-color: #35506b;
}
& div.service-logos {
background-color: white;
text-align: center;
margin: 25px 10px;
width: 28%;
height: fit-content;
border-radius: 10px;
padding: 2%;
&:hover {
box-shadow: 3px 3px 2px;
}
& div.header-underline {
border-bottom: 2px #f47d21 solid;
}
& a.logo-header {
display: inline-block;
width: 90%;
padding: 6px;
font-size: 19px;
color: #2c3e50;
text-decoration: none;
}
& .logo-image {
border: solid 10px transparent;
width: 90%;
}
}
& .description-right-column {
text-align: justify;
color: aliceblue;
width: 68%;
margin: 3px;
}
& p.description-content {
color: white;
margin: 20px 15px 10px 10px;
}
& a.read-more {
text-decoration: none;
color: #2c3e50;
}
& p.read-more-button{
background-color: aliceblue;
text-align: center;
font-weight: bold;
font-size: 15px;
width: 25%;
margin: 20px auto 5px;
border: solid lightgray 1px;
border-radius: 10px;
padding: 10px;
&:hover {
box-shadow: 3px 3px 2px;
}
}
}
assets/cover_big.jpg
View replaced file @ bad47eef View file @ 52009cc7
assets/cover_big.jpg

125 KiB | W: 0px | H: 0px

assets/cover_big.jpg

324 KiB | W: 0px | H: 0px

assets/cover_big.jpg
assets/cover_big.jpg
assets/cover_big.jpg
assets/cover_big.jpg
  • 2-up
  • Swipe
  • Onion skin
assets/cover_big.webp
View replaced file @ bad47eef View file @ 52009cc7
assets/cover_big.webp

90.6 KiB | W: 0px | H: 0px

assets/cover_big.webp

109 KiB | W: 0px | H: 0px

assets/cover_big.webp
assets/cover_big.webp
assets/cover_big.webp
assets/cover_big.webp
  • 2-up
  • Swipe
  • Onion skin
assets/cover_small.jpg
View replaced file @ bad47eef View file @ 52009cc7
assets/cover_small.jpg

47.2 KiB | W: 0px | H: 0px

assets/cover_small.jpg

33.7 KiB | W: 0px | H: 0px

assets/cover_small.jpg
assets/cover_small.jpg
assets/cover_small.jpg
assets/cover_small.jpg
  • 2-up
  • Swipe
  • Onion skin