From e4b1cf4f2e854dff50236f7fae4cf9bfa3092c05 Mon Sep 17 00:00:00 2001
From: "jacek.lebioda" <jacek.lebioda@uni.lu>
Date: Wed, 26 Jun 2019 10:49:41 +0200
Subject: [PATCH] Article layout
---
_layouts/article.html | 15 ++
_layouts/default.html | 4 +-
_layouts/left_col.html | 4 +-
_sass/elixir/_layout.scss | 367 +++++++++++++++++++-------------------
elixir-theme.gemspec | 2 +-
left.md | 23 +++
6 files changed, 228 insertions(+), 187 deletions(-)
create mode 100644 _layouts/article.html
create mode 100644 left.md
diff --git a/_layouts/article.html b/_layouts/article.html
new file mode 100644
index 0000000..7982003
--- /dev/null
+++ b/_layouts/article.html
@@ -0,0 +1,15 @@
+---
+layout: default
+---
+
+<article>
+ <div>
+ <header>
+ <h1>
+ {{ page.title | escape }}
+ </h1>
+ </header>
+
+ {{ content }}
+ </div>
+</article>
diff --git a/_layouts/default.html b/_layouts/default.html
index a3b065b..0fb8ad1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
<link type="text/css" rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,400italic,700" media="all">
- </head>
+ </head>
<body>
{%- include header.html -%}
@@ -25,4 +25,4 @@
{%- include footer.html -%}
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/_layouts/left_col.html b/_layouts/left_col.html
index 5913754..82136cb 100644
--- a/_layouts/left_col.html
+++ b/_layouts/left_col.html
@@ -8,7 +8,7 @@ layout: default
<h2>{{ page.section }}</h2>
<ul>
{% for link in page.pages %}
- <li><a href="{{ site.baseurl }}{{ link.href }}">{{ link.title }}</a></li>
+ <li><a href="{{ site.baseurl }}{{ link.href }}" {% if link.active %}class="active"{% endif %}>{{ link.title }}</a></li>
{% endfor %}
</ul>
</div>
@@ -22,4 +22,4 @@ layout: default
{{ content }}
</div>
-</article>
\ No newline at end of file
+</article>
diff --git a/_sass/elixir/_layout.scss b/_sass/elixir/_layout.scss
index 27d1158..56f7d82 100644
--- a/_sass/elixir/_layout.scss
+++ b/_sass/elixir/_layout.scss
@@ -1,199 +1,202 @@
#site-header {
- background: $COLOR_BACKGROUND_HEADER;
- height: 93px;
- margin-top: -15px;
-
- #site-header-wrapper {
- padding-left: $PADDING_PAGE_LEFT;
-
- ul {
- margin-left: 0px;
- position: relative;
- top: 66px;
-
- li {
- list-style: none;
- float: left;
- margin: 0;
- padding: 0;
-
- img {
- width: 150px;
- position: relative;
- bottom: 46px;
- padding-left: 10px;
- }
-
- a {
- display: block;
- white-space: nowrap;
- padding: 2px 12px;
- margin-left: 0;
- color: #fefefe;
- transition: color 0.25s;
- text-transform: uppercase;
- font-size: 0.875rem;
- text-decoration: none;
- }
-
- a:hover {
- color: $COLOR_LINK_ELIXIR;
- border-color: $COLOR_LINK_ELIXIR;
- text-decoration: none;
- }
- }
+ background: $COLOR_BACKGROUND_HEADER;
+ height: 93px;
+ margin-top: -15px;
+
+ #site-header-wrapper {
+ padding-left: $PADDING_PAGE_LEFT;
+
+ ul {
+ margin-left: 0;
+ position: relative;
+ top: 66px;
+
+ li {
+ list-style: none;
+ float: left;
+ margin: 0;
+ padding: 0;
+
+ img {
+ width: 150px;
+ position: relative;
+ bottom: 46px;
+ padding-left: 10px;
}
+
+ a {
+ display: block;
+ white-space: nowrap;
+ padding: 2px 12px;
+ margin-left: 0;
+ color: #fefefe;
+ transition: color 0.25s;
+ text-transform: uppercase;
+ font-size: 0.875rem;
+ text-decoration: none;
+ }
+
+ a:hover {
+ color: $COLOR_LINK_ELIXIR;
+ border-color: $COLOR_LINK_ELIXIR;
+ text-decoration: none;
+ }
+ }
}
+ }
}
#site-content {
- h1.title {
- font-size: 37px;
- color: #005472;
- line-height: 1.1;
- font-weight: 300;
- margin: 0 0 12px 0;
- }
-
- article {
- padding-left: $PADDING_PAGE_LEFT;
- padding-bottom: 50px;
- width: $WIDTH_CONTENT;
- padding-right: 10px;
- margin: 0px;
- display: flex;
- flex-direction: row;
-
- #left-column {
- padding-top: 20px;
- padding-right: 20px;
-
- h2 {
- color: #005472;
- font-size: 25px;
- line-height: 1.2;
- font-weight: 300;
- margin: 0;
- border-bottom: 1px solid #ccc;
- }
-
- ul {
- width: 200px;
- padding-inline-start: 20px;
- list-style: none;
- margin: 0px;
-
- li {
- padding: 0;
- margin: 0;
-
- a {
- color: #222;
- line-height: 1.2;
- text-decoration: none;
- display: block;
- border-bottom: 1px solid #efefef;
- padding: 10px 5px 10px 15px;
- }
-
- a:hover {
- color: #060606;
- text-decoration: underline;
- }
- }
- }
+ h1.title {
+ font-size: 37px;
+ color: #005472;
+ line-height: 1.1;
+ font-weight: 300;
+ margin: 0 0 12px;
+ }
+
+ article {
+ padding-left: $PADDING_PAGE_LEFT;
+ padding-bottom: 50px;
+ width: $WIDTH_CONTENT;
+ padding-right: 10px;
+ margin: 0;
+ display: flex;
+ flex-direction: row;
+
+ #left-column {
+ padding-top: 20px;
+ padding-right: 20px;
+
+ h2 {
+ color: #005472;
+ font-size: 25px;
+ line-height: 1.2;
+ font-weight: 300;
+ margin: 0;
+ border-bottom: 1px solid #ccc;
+ }
+
+ ul {
+ width: 200px;
+ padding-inline-start: 20px;
+ list-style: none;
+ margin: 0;
+
+ li {
+ padding: 0;
+ margin: 0;
+
+ a {
+ color: #222;
+ line-height: 1.2;
+ text-decoration: none;
+ display: block;
+ border-bottom: 1px solid #efefef;
+ padding: 10px 5px 10px 15px;
+ }
+
+ a:hover {
+ color: #060606;
+ text-decoration: underline;
+ }
}
+ }
}
+ }
}
-#site-footer-primary {
- #site-footer-primary-wrapper {
- display: flex;
- flex-direction: row;
-
- background: #3e3e3e;
- font-size: 0.875rem;
- padding-left: 13%;
-
- div {
- margin-left: 15px;
- margin-right: 15px;
-
- h3 {
- border-bottom: 1px solid #848484;
- font-size: 1rem;
- color: #ebebeb;
- transition: color 0.15s;
- }
-
- ul {
- margin-left: 10px;
-
- li {
- list-style: none;
- width: auto;
- float: none;
- min-width: 0;
-
- a {
- display: inline-block;
- zoom: 1;
- font-size: 11px;
- line-height: 1.1;
- color: #ebebeb;
- transition: color 0.15s;
- padding: 1px 4px 2px 0;
- border-bottom: none;
- margin-bottom: 0;
- text-decoration: none;
- }
-
- a:hover {
- text-decoration: none;
- color: #f47d21;
- text-decoration: underline;
- }
- }
- }
+#site-footer-primary {
+ #site-footer-primary-wrapper {
+ display: flex;
+ flex-direction: row;
+ background: #3e3e3e;
+ font-size: 0.875rem;
+ padding-left: 13%;
+
+ div {
+ margin-left: 15px;
+ margin-right: 15px;
+
+ h3 {
+ border-bottom: 1px solid #848484;
+ font-size: 1rem;
+ color: #ebebeb;
+ transition: color 0.15s;
+ }
+
+ ul {
+ margin-left: 10px;
+
+ li {
+ list-style: none;
+ width: auto;
+ float: none;
+ min-width: 0;
+
+ a {
+ display: inline-block;
+ zoom: 1;
+ font-size: 11px;
+ line-height: 1.1;
+ color: #ebebeb;
+ transition: color 0.15s;
+ padding: 1px 4px 2px 0;
+ border-bottom: none;
+ margin-bottom: 0;
+ text-decoration: none;
+ }
+
+ a:hover {
+ text-decoration: none;
+ color: #f47d21;
+ text-decoration: underline;
+ }
}
+ }
}
+ }
}
#site-footer-secondary {
- #site-footer-secondary-wrapper {
- background: #023452;
- border-top: 1px solid #333;
- padding-left: 13%;
- color: #ebebeb;
- font-size: 0.875rem;
- display: flex;
-
- ul {
- list-style: none;
- padding-right: 100px;
-
- li {
- display: inline-block;
- }
-
- a {
- display: inline-block;
- color: #ffffff;
- font-weight: 800;
- transition: color 0.15s;
- padding-left: 15px;
- padding-right: 15px;
- }
-
- a:hover {
- color: orange;
- text-decoration: none;
- }
- }
+ #site-footer-secondary-wrapper {
+ background: #023452;
+ border-top: 1px solid #333;
+ padding-left: 13%;
+ color: #ebebeb;
+ font-size: 0.875rem;
+ display: flex;
+
+ ul {
+ list-style: none;
+ padding-right: 100px;
+
+ li {
+ display: inline-block;
+ }
+
+ a {
+ display: inline-block;
+ color: #ffffff;
+ font-weight: 800;
+ transition: color 0.15s;
+ padding-left: 15px;
+ padding-right: 15px;
+ }
+
+ a:hover {
+ color: orange;
+ text-decoration: none;
+ }
+ }
- #address {
- color: #888;
- font-size: 11px;
- }
+ #address {
+ color: #888;
+ font-size: 11px;
}
-}
\ No newline at end of file
+ }
+}
+
+li.active {
+ color: $COLOR_LINK_ELIXIR;
+}
diff --git a/elixir-theme.gemspec b/elixir-theme.gemspec
index 0a5189d..12280da 100644
--- a/elixir-theme.gemspec
+++ b/elixir-theme.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "elixir-theme"
- spec.version = "0.1.1"
+ spec.version = "0.1.2"
spec.authors = ["jacek.lebioda"]
spec.email = ["jacek.lebioda@uni.lu"]
diff --git a/left.md b/left.md
new file mode 100644
index 0000000..0d5b443
--- /dev/null
+++ b/left.md
@@ -0,0 +1,23 @@
+---
+layout: left_col
+title: Collaborations
+permalink: /left
+section: About
+pages:
+ - title: ELIXIR-LU Team
+ href: /about-node/team
+ - title: Collaborations
+ href: /about-node/collaborations
+ - title: Funding and governance
+ href: /about-node/funding-and-governance
+ - title: Vacancies
+ href: /about-node/vacancies
+---
+
+ELIXIR-LU is always looking to add new national and international collaborations with partners from public and private sectors in Luxembourg and abroad. The Node especially aims to interact with the pharmaceutical industry and the clinical healthcare.
+
+On a national scale, the Node aims to unify the Luxembourgish biomedical IT landscape and implement international data standards. The local biomedical research institutions will be able to use the ELIXIR portal to store and promote the data produced by their cohorts and biological sample collections.
+
+Internationally, ELIXIR-LU intends to become a leading stakeholder in biomedicine, as a secure data hub and a high-performance computing location. The Node will host data from different European and international consortia. For example, ELIXIR-LU participated within IMI-eTRIKS in the initial setup and metadata collection of IMI (Innovative Medicines Initiative) projects. ELIXIR-LU will help sustain data that emerged from these projects beyond the end of the funded project duration. Both the volume and the scope of data available from such international projects will increase over the years, making the Node’s <a href="http://datacatalog.elixir-luxembourg.org/">data catalogue</a> of interest to researchers worldwide.
+
+ELIXIR-LU has also developed strong collaborations within the ELIXIR infrastructure, including with the Hub and many other Nodes (including but not limited to: ELIXIR-UK, ELIXIR-Denmark, ELIXIR-Spain, ELIXIR-Czech Republic and ELIXIR-Finland).
--
GitLab