Merge branch '27-implement-suggestions-from-lucie' into 'develop'

Resolve "Implement suggestions from Lucie" See merge request !4

Merge branch '27-implement-suggestions-from-lucie' into 'develop'
Resolve "Implement suggestions from Lucie" See merge request !4
4046cb49 · Jacek Lebioda · e7672150 · e0eed4f6 · 4046cb49 · 4046cb49
Commit 4046cb49 authored Sep 18, 2019 by Jacek Lebioda
12 changed files
--- a/.gitignore
+++ b/.gitignore
 *.gem
 .bundle
 .sass-cache
+.jekyll-cache
 _site
 Gemfile.lock
--- a/_layouts/article.html
+++ b/_layouts/article.html
@@ -5,7 +5,7 @@ layout: default
 <article class="body-wrapper margin-wrapper">
    <div id="left-column"></div>

-    <div>
+    <div id="right-column">
        <header>
            <h1>
                {{ page.title | escape }}

--- a/_layouts/index.html
+++ b/_layouts/index.html
@@ -21,7 +21,11 @@ layout: default
          {% endif %}

          <div class="index-photo">
-            <img src="{{ '/assets/cover.jpg' | relative_url }}" alt="Elixir Luxembourg" />
+            <picture>
+              <source media="(min-width: 200px)" srcset="https://webdav-r3lab.uni.lu/public/elixir/website/images/cover_big.jpg" alt="Elixir Luxembourg" />
+              <source media="(max-width: 200px)" srcset="https://webdav-r3lab.uni.lu/public/elixir/website/images/cover_small.jpg" alt="Elixir Luxembourg" />
+              <img src="https://webdav-r3lab.uni.lu/public/elixir/website/images/cover_small.jpg" alt="Elixir Luxembourg" />
+            </picture>
          </div>
        </div>

@@ -52,6 +56,8 @@ layout: default
    </div>

    <div id="right-column">
+      <a class="twitter-timeline" data-lang="en" data-width="380" data-height="800" data-dnt="true" data-theme="light" data-link-color="#B57B00" href="https://twitter.com/elixir_lu?ref_src=twsrc%5Etfw">Tweets by elixir_lu</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
+
      {% if paginator.posts %}
      <h2>Our news</h2>

@@ -68,9 +74,6 @@ layout: default
      {% endfor %}

      <h3><a href="{{ '/news/' | relative_url }}">See more news...</a></h3>
-
      {% endif %}
-
-      <a class="twitter-timeline" data-lang="en" data-width="380" data-height="800" data-dnt="true" data-theme="light" data-link-color="#B57B00" href="https://twitter.com/elixir_lu?ref_src=twsrc%5Etfw">Tweets by elixir_lu</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
    </div>
 </article>
--- a/_layouts/left_col.html
+++ b/_layouts/left_col.html
@@ -13,7 +13,7 @@ layout: default
        </ul>
    </div>

-    <div>
+    <div id="right-column">
        <header>
            <h1>
                {{ page.title | escape }}

--- a/_layouts/paginated.html
+++ b/_layouts/paginated.html
@@ -7,7 +7,7 @@ layout: default
    <div id="left-column">
    </div>

-    <div>
+    <div id="right-column">
        <header>
            <h1>
                ELIXIR.LU news

--- a/_layouts/paginated_left_col.html
+++ b/_layouts/paginated_left_col.html
@@ -13,7 +13,7 @@ layout: default
        </ul>
    </div>

-    <div>
+    <div id="right-column">
        <header>
            <h1>
                ELIXIR.LU news

--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -12,7 +12,7 @@ layout: default
    </ul>
  </div>

-  <div>
+  <div id="right-column">
    <header>
      <h1>
        {{ page.title | escape }}<br />

--- a/_layouts/search.html
+++ b/_layouts/search.html
@@ -6,7 +6,7 @@ layout: default

    <div id="left-column"></div>

-    <div>
+    <div id="right-column">
        <header>
            <h1>
                {{ page.title | escape }}

--- a/_sass/elixir/_layout.scss
+++ b/_sass/elixir/_layout.scss
@@ -87,7 +87,7 @@
    #left-column {
      margin-left: 10px;
      padding-top: 20px;
-      padding-right: 20px;
+      padding-right: 40px;
      width: 220px;
      min-width: 220px;


--- a/_sass/elixir/_responsive.scss
+++ b/_sass/elixir/_responsive.scss
@@ -78,6 +78,9 @@ $HD_RES: 1930px;
  .body-wrapper.margin-wrapper {
    padding-left: 2%;
  }
+  div#right-column {
+    width: calc(80% - 240px);
+  }
 }

 @media only screen and (min-width: $HD_RES) {
@@ -88,4 +91,7 @@ $HD_RES: 1930px;
    padding-left: calc(20% - 220px);
    width: calc(85% - 200px);
  }
+  div#right-column {
+    width: calc(80% - 240px);
+  }
 }
--- a/elixir-theme.gemspec
+++ b/elixir-theme.gemspec
@@ -2,7 +2,7 @@

 Gem::Specification.new do |spec|
  spec.name          = "jekyll-elixir-theme"
-  spec.version       = "0.8.5"
+  spec.version       = "0.9.0"
  spec.authors       = ["jacek.lebioda"]
  spec.email         = ["jacek.lebioda@uni.lu"]


--- a/index.md
+++ b/index.md
@@ -24,12 +24,12 @@ Sustainable access management according to well-defined criteria, in order to me

 ---

-**Support and user training**
-
-Workshops and courses on data management, curation, analytics and visualisation. Continuous education of software developers, data managers and researchers.
-
---
-
 [![Data Catalog]({{ '/assets/buttons/data_catalog.jpg' | relative_url }}){:width="155px"}]({{ '/sustainability-data/' | relative_url }})
 [![Tools Registry]({{ '/assets/buttons/tools_registry.jpg' | relative_url }}){:width="155px"}]({{ '/sustainability-tools/' | relative_url }})
 [![GDPR activities]({{ '/assets/buttons/gdpr.jpg' | relative_url }}){:width="155px"}]({{ '/gdpr-activities/' | relative_url }})
+
+---
+
+## Support and user training
+
+Workshops and courses on data management, curation, analytics and visualisation. Continuous education of software developers, data managers and researchers.