Skip to content

Commit 6eaba8d

Browse files
authored
enh: style cleanup (#772)
* enh: style cleanup * enh: donate button * enh: cards smaller * enh: holy hell css overrides * Update _data/contributors.yml
1 parent ed17ed5 commit 6eaba8d

File tree

16 files changed

+338
-126
lines changed

16 files changed

+338
-126
lines changed

_data/contributors.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
github_username: willingc
135135
github_image_id: 2680980
136136
title: Advisory Council
137-
sort:
137+
sort: 2
138138
bio: Project Jupyter, nteract, and CPython core developer@python | @jupyter
139139
| @jupyterhub | @ipython | @nteract | @pysplash
140140
organization: Willing Consulting
@@ -262,7 +262,7 @@
262262
github_username: InessaPawson
263263
github_image_id: 43481325
264264
title: Advisory Council
265-
sort:
265+
sort: 1
266266
bio: NumPy Contributor Experience LeadOpen Source Program Manager at
267267
OpenTeams Incubator
268268
organization: '@numpy'
@@ -324,7 +324,7 @@
324324
title:
325325
- Advisory Council
326326
- Emeritus editor
327-
sort: 2
327+
sort:
328328
bio: Open Source Developer
329329
organization: xmnlab
330330
date_added: '2019-10-15'
@@ -369,7 +369,7 @@
369369
title:
370370
- Advisory Council
371371
- Editor
372-
sort: 2
372+
sort:
373373
bio: Filipe Fernandes is a Physical oceanographer by training, turned
374374
research software engineer, and a software packager hobbyist.
375375
organization:
@@ -495,7 +495,7 @@
495495
github_username: yuvipanda
496496
github_image_id: 30430
497497
title: Advisory Council
498-
sort:
498+
sort: 2
499499
bio:
500500
organization: '@2i2c-org'
501501
date_added: '2023-01-18'
@@ -527,7 +527,7 @@
527527
github_username: cmillion
528528
github_image_id: 1483210
529529
title: Advisory Council
530-
sort:
530+
sort: 0
531531
bio:
532532
organization:
533533
date_added: '2023-11-20'
@@ -643,15 +643,15 @@
643643
github_image_id: 1662261
644644
title:
645645
- Emeritus Editor in Chief
646-
- Editor
646+
- Emeritus Editor
647647
- Peer review triage
648-
sort: 2
648+
sort:
649649
bio:
650650
organization:
651651
date_added: '2023-01-24'
652652
deia_advisory: false
653-
editorial_board: true
654-
emeritus_editor: false
653+
editorial_board: false
654+
emeritus_editor: true
655655
advisory: false
656656
emeritus_advisory: false
657657
twitter:
@@ -803,14 +803,14 @@
803803
github_image_id: 11004857
804804
title:
805805
- Emeritus Editor in Chief
806-
- Editor
806+
- EmeritusEditor
807807
sort: 2
808808
bio:
809809
organization:
810810
date_added: '2023-02-04'
811811
deia_advisory: false
812-
editorial_board: true
813-
emeritus_editor: false
812+
editorial_board: false
813+
emeritus_editor: true
814814
advisory: false
815815
emeritus_advisory: false
816816
twitter:
@@ -4395,9 +4395,10 @@
43954395
github_username: eliotwrobson
43964396
github_image_id: 1345068
43974397
title:
4398+
- Peer Review Lead
43984399
- Editor
43994400
- Emeritus Editor in Chief
4400-
sort: 1
4401+
sort: 0
44014402
bio: I'm just this guy, you know?
44024403
organization: UIUC
44034404
date_added: '2023-09-11'
@@ -5405,7 +5406,7 @@
54055406
title:
54065407
- Editor
54075408
- Editor in Chief
5408-
sort: 0
5409+
sort: 1
54095410
bio:
54105411
organization:
54115412
date_added: '2023-12-21'

_data/navigation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ main:
5656
sub-nav:
5757
- title: "Volunteer"
5858
url: "/volunteer.html"
59-
- title: "Donate"
60-
icon: "fas fa-external-link-alt"
61-
url: "https://fnd.us/pyopensci_2024"
59+
- title: "Donate"
60+
url: "https://fnd.us/pyopensci_2024"
61+
is_button: true

_includes/masthead.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
{% if alink.sub-nav %}
1818
<li class="dropdown">
1919
<button class="dropbtn" tabindex="0" aria-expanded="false">
20-
{{ alink.title }} <i class="fas fa-caret-down"></i>
20+
<span class="dropbtn-text">{{ alink.title }}</span>
21+
<i class="fas fa-caret-down dropbtn-arrow"></i>
2122
</button>
2223
<ul class="dropdown-content">
2324
{% for subnav in alink.sub-nav %}
@@ -34,6 +35,12 @@
3435
{% endfor %}
3536
</ul>
3637
</li>
38+
{% elsif alink.is_button %}
39+
<li>
40+
<a href="{{ alink.url }}" class="btn btn--primary donate-btn" target="_blank" rel="noopener noreferrer">
41+
{{ alink.title }}
42+
</a>
43+
</li>
3744
{% else %}
3845
<li>
3946
<a href="{{ alink.url | relative_url }}" class="hover-underline">

_pages/contributors.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ by an expert team of volunteer advisory members who help steer the direction of
2222

2323
{% assign advisory_sorted = site.data.contributors | where:"board",true | sort: 'sort' %}
2424

25-
<div class="grid">
25+
<div class="grid executive-council-grid">
2626
{% for aperson in advisory_sorted %}
2727
{% include people-grid.html %}
2828
{% endfor %}
@@ -39,14 +39,14 @@ pyOpenSci advisory council members are volunteer experts in the scientific
3939
Python open source space who provide high-level guidance on the development of
4040
the organization.
4141

42-
{% assign advisory_working = site.data.contributors | where:"advisory",true | sort: 'sort' %}
42+
{% assign advisory_unsorted = site.data.contributors | where:"advisory",true %}
43+
{% assign advisory_with_sort = advisory_unsorted | where_exp:"item","item.sort != nil" | sort: 'sort' %}
44+
{% assign advisory_without_sort = advisory_unsorted | where_exp:"item","item.sort == nil" %}
45+
{% assign advisory_working = advisory_with_sort | concat: advisory_without_sort %}
4346

44-
<div class="grid">
47+
<div class="grid advisory-council-grid">
4548
{% for aperson in advisory_working %}
46-
{% if aperson.advisory %}
47-
{{ aperson.person_name }}
48-
{% include people-grid.html %}
49-
{% endif %}
49+
{% include people-grid.html %}
5050
{% endfor %}
5151
</div>
5252

@@ -61,7 +61,7 @@ leadership councils.
6161

6262
{% assign emeritus_advisory = site.data.contributors | where:"emeritus_advisory", true %}
6363

64-
<div class="grid">
64+
<div class="grid emeritus-council-grid">
6565
{% for aperson in emeritus_advisory %}
6666
{{ aperson.person_name }}
6767
{% include people-grid.html %}
@@ -77,12 +77,11 @@ leadership councils.
7777
{: .clearall }
7878
{: .clearall }
7979

80-
{% assign editorial = site.data.contributors | where:"editorial_board", true %}
80+
{% assign editorial = site.data.contributors | where:"editorial_board", true | sort: 'sort' %}
8181

82-
<div class="grid">
82+
<div class="grid advisory-council-grid">
8383
{% for aperson in editorial %}
84-
{{ aperson.person_name }}
85-
{% include people-grid.html %}
84+
{% include people-grid.html %}
8685
{% endfor %}
8786
</div>
8887

_pages/volunteer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pyOpenSci has a diverse and vibrant community of pythonistas! To date,
118118
**{{ total_people }}** wonderful people have contributed to pyOpenSci.
119119

120120
<div class="entries-grid">
121-
{% for aperson in new_ppl limit:4 %}
121+
{% for aperson in new_ppl limit:3 %}
122122
{% include people-grid.html %}
123123
{% endfor %}
124124
</div>

_sass/minimal-mistakes/_archive.scss

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,19 @@
6565
/* remove border*/
6666
.page__content {
6767
.archive__item-title {
68-
//margin-top: 1em;
6968
border-bottom: none;
7069
}
7170
}
7271

7372
.archive__item-excerpt {
7473
margin-top: 0;
74+
margin-bottom: 0;
7575
font-size: $type-size-5;
7676

7777
p {
7878
max-width: 95%;
79+
margin-top: 0;
80+
margin-bottom: 0;
7981
}
8082

8183
& + p {
@@ -248,8 +250,19 @@ h2.archive__item-title {
248250

249251
.feature__wrapper {
250252
@include clearfix();
251-
margin-bottom: .02em; //used to be 2em
252-
// border-bottom: 1px solid $border-color;
253+
margin-bottom: 0.5em;
254+
margin-top: 0.5em;
255+
256+
// Further reduce spacing when followed by pyos-section
257+
+ .pyos-section {
258+
margin-top: 0;
259+
padding-top: 0;
260+
}
261+
262+
// Reduce spacing when it's the first element after header
263+
.page__content > &:first-child {
264+
margin-top: 0.5em;
265+
}
253266

254267
h2 {
255268
max-width: 100%;
@@ -258,6 +271,17 @@ h2.archive__item-title {
258271
.archive__item-title {
259272
margin-bottom: 0;
260273
}
274+
275+
// Reduce spacing for centered feature items (excerpts)
276+
.feature__item--center {
277+
margin-top: 0;
278+
margin-bottom: 0;
279+
280+
.archive__item-excerpt {
281+
margin-top: 0;
282+
margin-bottom: 0;
283+
}
284+
}
261285
}
262286

263287
.feature__item {
@@ -398,16 +422,27 @@ h2.archive__item-title {
398422
width: 100%;
399423
clear: both;
400424
font-size: 1.125em;
425+
margin-top: 0;
426+
margin-bottom: 0;
401427

402428
.archive__item {
403429
float: left;
404430
width: 100%;
431+
margin: 0;
432+
padding: 0;
405433
}
406434

407435
.archive__item-teaser {
408436
margin-bottom: 2em;
409437
}
410438

439+
.archive__item-body {
440+
margin-top: 0;
441+
margin-bottom: 0;
442+
padding-top: 0;
443+
padding-bottom: 0;
444+
}
445+
411446
a.btn::before {
412447
content: '';
413448
position: absolute;

0 commit comments

Comments
 (0)