Skip to content

Commit 72df243

Browse files
alanocallaghanalanocallaghan
committed
Merge branch 'main' of github.com:qupath/qupath.github.io into bundle-update
2 parents 35dcd27 + f60c3cd commit 72df243

File tree

13 files changed

+74
-41
lines changed

13 files changed

+74
-41
lines changed

‎Gemfile.lock‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,21 @@ GEM
3939
ethon (0.16.0)
4040
ffi (>= 1.15.0)
4141
eventmachine (1.2.7)
42-
eventmachine (1.2.7-x64-mingw32)
4342
execjs (2.10.0)
4443
faraday (2.13.1)
4544
faraday-net_http (>= 2.0, < 3.5)
4645
json
4746
logger
4847
faraday-net_http (3.4.1)
4948
net-http (>= 0.5.0)
50-
ffi (1.17.2)
49+
ffi (1.17.2-aarch64-linux-gnu)
50+
ffi (1.17.2-aarch64-linux-musl)
51+
ffi (1.17.2-arm-linux-gnu)
52+
ffi (1.17.2-arm-linux-musl)
53+
ffi (1.17.2-arm64-darwin)
54+
ffi (1.17.2-x86_64-darwin)
55+
ffi (1.17.2-x86_64-linux-gnu)
56+
ffi (1.17.2-x86_64-linux-musl)
5157
forwardable-extended (2.6.0)
5258
gemoji (4.1.0)
5359
github-pages (232)
@@ -229,21 +235,29 @@ GEM
229235
rb-inotify (~> 0.9, >= 0.9.10)
230236
logger (1.6.6)
231237
mercenary (0.3.6)
232-
mini_portile2 (2.8.9)
233238
minima (2.5.1)
234239
jekyll (>= 3.5, < 5.0)
235240
jekyll-feed (~> 0.9)
236241
jekyll-seo-tag (~> 2.1)
237242
minitest (5.25.5)
238243
net-http (0.6.0)
239244
uri
240-
nokogiri (1.18.8)
241-
mini_portile2 (~> 2.8.2)
245+
nokogiri (1.18.8-aarch64-linux-gnu)
246+
racc (~> 1.4)
247+
nokogiri (1.18.8-aarch64-linux-musl)
248+
racc (~> 1.4)
249+
nokogiri (1.18.8-arm-linux-gnu)
250+
racc (~> 1.4)
251+
nokogiri (1.18.8-arm-linux-musl)
252+
racc (~> 1.4)
253+
nokogiri (1.18.8-arm64-darwin)
242254
racc (~> 1.4)
243255
nokogiri (1.18.8-x86_64-darwin)
244256
racc (~> 1.4)
245257
nokogiri (1.18.8-x86_64-linux-gnu)
246258
racc (~> 1.4)
259+
nokogiri (1.18.8-x86_64-linux-musl)
260+
racc (~> 1.4)
247261
octokit (4.25.1)
248262
faraday (>= 1, < 3)
249263
sawyer (~> 0.9)
@@ -279,9 +293,14 @@ GEM
279293
webrick (1.9.1)
280294

281295
PLATFORMS
282-
x64-mingw32
283-
x86_64-darwin-21
284-
x86_64-linux
296+
aarch64-linux-gnu
297+
aarch64-linux-musl
298+
arm-linux-gnu
299+
arm-linux-musl
300+
arm64-darwin
301+
x86_64-darwin
302+
x86_64-linux-gnu
303+
x86_64-linux-musl
285304

286305
DEPENDENCIES
287306
github-pages (>= 207)

‎_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ repository: qupath/qupath.github.io
99
collections:
1010
slides:
1111
_hide_content: true
12+
sort_by: priority

‎_includes/footer.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<footer>
33
<p class="footer-text">{{page.footer-1 }}
44
<p class="footer-text">{{page.footer-2 }}
5+
<p class="footer-text">{{page.footer-3 }}
56
</p>
67
<hr>
78
</hr>

‎_includes/slideshow.html‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<!-- Slideshow component -->
22
<div class="slideshow-container standard-component">
33
<!-- Full-width images with number and caption text -->
4-
{% for slide in site.slides %}
4+
5+
{% assign slides_list = site.slides | sort:"priority" %}
6+
{% for slide in slides_list %}
7+
{% unless slide.hide %}
58
<div class="mySlides fade">
69
<div class="slide">
710
<div class="slide-text {{ slide.slide-text-class }}">
@@ -11,6 +14,7 @@ <h2>{{slide.slide-title }}</h2>
1114
<img src="{{ slide.slide-img }}" class="{{ slide.slide-img-class }}" alt="">
1215
</div>
1316
</div>
17+
{% endunless %}
1418
{% endfor %}
1519

1620
<!-- Next and previous buttons -->
@@ -22,9 +26,9 @@ <h2>{{slide.slide-title }}</h2>
2226
<br>
2327
<!-- The dots/circles -->
2428
<div style="text-align:center">
25-
<span class="dot" onclick="currentSlide(1)" tabindex="0"></span>
26-
<span class="dot" onclick="currentSlide(2)" tabindex="0"></span>
27-
<span class="dot" onclick="currentSlide(3)" tabindex="0"></span>
28-
<span class="dot" onclick="currentSlide(4)" tabindex="0"></span>
29-
<span class="dot" onclick="currentSlide(5)" tabindex="0"></span>
30-
</div>
29+
{% for slide in site.slides | sort:"priority" | reversed %}
30+
{% unless slide.hide %}
31+
<span class="dot" onclick="currentSlide({{ forloop.index }})" tabindex="0"></span>
32+
{% endunless %}
33+
{% endfor %}
34+
</div>

‎_sass/_base.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
min-width: 330px;
113113
margin-bottom: 50px;
114114
border-radius: 0px 0px 10px 10px;
115-
background-color: var(--banner-red);
115+
background-color: var(--banner-blue);
116116
}
117117

118118
div.news-banner-text {

_slides/slide4.md renamed to _slides/annotate-faster.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ slide-title: Annotate faster
33
slide-content: QuPath has lots of tricks to annotate images quickly. See them in action in this <a href="https://twitter.com/petebankhead/status/1295965136646176768?s=20 t=ETG2R8JKrhtT-kSZdW-Cnw" target=blank >annotation tweetorial</a>.
44
slide-img: /assets/images/slideshow/annotation-snapping.jpg
55
slide-img-class: screenshot-img
6-
---
6+
priority: 5
7+
---

slide_archive/slide4.md renamed to _slides/bioimage-book.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
slide-title: Understand images
33
slide-content: Learn the core ideas behind analyzing images from QuPath’s creator, in the new interactive handbook <a href="https://bioimagebook.github.io/README.html" target=blank>Introduction to Bioimage Analysis</a>.
44
slide-img: /assets/images/slideshow/pete-teaching.png
5-
---
5+
priority: 6
6+
hide: true
7+
---

_slides/slide2.md renamed to _slides/get-started.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ slide-title: Get started
33
slide-content: See how QuPath can help visualize & analyze complex images with our step-by-step guides on <a href="https://qupath.readthedocs.io/en/stable/" target=blank>ReadTheDocs</a>.
44
slide-img: /assets/images/slideshow/qupath-getting-started.png
55
slide-img-class: screenshot-img
6-
---
6+
priority: 3
7+
---

_slides/slide3.md renamed to _slides/learn-more.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ slide-content: Dive deeper into what QuPath can do by checking out the tutorials
44
slide-img: /assets/images/slideshow/qupath-youtube.png
55
slide-img-class: inverse screenshot-img
66
slide-text-class: inverse-text
7-
---
7+
priority: 4
8+
---

‎_slides/slide1.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)