Skip to content

Commit 52c9d61

Browse files
authored
Add: learn page and new tutorial links
2 parents b18e8bf + c884306 commit 52c9d61

File tree

14 files changed

+133
-40
lines changed

14 files changed

+133
-40
lines changed

.github/workflows/build-site.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,6 @@ jobs:
3737
build_only: true
3838
build_dir: _site
3939

40-
- name: Set up Ruby
41-
uses: ruby/setup-ruby@v1
42-
with:
43-
ruby-version: 3
44-
- name: Install gems
45-
run: |
46-
gem install html-proofer
47-
gem install typhoeus
48-
49-
- name: Cache HTMLProofer
50-
id: cache-htmlproofer
51-
uses: actions/cache@v4
52-
with:
53-
path: tmp/.htmlproofer
54-
key: ${{ runner.os }}-htmlproofer
55-
5640
- name: Check links with lychee
5741
id: lychee
5842
uses: lycheeverse/lychee-action@v1.9.0
@@ -61,10 +45,11 @@ jobs:
6145
env:
6246
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
6347

64-
- name: Run htmlproofer
65-
run: |
66-
ruby scripts/htmlproofer.rb
67-
ls
68-
69-
- name: Error log
70-
run: cat html_proofer_errors.txt
48+
- name: Check HTML using htmlproofer
49+
uses: chabad360/htmlproofer@v2
50+
with:
51+
directory: "_site"
52+
arguments: |
53+
--ignore-urls "https://www.github.com,https://fonts.googleapis.com,https://fonts.gstatic.com,_site/_posts/README/index.html"
54+
--ignore-files "/.+\/_posts\/README.md"
55+
--ignore-status-codes "0, 200, 403, 429, 503, 999"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ source "https://rubygems.org"
33
gem "github-pages", group: :jekyll_plugins
44
gem "jekyll-include-cache"
55
gem "webrick"
6-
gem "html-proofer", "~> 3.0"
6+
gem "html-proofer"

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ exclude:
188188
- tmp
189189
- /docs # ignore Minimal Mistakes /docs
190190
- /test # ignore Minimal Mistakes /test
191+
- styles/* # text spelling check
191192
keep_files:
192193
- .git
193194
- .svn

_data/navigation.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,15 @@ main:
2828
- title: "Package Guidebook"
2929
url: "https://www.pyopensci.org/python-package-guide/"
3030
icon: "fas fa-external-link-alt"
31-
- title: "Blog"
32-
url: "/blog/index.html"
31+
- title: "Learn"
32+
sub-nav:
33+
- title: Tutorials & Resources
34+
url: "learn.html"
35+
- title: Blog
36+
url: "/blog/"
37+
- title: Ask a question
38+
url: "https://pyopensci.discourse.group/"
39+
icon: "fa-brands fa-discourse"
3340
- title: "Community"
3441
sub-nav:
3542
- title: "Our Community"

_includes/masthead.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<ul class="nav__links">
1515
{%- for alink in site.data.navigation.main -%}
16+
<!-- If there are sub links drop down nav to display -->
1617
{% if alink.sub-nav %}
17-
<!-- If there is sub nav to display -->
1818
<li class="dropdown">
1919
<button class="dropbtn" tabindex="0" aria-expanded="false">{{ alink.title }} <i class="fas fa-caret-down"></i>
2020
</button>

_pages/home.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ peer-review:
4040
btn_class: btn--inverse
4141
---
4242

43-
4443
{% include feature_row id="mission" type="center" %}
4544

4645
## Peer review of Python software to support open science

_pages/learn.md

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
---
2+
layout: splash
3+
permalink: /learn.html
4+
title: "Python Tutorials & Learning Resources for Scientists"
5+
classes: flowing
6+
header:
7+
overlay_image: images/headers/pyopensci-learn-header.png
8+
overlay_filter: 0.3
9+
scientists:
10+
- image_path: images/pyopensci-people-at-computer.jpg
11+
alt: "A pencil sketch of a round table with people sitting around it from different backgrounds working on laptops and also writing together."
12+
excerpt: "Our catalog of vetted open source tools makes it easier for scientists to find the trusted tools that they need to develop their open science workflows."
13+
title: "Help scientists find the open science tools that they need"
14+
url: https://www.pyopensci.org/python-packages.html
15+
btn_label: View our growing list of accepted scientific Python packages
16+
btn_class: btn--primary
17+
overview:
18+
- excerpt: "pyOpenSci creates resources to help you navigate the Python packaging ecosystem with ease. Our materials are community developed and go through extensive technical and pedagogical review."
19+
development:
20+
- image_path: images/pyopensci-learn-community-created.png
21+
alt: "An image showing a bunch of hands holding up a sign that says Community Developed. the background is dark purple with a few green decorative items."
22+
title: "Our development process: Community-developed Python tutorials for scientists"
23+
excerpt: "Our tutorials are created through a multi-stage community review process.
24+
25+
* Tutorials are developed by the pyOpenSci team or community members.
26+
27+
* Tutorials are reviewed by tool maintainers to ensure ideas and concepts are accurate.
28+
29+
* Before publication, tutorials then go through several rounds of community review for accuracy, usability and accessibility."
30+
whats_next:
31+
- image_path: images/pyopensci-learn-github-collaboration.png
32+
alt: "A graphic with a light yellow background that says essential collaboration skills for scientists - using GitHub. On the right there is a man and a woman sitting at a tall table with laptops working."
33+
excerpt: "Through the [Better Software for Science Fellowship](https://bssw.io/pages/bssw-fellowship-program) we will be developing lessons focused on teaching core GitHub collaboration skills needed for both contributing to open source software and for working in an open science team environment.
34+
35+
36+
**Stay up to date with course development and announcements in [our Discourse community](https://pyopensci.discourse.group/), as well as on [Fosstodon](https://fosstodon.org/@pyOpenSci) and [LinkedIn](https://www.linkedin.com/company/pyopensci/)**"
37+
title: "What's next: Collaborative GitHub for Scientists"
38+
toc: false
39+
---
40+
41+
{% include feature_row id="overview" type="center" %}
42+
43+
<div class="pyos-section purple">
44+
<div class="content" markdown="1">
45+
46+
{% include feature_row id="development" type="left" %}
47+
48+
</div>
49+
</div>
50+
51+
{% include div_purple_bottom.html %}
52+
53+
<div class="pyos-section">
54+
<div class="content" markdown="1">
55+
<!-- Feature wrapper has a clear both -->
56+
<div class="feature__wrapper padded" markdown="1">
57+
58+
## Start learning: Beginner-friendly Python packaging tutorials
59+
60+
Beginner-friendly Python packaging tutorials that will take you through
61+
the full process of creating a Python package, following modern best
62+
practices.
63+
64+
<div class="tutorial__container">
65+
{% for atutorial in site.tutorials %}
66+
{% include tutorial-grid.html %}
67+
{% endfor %}
68+
</div>
69+
70+
71+
</div>
72+
</div>
73+
</div>
74+
75+
{% include div_purple_top.html %}
76+
77+
<div class="pyos-section purple">
78+
<div class="content" markdown="1">
79+
80+
{% include feature_row id="whats_next" type="left" %}
81+
</div>
82+
</div>
83+
84+
{% include div_purple_bottom.html %}

_sass/minimal-mistakes/_base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ h6 {
3838
h1 {
3939
margin-top: 0;
4040
font-size: $h-size-1;
41+
font-weight: 200!important;
4142
}
4243

4344
h2 {

_sass/minimal-mistakes/_pyos-cards.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,22 @@
3232
padding: 1em;
3333
}
3434
h4.title {
35-
color: rgb(84, 38, 104)!important;
35+
color: #fff!important;
3636
font-size: 1.3em;
3737
margin: 0;
38+
font-family: $sans-serif;
39+
font-weight: 300;
3840
}
3941
.title-block {
40-
background-color: #F7F2E2;
42+
background-color: $pyos-darkpurple;
4143
display: flex;
42-
height: auto;
44+
height: 7em;
4345
padding: 1.2em;
4446
border-bottom: #555 2px solid;
47+
border-top-left-radius: 10px;
48+
border-top-right-radius: 10px;
49+
border-bottom-left-radius: 0;
50+
border-bottom-right-radius: 0;
4551
}
4652

4753
img {

_sass/minimal-mistakes/_pyos-flowing-page.scss

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,6 @@ svg.bottom {
1818
left: 0;
1919
}
2020

21-
// .divider-purple::after {
22-
// content: "";
23-
// display: block; /* Make it a block-level element to appear below the previous content */
24-
// clear: both; /* Ensure the pseudo-element clears the floated content above it */
25-
// width: 100%;
26-
// height: auto; /* Adjust the height as needed for your divider */
27-
// background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.042 0.1 180.142 24.439"><g transform="matrix(1, 0, 0, 1, -18.298843383789062, -77.97396087646484)"><path style="opacity: 0.9; fill: rgb(189, 182, 214);" d="M 31.874 78.826 L 191.94 77.978 L 192.165 98.254 C 192.165 98.254 160.131 84.016 132.538 85.529 C 110.196 86.754 77.759 95.255 77.759 95.255 C 77.759 95.255 55.729 98.884 43.288 93.365 C 30.846 87.847 31.874 78.826 31.874 78.826 Z"/><path style="fill: rgb(226, 223, 237);" d="M 18.128 77.905 L 198.538 77.812 L 198.581 102.395 C 198.581 102.395 155.475 74.57 125.105 82.707 C 94.736 90.844 93.457 92.674 77.476 95.264 C 59.89 98.114 35.933 103.412 24.039 94.23 C 21.427 92.213 18.428 89.779 18.362 86.673 C 18.133 75.848 18.128 77.905 18.128 77.905 Z"/></g></svg>') no-repeat center center;
28-
// background-size: contain;
29-
// }
3021

3122
.flowing div#main {
3223
max-width: 100%;
@@ -45,3 +36,18 @@ svg.bottom {
4536
max-width: 900px;
4637
}
4738
}
39+
40+
// Add padding to non feature wrapper sections
41+
.feature__wrapper.padded {
42+
padding: 0 30px;
43+
44+
}
45+
46+
.page__content .feature__wrapper.padded {
47+
& p {
48+
max-width: fit-content;
49+
}
50+
& h2 {
51+
font-size: 2rem;
52+
}
53+
}

0 commit comments

Comments
 (0)