Skip to content

Commit 0dd2f19

Browse files
TimOsahenruTimOsahenru
committed
Fixed merge conflict
2 parents 5e5dfd7 + 7ea4110 commit 0dd2f19

File tree

10 files changed

+184
-67
lines changed

10 files changed

+184
-67
lines changed

‎Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ group :jekyll_plugins do
99
gem "github-pages"
1010
gem "jekyll-remote-theme"
1111
gem "jekyll-feed"
12+
gem "jekyll-paginate"
1213
end
1314

1415
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

‎Gemfile.lock

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GEM
1818
public_suffix (>= 2.0.2, < 7.0)
1919
base64 (0.2.0)
2020
benchmark (0.4.0)
21-
bigdecimal (3.1.8)
21+
bigdecimal (3.1.9)
2222
coffee-script (2.4.1)
2323
coffee-script-source
2424
execjs
@@ -45,16 +45,16 @@ GEM
4545
logger
4646
faraday-net_http (3.4.0)
4747
net-http (>= 0.5.0)
48-
ffi (1.17.0-aarch64-linux-gnu)
49-
ffi (1.17.0-aarch64-linux-musl)
50-
ffi (1.17.0-arm-linux-gnu)
51-
ffi (1.17.0-arm-linux-musl)
52-
ffi (1.17.0-arm64-darwin)
53-
ffi (1.17.0-x86-linux-gnu)
54-
ffi (1.17.0-x86-linux-musl)
55-
ffi (1.17.0-x86_64-darwin)
56-
ffi (1.17.0-x86_64-linux-gnu)
57-
ffi (1.17.0-x86_64-linux-musl)
48+
ffi (1.17.1-aarch64-linux-gnu)
49+
ffi (1.17.1-aarch64-linux-musl)
50+
ffi (1.17.1-arm-linux-gnu)
51+
ffi (1.17.1-arm-linux-musl)
52+
ffi (1.17.1-arm64-darwin)
53+
ffi (1.17.1-x86-linux-gnu)
54+
ffi (1.17.1-x86-linux-musl)
55+
ffi (1.17.1-x86_64-darwin)
56+
ffi (1.17.1-x86_64-linux-gnu)
57+
ffi (1.17.1-x86_64-linux-musl)
5858
forwardable-extended (2.6.0)
5959
gemoji (4.1.0)
6060
github-pages (232)
@@ -236,24 +236,32 @@ GEM
236236
rb-inotify (~> 0.9, >= 0.9.10)
237237
logger (1.6.4)
238238
mercenary (0.3.6)
239+
mini_portile2 (2.8.8)
239240
minima (2.5.1)
240241
jekyll (>= 3.5, < 5.0)
241242
jekyll-feed (~> 0.9)
242243
jekyll-seo-tag (~> 2.1)
243244
minitest (5.25.4)
244245
net-http (0.6.0)
245246
uri
246-
nokogiri (1.17.2-aarch64-linux)
247+
nokogiri (1.18.1)
248+
mini_portile2 (~> 2.8.2)
247249
racc (~> 1.4)
248-
nokogiri (1.17.2-arm-linux)
250+
nokogiri (1.18.1-aarch64-linux-gnu)
249251
racc (~> 1.4)
250-
nokogiri (1.17.2-arm64-darwin)
252+
nokogiri (1.18.1-aarch64-linux-musl)
251253
racc (~> 1.4)
252-
nokogiri (1.17.2-x86-linux)
254+
nokogiri (1.18.1-arm-linux-gnu)
253255
racc (~> 1.4)
254-
nokogiri (1.17.2-x86_64-darwin)
256+
nokogiri (1.18.1-arm-linux-musl)
255257
racc (~> 1.4)
256-
nokogiri (1.17.2-x86_64-linux)
258+
nokogiri (1.18.1-arm64-darwin)
259+
racc (~> 1.4)
260+
nokogiri (1.18.1-x86_64-darwin)
261+
racc (~> 1.4)
262+
nokogiri (1.18.1-x86_64-linux-gnu)
263+
racc (~> 1.4)
264+
nokogiri (1.18.1-x86_64-linux-musl)
257265
racc (~> 1.4)
258266
octokit (4.25.1)
259267
faraday (>= 1, < 3)
@@ -309,6 +317,7 @@ DEPENDENCIES
309317
github-pages
310318
jekyll
311319
jekyll-feed
320+
jekyll-paginate
312321
jekyll-remote-theme
313322
jemoji
314323
tzinfo-data

‎_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ plugins:
6060
- jemoji
6161
- jekyll-feed
6262
- jekyll-sitemap
63+
- jekyll-paginate
6364
# - jekyll-seo-tag
6465
# - jekyll-redirect-from
6566
# - jekyll-remote-theme
@@ -111,3 +112,6 @@ defaults:
111112
# Set to `true` to show excerpts on the homepage.
112113
#
113114
show_excerpts: true
115+
116+
paginate: 5
117+
paginate_path: "/blog/page:num/"

‎_data/foundational_supporters.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"2025": [],
3+
"2024": [
4+
"Albert Sweigart",
5+
"Angela Andrews",
6+
"Angie Byron",
7+
"Deb Nicholson",
8+
"Erik Johnson",
9+
"Frank Wiles",
10+
"Jacqueline Kazil",
11+
"Jannis Leidel",
12+
"Jonathan Banafato",
13+
"Joseph Bannerman",
14+
"Josh Schneider",
15+
"Julia Evans",
16+
"Kevin Miller",
17+
"Lazouich Ford",
18+
"Loren Arthur",
19+
"Melanie Arbor",
20+
"Mike Fiedler",
21+
"Ngazetungue Muheue",
22+
"Philip James",
23+
"Seth Larson",
24+
"Tim Schilling",
25+
"Vance Arocho"
26+
]
27+
}

‎_includes/posts.html

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,28 @@ <h3>
3030
</div>
3131

3232
{% if site.paginate %}
33-
<div class="pager">
34-
<ul class="pagination">
33+
<div class="pagination">
3534
{%- if paginator.previous_page %}
36-
<li><a href="{{ paginator.previous_page_path | relative_url }}" class="previous-page">{{ paginator.previous_page }}</a></li>
35+
<a href="{{ paginator.previous_page_path | relative_url }}" class="prev">&larr; Prev</a>
3736
{%- else %}
38-
<li><div class="pager-edge">•</div></li>
37+
<span class="disabled prev">&larr; Prev</span>
3938
{%- endif %}
40-
<li><div class="current-page">{{ paginator.page }}</div></li>
39+
40+
{%- for page in (1..paginator.total_pages) %}
41+
{%- if page == paginator.page %}
42+
<span class="current">{{ page }}</span>
43+
{%- else %}
44+
<a href="{{ paginator.previous_page_path | relative_url | replace: paginator.page, page }}" class="page">{{ page }}</a>
45+
{%- endif %}
46+
{%- endfor %}
47+
4148
{%- if paginator.next_page %}
42-
<li><a href="{{ paginator.next_page_path | relative_url }}" class="next-page">{{ paginator.next_page }}</a></li>
49+
<a href="{{ paginator.next_page_path | relative_url }}" class="next">Next &rarr;</a>
4350
{%- else %}
44-
<li><div class="pager-edge">•</div></li>
51+
<span class="disabled next">Next &rarr;</span>
4552
{%- endif %}
46-
</ul>
4753
</div>
48-
{%- endif %}
4954

50-
{%- endif -%}
55+
{%- endif %}
56+
57+
{%- endif -%}

‎assets/css/bpd.css

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ ul.speaking-list {
542542
font-size: 0.875em;
543543
color: #555;
544544
}
545+
545546
@media (max-width: 768px) {
546547
.footer-grid {
547548
grid-template-columns: 1fr;
@@ -559,4 +560,38 @@ ul.speaking-list {
559560
.footer-bottom {
560561
font-size: 0.75em;
561562
}
563+
.pagination {
564+
display: flex;
565+
gap: 10px;
566+
justify-content: center;
567+
align-items: center;
568+
}
569+
570+
.pagination a {
571+
text-decoration: none;
572+
padding: 5px 10px;
573+
border: 1px solid #ddd;
574+
border-radius: 4px;
575+
color: #007acc;
576+
}
577+
578+
.pagination a:hover {
579+
background-color: #007acc;
580+
color: #fff;
581+
}
582+
583+
.pagination .current {
584+
padding: 5px 10px;
585+
border: 1px solid #007acc;
586+
background-color: #007acc;
587+
color: white;
588+
border-radius: 4px;
589+
}
590+
591+
.pagination .disabled {
592+
padding: 5px 10px;
593+
border: 1px solid #ddd;
594+
color: #aaa;
595+
cursor: not-allowed;
596+
}
562597
}

‎blog.md

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

‎blog/index.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
layout: default
3+
lang: en
4+
title: Blog
5+
list_title: Posts
6+
---
7+
8+
<div class="posts">{%- include posts.html -%}</div>

‎support.html

Lines changed: 65 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,77 @@
44
title: Support
55
---
66

7+
<h1>Support Black Python Devs</h1>
78
<div id="support">
8-
<h2>Support Black Python Devs</h2>
99
<article>
10-
<div class="grid">
11-
<div>
12-
<script>
13-
(function () {
14-
if (document.getElementById("commitchange-script")) return;
15-
var npo = 6464;
16-
var script = document.createElement("script");
17-
var first = document.getElementsByTagName("script")[0];
18-
script.setAttribute("data-npo-id", npo);
19-
script.id = "commitchange-script";
20-
script.src = "https://us.commitchange.com/js/donate-button.v2.js";
21-
first.parentNode.insertBefore(script, first);
22-
})();
23-
</script>
24-
<a data-amounts="25,50,100,250,500,1000,1500" class="commitchange-donate" data-designation="Black Python Devs" data-embedded=""></a>
25-
</div>
26-
<div>
27-
<img class="donation-photo" src="/assets/images/gnome_powered_bpd_stacked.png" />
10+
<p>
11+
Black Python Devs is a Non-Profit, fiscally hosted under the <a href="https://foundation.gnome.org/">GNOME Foundation</a>. The GNOME Foundation does take a percentage for administration costs and support but at least 90% of proceeds goes
12+
directly to Black Python Devs General Purpose Fund to support our operational costs and supporting community events in the communtiies of Black Python Developers.
13+
</p>
14+
<div>
15+
<script>
16+
(function () {
17+
if (document.getElementById("commitchange-script")) return;
18+
var npo = 6464;
19+
var script = document.createElement("script");
20+
var first = document.getElementsByTagName("script")[0];
21+
script.setAttribute("data-npo-id", npo);
22+
script.id = "commitchange-script";
23+
script.src = "https://us.commitchange.com/js/donate-button.v2.js";
24+
first.parentNode.insertBefore(script, first);
25+
})();
26+
</script>
27+
<a data-amounts="25,50,100,250,500,1000,1500" class="commitchange-donate" data-designation="Black Python Devs" data-embedded=""></a>
28+
</div>
29+
</article>
30+
31+
<article>
32+
<h2>Foundational Supporters</h2>
33+
<p>Black Python Devs operates primarily on support from individuals. It is those supporters that serve as the foundation for what we do.</p>
34+
<p>We would like to recognize our supporters who donate at least $200 each year.</p>
35+
<div>
36+
<h3>2025</h3>
37+
<hr />
38+
<ul>
39+
{% for supporter in site.data.foundational_supporters['2025'] %}
40+
<li>{{supporter}}</li>
41+
{% endfor %}
42+
</ul>
43+
</div>
44+
<div>
45+
<h3>2024</h3>
46+
<hr />
47+
<div class="grid">
48+
<div>
49+
<ul>
50+
{% for supporter in site.data.foundational_supporters['2024'] limit:10 %}
51+
<li>{{supporter}}</li>
52+
{% endfor %}
53+
</ul>
54+
</div>
55+
<div>
56+
<ul>
57+
{% for supporter in site.data.foundational_supporters['2024'] offset:10 limit:10 %}
58+
59+
<li>{{supporter}}</li>
60+
{% endfor %}
61+
</ul>
62+
</div>
63+
<div>
64+
<ul>
65+
{% for supporter in site.data.foundational_supporters['2024'] offset:20 limit:10 %}
66+
67+
<li>{{supporter}}</li>
68+
{% endfor %}
69+
</ul>
70+
</div>
2871
</div>
72+
<p>You can view the archive of supporters<sup>*</sup> by year at https://github.com/blackpythondevs/blackpythondevs.</p>
73+
<p>* <sub>Those who marked their desire to remain anonymous have not been included</sub></p>
2974
</div>
3075
</article>
31-
<div>
32-
<p>
33-
Black Python Devs is a Non-Profit, fiscally hosted under the GNOME Foundation. GNOME does take a percentage for operating costs for our account and administration but at least 90% of proceeds goes directly to Black Python Devs General Purpose
34-
Fund as detailed here.
35-
</p>
36-
</div>
3776

77+
<h2>Learn More about Supporting</h2>
3878
<div style="position: relative; width: 100%; height: 0; padding-top: 56.25%; padding-bottom: 0; box-shadow: 0 2px 8px 0 rgba(63, 69, 81, 0.16); margin-top: 1.6em; margin-bottom: 0.9em; overflow: hidden; border-radius: 8px; will-change: transform">
3979
<iframe
4080
loading="lazy"

‎tests/test.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ def test_mailto_bpdevs(page_url: tuple[Page, str]) -> None:
106106

107107
@pytest.mark.parametrize(
108108
"url",
109-
(
110-
"/",
111-
"/blog",
112-
),
109+
("/blog",),
113110
)
114111
def test_page_description_in_index_and_blog(page_url: tuple[Page, str], url: str):
115112
"""Checks for the descriptions data in the blog posts. There should be some objects with the class `post-description`"""

0 commit comments

Comments
 (0)