diff --git a/.gitignore b/.gitignore index 867d3792d5a49d181a19956058e3fe5c4882b75e..9053bb90223979bf32d73fe1aaec798d5280ee8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.gem .bundle .sass-cache +.jekyll-cache _site Gemfile.lock diff --git a/_layouts/article.html b/_layouts/article.html index 04a8bf54589be8d7732a021b75ac2cc2fe8af46d..ec1d782ef57e0e7dfcf4a2ab223716b13cedf5a0 100644 --- 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 }} diff --git a/_layouts/index.html b/_layouts/index.html index 7450994d8ed1f5e48f864e07f4b84133b92b6020..f544e403dc218d0e2e8f44f02a7cc0e275d81d5d 100644 --- 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> diff --git a/_layouts/left_col.html b/_layouts/left_col.html index c8acb6a7816ac5e5db7eb4737af9fb1e04846af8..517b043907e0617274768fe3927500bb1a6e073b 100644 --- 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 }} diff --git a/_layouts/paginated.html b/_layouts/paginated.html index efcb64d538aaf38b4cdd96425bb45713fb6f7cf9..b7c23c76e975e5ff3321c1316982a489705e019d 100644 --- 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 diff --git a/_layouts/paginated_left_col.html b/_layouts/paginated_left_col.html index 36e51bca61e2f02efa708bdf002134df70e2db1f..192bc5d7805c2c2fd7a17f5db4d8f3e7517a3480 100644 --- 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 diff --git a/_layouts/post.html b/_layouts/post.html index 0d5f5048d9f77d6105d453887ad1806452a17b1a..f2e1f821ed840a4fa9cc8058a9e279e2c1df2e16 100644 --- 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 /> diff --git a/_layouts/search.html b/_layouts/search.html index aedc3621f8c3b0c6eb7073d266a75819e1860adf..658d9a204d141329032ab46cc8987df379151d8f 100644 --- 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 }} diff --git a/_sass/elixir/_layout.scss b/_sass/elixir/_layout.scss index 90cc3337090245b82bfdd25f1f20f33076e9afb6..18e8ab4022f3af11b8c530cef6819cae31eb7f3f 100644 --- 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; diff --git a/_sass/elixir/_responsive.scss b/_sass/elixir/_responsive.scss index 3d5ffe39793ba33a3b1cc3bcf15da62827c2950b..61efa51c328f3478bd1cda9bf25a4fdb92269535 100644 --- 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); + } } diff --git a/elixir-theme.gemspec b/elixir-theme.gemspec index d9017eb3006593e87555bff1c000da4fa44e4a40..841d4d66e773809664eecb671a859cb8ff8c8570 100644 --- 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"] diff --git a/index.md b/index.md index 11e9d25bd512201188c78f8b12a89054a3061052..f6d510267f4166fbb9060e31a7f29a6b4559f5b0 100644 --- 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. - ---- - [{:width="155px"}]({{ '/sustainability-data/' | relative_url }}) [{:width="155px"}]({{ '/sustainability-tools/' | 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.