From ac989b39cf62c99090867ac05d5e70239cf3e00f Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:16:38 +0200 Subject: [PATCH 1/6] enable disabling responsiveness of table --- _includes/tutorial_list.html | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/_includes/tutorial_list.html b/_includes/tutorial_list.html index 54262d242ac26..5716e689c1b35 100644 --- a/_includes/tutorial_list.html +++ b/_includes/tutorial_list.html @@ -1,6 +1,7 @@ {% assign page = include.page %} +{% assign responsive = include.responsive | default:true %} - +
{% if page.layout == 'event' and page.async != true %} @@ -21,7 +22,7 @@ {% endif %} - + {% assign subtopic_materials = include.sub[1].materials | default: include.sub %} {% for material in subtopic_materials %} @@ -64,7 +65,7 @@ {% endif %} -
+
- - +{% if responsive %} + +{% endif %} From 2de9f974c7fe7d5c94b7eed6098ad41000e126f2 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:16:57 +0200 Subject: [PATCH 2/6] SQUASH --- _layouts/event.html | 2 +- _layouts/learning-pathway.html | 2 +- _layouts/topic.html | 2 +- assets/css/main.scss | 25 ------------------------- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/_layouts/event.html b/_layouts/event.html index adb53e62382bd..f2273e628c3e4 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -125,7 +125,7 @@

{{ section.section }}

{% if section.tutorials %} {% assign material_list = site | convert_to_material_list: section.tutorials %} - {% include _includes/tutorial_list.html sub=material_list page=page %} + {% include _includes/tutorial_list.html sub=material_list page=page responsive=false %} {% endif %} {% endfor %} {% endif %} diff --git a/_layouts/learning-pathway.html b/_layouts/learning-pathway.html index d960728451327..47cca2e20d400 100644 --- a/_layouts/learning-pathway.html +++ b/_layouts/learning-pathway.html @@ -76,7 +76,7 @@

Editorial Board

Funders

This material was funded by:

{% assign funders = pathway.funding | sorted %} - {% include _includes/contributor-list.html contributors=funders badge=true %} + {% include _includes/funding-statement.md contributors=funders %} {% endif %} diff --git a/_layouts/topic.html b/_layouts/topic.html index e984a4acffcc6..b4ee1d46b338f 100644 --- a/_layouts/topic.html +++ b/_layouts/topic.html @@ -93,7 +93,7 @@

Contributors

Funders

This material was funded by:

{% assign funders_list_sorted = topic_material | identify_funders: site %} - {% include _includes/contributor-list.html contributors=funders_list_sorted badge=true %} + {% include _includes/funding-statement.html contributors=funders_list_sorted %} {% if topic.references %}

References

diff --git a/assets/css/main.scss b/assets/css/main.scss index dd825592b11e1..1a65685bb6018 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1719,31 +1719,6 @@ figure > a[target="_blank"]::after { content: unset; } -.tutorials-list { -/* Big */ -@media (min-width:768px) { - .duplicate { - display: none; - } -} - -/* Skinny */ -@media (max-width:767px) { - table.table.table-responsive { - display: inline-table; - } - tr th:not(:first-child) { - display: none; - } - tr td:not(:first-child) { - display: none; - }r - .duplicate { - display: unset; - } -} -} - // For the git-gat learning pathway boxes #git-gat-timeline { display: flex; From e59570fc1248925f5a8e8fa415c5594ff5b6e035 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:17:14 +0200 Subject: [PATCH 3/6] new responsiveness for events --- _layouts/event.html | 29 ++++++++++++++++++++++++++--- assets/css/main.scss | 29 ++++++++++++++++++----------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/_layouts/event.html b/_layouts/event.html index f2273e628c3e4..a3849d3f92d3f 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -29,8 +29,8 @@

{{ event.title }}

{% endif %} -
-
+
+
-
+
{{event.cover-image-alt | default: 'event logo' }} {% assign enddate = event.date_end | default: event.date_start %} @@ -470,4 +470,27 @@

Promote the Event

:target { scroll-margin-top: 24em; } + + +.zrow { + display: grid; + grid-template-rows: 1fr; + gap: 1em 1em; + grid-template-columns: repeat(4, 1fr); + grid-template-areas: + "Main Main Main Meta"; +} +@media (max-width: 768px) { + .zrow { + grid-template-columns: minmax(0, 1fr); + grid-template-areas: + "Meta" + "Main"; + } +} + +.zcol-md-9 { grid-area: Main; } +.zcol-md-3 { grid-area: Meta; } + + diff --git a/assets/css/main.scss b/assets/css/main.scss index 1a65685bb6018..011ade5ab0280 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1830,22 +1830,29 @@ section.event { .nav-item { margin-bottom: 0; padding-bottom: 0; - } - - button.nav-link{ - border: none; - background: none; - font-size: 1.2rem; - border-top-left-radius: 0; - border-top-right-radius: 0; + border: 1px solid transparent; &:hover { color: var(--hyperlink-hover); + border: 1px solid var(--hyperlink-hover); } - &.active { - background: var(--overview-color); - color: white; + button.nav-link{ + cursor: pointer; + background: none; + font-size: 1.2rem; + border-top-left-radius: 0; + border-top-right-radius: 0; + + &:hover { + color: var(--hyperlink-hover); + } + + &.active { + background: var(--overview-color); + color: white; + } } } + } From f0e44c6c032d8797fd398898904352c38ebac075 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:33:33 +0200 Subject: [PATCH 4/6] fix tab colours, card --- _layouts/event.html | 6 +++--- assets/css/main.scss | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/_layouts/event.html b/_layouts/event.html index a3849d3f92d3f..f3789c5370d19 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -144,7 +144,7 @@

Get set up for the course!

- Galaxy logo + Galaxy logo
@@ -174,7 +174,7 @@
Create a Galaxy Account
- TIaaS + cartoon of a person standing in front of a blackboard
@@ -208,7 +208,7 @@
Join Galaxy Training Group (TIaaS)
- Galaxy logo + cartoon of a person leaning against a laptop
diff --git a/assets/css/main.scss b/assets/css/main.scss index 011ade5ab0280..2aa4a4d870eea 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -710,17 +710,21 @@ blockquote { white-space: pre-wrap; } -.card:not(.setup-card){ +.card{ background: transparent; border: 1px solid var(--border-light); .card-title { - background: var(--brand-color); - border-bottom: 1px solid var(--border-light); - padding: 1.25rem; color: var(--brand-color-contrast); // margin-left: -15px; // BS has a 15px margin on cards, this makes the card title fill the card. // margin-right: -15px; } +} + +.card:not(.setup-card){ + .card-title { + background: var(--brand-color); + padding: 1.25rem; + } .card-body { padding: 0em; @@ -1827,6 +1831,8 @@ section.event { } .nav-tabs { + // Tabs default to a text colour that isn't overridden somewhere else. + .nav-item { margin-bottom: 0; padding-bottom: 0; @@ -1838,6 +1844,7 @@ section.event { } button.nav-link{ + color: var(--text-color); cursor: pointer; background: none; font-size: 1.2rem; @@ -1850,9 +1857,11 @@ section.event { &.active { background: var(--overview-color); + border: 1px solid var(--overview-color); color: white; } } } } + From 30cf643f0beb7bb002701854603e3ddd82a59c0c Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:33:52 +0200 Subject: [PATCH 5/6] rework funding-statement include --- _includes/funding-statement.md | 4 ++-- _layouts/event.html | 2 +- _layouts/learning-pathway.html | 2 +- _layouts/news.html | 2 +- _layouts/slides-plain.html | 2 +- _layouts/topic.html | 2 +- _layouts/tutorial_hands_on.html | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/funding-statement.md b/_includes/funding-statement.md index 5652781e554ae..4ab3130aa9b7f 100644 --- a/_includes/funding-statement.md +++ b/_includes/funding-statement.md @@ -1,10 +1,10 @@ -{% if include.contributions.funding %} +{% if include.funders %}

{{locale['references']| default: "Funding" }}

These individuals or organisations provided funding support for the development of this resource

-{% for id in include.contributions.funding %} +{% for id in include.funders %} {% assign name = site.data.contributors[id].name | default: id -%} {% assign pfo = site.data.funders[id] | default: site.data.organisations[id] | default: site.data.contributors[id] | default: nil %} diff --git a/_layouts/event.html b/_layouts/event.html index f3789c5370d19..dfffb80df6ab7 100644 --- a/_layouts/event.html +++ b/_layouts/event.html @@ -94,7 +94,7 @@

Organisers & Instructors

{% if event.contributions.funding %} - {% include _includes/funding-statement.md contributions=page.contributions %} + {% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} diff --git a/_layouts/learning-pathway.html b/_layouts/learning-pathway.html index 47cca2e20d400..fc94d03e5ee11 100644 --- a/_layouts/learning-pathway.html +++ b/_layouts/learning-pathway.html @@ -76,7 +76,7 @@

Editorial Board

Funders

This material was funded by:

{% assign funders = pathway.funding | sorted %} - {% include _includes/funding-statement.md contributors=funders %} + {% include _includes/funding-statement.md funders=funders %} {% endif %} diff --git a/_layouts/news.html b/_layouts/news.html index 8ebc0a8942b51..6b36b4d0f6c38 100644 --- a/_layouts/news.html +++ b/_layouts/news.html @@ -55,7 +55,7 @@

{{locale['references']| default: "References" }}

{% endif %} {% if page.contributions %} - {% include _includes/funding-statement.md contributions=page.contributions %} + {% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %}
diff --git a/_layouts/slides-plain.html b/_layouts/slides-plain.html index 24f310a3e30eb..107f0a9e1e57f 100644 --- a/_layouts/slides-plain.html +++ b/_layouts/slides-plain.html @@ -93,5 +93,5 @@

{{locale['references']| default: "References" }}

{% endif %} {% if page.contributions %} -{% include _includes/funding-statement.md contributions=page.contributions %} +{% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} diff --git a/_layouts/topic.html b/_layouts/topic.html index b4ee1d46b338f..44947345f3d45 100644 --- a/_layouts/topic.html +++ b/_layouts/topic.html @@ -93,7 +93,7 @@

Contributors

Funders

This material was funded by:

{% assign funders_list_sorted = topic_material | identify_funders: site %} - {% include _includes/funding-statement.html contributors=funders_list_sorted %} + {% include _includes/funding-statement.md funders=funders_list_sorted %} {% if topic.references %}

References

diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 1e9bd8a9bd9f8..1796f53e403a8 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -425,7 +425,7 @@

{{locale['citing-tutorial'] | default: "Citing this Tutorial"}}

{% if page.contributions %} - {% include _includes/funding-statement.md contributions=page.contributions %} + {% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} From 5141d883e78d0755ebc977ab64f9935247d779a4 Mon Sep 17 00:00:00 2001 From: Helena Rasche Date: Mon, 3 Jun 2024 15:38:18 +0200 Subject: [PATCH 6/6] fix funding, invert one image --- _includes/funding-statement.md | 5 ----- _layouts/learning-pathway.html | 4 ++-- _layouts/news.html | 4 ++++ _layouts/slides-plain.html | 5 +++++ _layouts/topic.html | 4 ++-- _layouts/tutorial_hands_on.html | 2 ++ assets/css/main.scss | 5 +++++ faqs/gtn/what-is-a-learning-pathway.md | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/_includes/funding-statement.md b/_includes/funding-statement.md index 4ab3130aa9b7f..e49a1933bcab5 100644 --- a/_includes/funding-statement.md +++ b/_includes/funding-statement.md @@ -1,8 +1,4 @@ {% if include.funders %} - {% endif %} diff --git a/_layouts/learning-pathway.html b/_layouts/learning-pathway.html index fc94d03e5ee11..bb45a2e156f53 100644 --- a/_layouts/learning-pathway.html +++ b/_layouts/learning-pathway.html @@ -73,8 +73,8 @@

Editorial Board

{% include _includes/contributor-list.html contributors=editorial_board badge=true %} {% if pathway.funding %} -

Funders

-

This material was funded by:

+

{{locale['references']| default: "Funding" }}

+

These individuals or organisations provided funding support for the development of this resource

{% assign funders = pathway.funding | sorted %} {% include _includes/funding-statement.md funders=funders %} {% endif %} diff --git a/_layouts/news.html b/_layouts/news.html index 6b36b4d0f6c38..ca4509081aefe 100644 --- a/_layouts/news.html +++ b/_layouts/news.html @@ -55,8 +55,12 @@

{{locale['references']| default: "References" }}

{% endif %} {% if page.contributions %} + {% if page.contributions.funding %} +

{{locale['references']| default: "Funding" }}

+

These individuals or organisations provided funding support for the development of this resource

{% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} + {% endif %}
diff --git a/_layouts/slides-plain.html b/_layouts/slides-plain.html index 107f0a9e1e57f..35b57e69fa44c 100644 --- a/_layouts/slides-plain.html +++ b/_layouts/slides-plain.html @@ -92,6 +92,11 @@

{{locale['references']| default: "References" }}

{% bibliography --cited %} {% endif %} + {% if page.contributions %} +{% if page.contributions.funding %} +

{{locale['references']| default: "Funding" }}

+

These individuals or organisations provided funding support for the development of this resource

{% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} +{% endif %} diff --git a/_layouts/topic.html b/_layouts/topic.html index 44947345f3d45..c6faba0883d46 100644 --- a/_layouts/topic.html +++ b/_layouts/topic.html @@ -90,8 +90,8 @@

Contributors

{% assign contributors_list_sorted = topic_material | identify_contributors: site %} {% include _includes/contributor-list.html contributors=contributors_list_sorted badge=true %} -

Funders

-

This material was funded by:

+

{{locale['references']| default: "Funding" }}

+

These individuals or organisations provided funding support for the development of this resource

{% assign funders_list_sorted = topic_material | identify_funders: site %} {% include _includes/funding-statement.md funders=funders_list_sorted %} diff --git a/_layouts/tutorial_hands_on.html b/_layouts/tutorial_hands_on.html index 1796f53e403a8..5b28a5ca802fa 100644 --- a/_layouts/tutorial_hands_on.html +++ b/_layouts/tutorial_hands_on.html @@ -424,6 +424,8 @@

{{locale['citing-tutorial'] | default: "Citing this Tutorial"}}

+

{{locale['references']| default: "Funding" }}

+

These individuals or organisations provided funding support for the development of this resource

{% if page.contributions %} {% include _includes/funding-statement.md funders=page.contributions.funding %} {% endif %} diff --git a/assets/css/main.scss b/assets/css/main.scss index 2aa4a4d870eea..05e38a016b952 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -1865,3 +1865,8 @@ section.event { } +body[data-brightness="dark"] { + img.invert-safe { + filter: invert(1); + } +} diff --git a/faqs/gtn/what-is-a-learning-pathway.md b/faqs/gtn/what-is-a-learning-pathway.md index 9965e6f2f61f1..bfd9c3bad717a 100644 --- a/faqs/gtn/what-is-a-learning-pathway.md +++ b/faqs/gtn/what-is-a-learning-pathway.md @@ -7,7 +7,7 @@ contributors: [shiltemann] ---
-A graphic depicting a winding path from a start symbol to a trophy, with tutorials along the way +A graphic depicting a winding path from a start symbol to a trophy, with tutorials along the way
We recommend you follow the tutorials in the order presented on this page. They have been selected to fit together and build up your knowledge step by step. If a lesson has both slides and a tutorial, we recommend you start with the slides, then proceed with the tutorial.