Skip to content

Commit 71de43a

Browse files
Merge pull request #47 from joshjohanning/chirpy-v7.2.4
updating to chirpy v7.2.4
2 parents e5b4f9c + bcd2b0a commit 71de43a

File tree

100 files changed

+3498
-2991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3498
-2991
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ package-lock.json
2323
!.vscode/tasks.json
2424

2525
# Misc
26-
_app
26+
_sass/vendors
27+
assets/js/dist
2728

2829
# Link Checker
2930
link-checker.json

.stylelintrc.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"ignoreFiles": ["_sass/vendors/**"],
3+
"extends": "stylelint-config-standard-scss",
4+
"rules": {
5+
"no-descending-specificity": null,
6+
"shorthand-property-no-redundant-values": null,
7+
"at-rule-no-vendor-prefix": null,
8+
"property-no-vendor-prefix": null,
9+
"selector-no-vendor-prefix": null,
10+
"value-no-vendor-prefix": null,
11+
"color-function-notation": "legacy",
12+
"alpha-value-notation": "number",
13+
"selector-not-notation": "simple",
14+
"color-hex-length": "long",
15+
"declaration-block-single-line-max-declarations": 3,
16+
"scss/operator-no-newline-after": null,
17+
"rule-empty-line-before": [
18+
"always",
19+
{
20+
"ignore": ["after-comment", "first-nested"]
21+
}
22+
],
23+
"value-keyword-case": [
24+
"lower",
25+
{
26+
"ignoreProperties": ["/^\\$/"]
27+
}
28+
],
29+
"media-feature-range-notation": "prefix"
30+
}
31+
}

Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do
1111
gem "tzinfo-data"
1212
end
1313

14-
gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
14+
gem "wdm", "~> 0.2.0", :platforms => [:mingw, :x64_mingw, :mswin]
15+
16+
# required with newer ruby version >= 3.4
17+
gem "csv"
18+
gem "base64"

README.md

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,43 @@ Chirpy:
1818

1919
## Comment System
2020

21-
- [Utterances](https://utteranc.es/) (configured [directly in Chirpy](https://github.com/joshjohanning/joshjohanning.github.io/blob/a54c9633e6cab32fd30dc69afc9ffd74857cbd8a/_config.yml#L84-L92)) which uses GitHub issues for post comments
21+
* [Utterances](https://utteranc.es/) (configured [directly in Chirpy](https://github.com/joshjohanning/joshjohanning.github.io/blob/a54c9633e6cab32fd30dc69afc9ffd74857cbd8a/_config.yml#L84-L92)) which uses GitHub issues for post comments
2222

2323
## Deviations from Chirpy
2424

2525
### Adding Speaking tab
2626

27-
- Added a [speaking tab](https://josh-ops.com/speaking/) to capture my speaking engagements
28-
- [Used an icon](https://github.com/joshjohanning/joshjohanning.github.io/blob/ab7bb6e3842189adf1dccc909e1e77b86b625d0a/_tabs/speaking.md?plain=1#L3) from [fontawesome](https://fontawesome.com/v4/icons/) for the link in the sidebar
27+
* Added a [speaking tab](https://josh-ops.com/speaking/) to capture my speaking engagements
28+
* [Used an icon](https://github.com/joshjohanning/joshjohanning.github.io/blob/ab7bb6e3842189adf1dccc909e1e77b86b625d0a/_tabs/speaking.md?plain=1#L3) from [fontawesome](https://fontawesome.com/v4/icons/) for the link in the sidebar
2929

3030
### Light Mode Sidebar Background Color
3131

32-
- For my implementation of Chirpy v4.3.0 to v6.1.0, I [reverted](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) the light mode sidebar background color to the pre-v4.3.0 color (blue/purple)
33-
- When I updated from [Chirpy v6.1.0 to v6.3.0](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I decided to use the latest upstream values for the light mode sidebar background color (light gray)
32+
* For my implementation of Chirpy v4.3.0 to v6.1.0, I [reverted](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) the light mode sidebar background color to the pre-v4.3.0 color (blue/purple)
33+
* When I updated from [Chirpy v6.1.0 to v6.3.0](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I decided to use the latest upstream values for the light mode sidebar background color (light gray)
3434

3535
#### Changelog
3636

37-
- See: [#8](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) where I reverted to the pre-v4.3.0 color (blue/purple)
38-
- In [#27](https://github.com/joshjohanning/joshjohanning.github.io/pull/27), I updated the `sidebar-active-color` property to the latest upstream value
39-
- In [#30](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I reverted to the latest upstream values for light mode, which included a change to the `sidebar-bg` and `sidebar-muted-color` properties to bring in the light gray sidebar background color
37+
* See: [#8](https://github.com/joshjohanning/joshjohanning.github.io/pull/8) where I reverted to the pre-v4.3.0 color (blue/purple)
38+
* In [#27](https://github.com/joshjohanning/joshjohanning.github.io/pull/27), I updated the `sidebar-active-color` property to the latest upstream value
39+
* In [#30](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), I reverted to the latest upstream values for light mode, which included a change to the `sidebar-bg` and `sidebar-muted-color` properties to bring in the light gray sidebar background color
4040

4141
### Preview Images
4242

43-
- Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) introduced a strict `40 / 21` (`1:91:1`) aspect ratio requirement for post's preview images such that they would be cropped if you used a different aspect ratio
44-
- In prior versions, I removed this code so that the post's preview images would still render with their original size
45-
- In June 2023, I updated most of the preview images with the new aspect ratio and [brought back](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) preview images to the home page, but I still left out the `40 / 21;` line from the `post.scss` file to account for the images that weren't updated
46-
- In November 2023, I updated to Chirpy v6.2.3 and the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images
43+
* Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) introduced a strict `40 / 21` (`1:91:1`) aspect ratio requirement for post's preview images such that they would be cropped if you used a different aspect ratio
44+
* In prior versions, I removed this code so that the post's preview images would still render with their original size
45+
* In June 2023, I updated most of the preview images with the new aspect ratio and [brought back](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) preview images to the home page, but I still left out the `40 / 21;` line from the `post.scss` file to account for the images that weren't updated
46+
* In November 2023, I updated to Chirpy v6.2.3 and the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images
4747

48-
#### Changelog
48+
#### Preview Images Changelog
4949

50-
- Upstream commit introducing change: [4b6ccbc](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) (Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/releases/tag/v5.4.0))
51-
- My changes so that preview image still shimmers before loading, but no image cropping: [b282712^..bb1dc1f](https://github.com/joshjohanning/joshjohanning.github.io/compare/b282712087028da95e292e3159d20cdf63d59feb^..bb1dc1f1bdbba4ee7d62858d834e0ca19f7745db)
52-
- Really only need to get rid of `aspect-ratio: 40 / 21;` line
53-
- June 20, 2023: [Updated](https://github.com/joshjohanning/joshjohanning.github.io/commit/af83c7019c5783f70d5e725991097a7217a6658a) most of the post images to reflect the `1.91:1` aspect ratio since that's the ratio the [home page expects](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) for the post preview images
54-
- I still left out the `40 / 21;` line in the `post.scss` file for the images I didn't update to show the original image size on the post page
55-
- November 1, 2023: In Chirpy [v6.2.3](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images
50+
* Upstream commit introducing change: [4b6ccbc](https://github.com/cotes2020/jekyll-theme-chirpy/commit/4b6ccbcbccce27b9fcb035812efefe4eb69301cf) (Chirpy [v5.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/releases/tag/v5.4.0))
51+
* My changes so that preview image still shimmers before loading, but no image cropping: [b282712^..bb1dc1f](https://github.com/joshjohanning/joshjohanning.github.io/compare/b282712087028da95e292e3159d20cdf63d59feb^..bb1dc1f1bdbba4ee7d62858d834e0ca19f7745db)
52+
* Really only need to get rid of `aspect-ratio: 40 / 21;` line
53+
* June 20, 2023: [Updated](https://github.com/joshjohanning/joshjohanning.github.io/commit/af83c7019c5783f70d5e725991097a7217a6658a) most of the post images to reflect the `1.91:1` aspect ratio since that's the ratio the [home page expects](https://github.com/joshjohanning/joshjohanning.github.io/commit/1920dc7d98cbe11a6882ae0ec067fabccd64426b) for the post preview images
54+
* I still left out the `40 / 21;` line in the `post.scss` file for the images I didn't update to show the original image size on the post page
55+
* November 1, 2023: In Chirpy [v6.2.3](https://github.com/joshjohanning/joshjohanning.github.io/pull/30), the preview image logic was moved to `commons.scss`; removed the `40 / 21;` line for the non-updated images
56+
* In [Chirpy v7.2.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.1.1...v7.2.0#diff-b835e02ce3799a65dcd965ded5ca870e723fe680ac31b1077af060e0c2bbd921), this was moved to `_sass/_base_.scss`
57+
* I still commented out the `40 / 21;` line to prevent some preview images from being cropped
5658

5759
## Upgrading the Theme
5860

@@ -61,23 +63,22 @@ Since we aren't using the theme gem (so we can do customizations), we have to do
6163
1. Ensure chirpy is set as a remote: `git remote add chirpy https://github.com/cotes2020/jekyll-theme-chirpy.git`
6264
2. Ensure you have the latest upstream commit: `git fetch chirpy`
6365
3. Compare the upstream [releases](https://github.com/cotes2020/jekyll-theme-chirpy/releases) and [commits](https://github.com/cotes2020/jekyll-theme-chirpy/commits/master) to find the first and last release/commit in the range you want to update
64-
- Recommendation is to use release tag milestones instead of loose commits that aren't part of a release yet
65-
- You can use this [link](https://github.com/cotes2020/jekyll-theme-chirpy/compare/a887f1d^..602e984) to compare the changes between two commits in GitHub (same for [releases](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v5.6.0..v5.6.1))
66+
* Recommendation is to use release tag milestones instead of loose commits that aren't part of a release yet
67+
* You can use this [link](https://github.com/cotes2020/jekyll-theme-chirpy/compare/a887f1d^..602e984) to compare the changes between two commits in GitHub (same for [releases](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v5.6.0..v5.6.1))
6668
4. Start the `git cherry-pick`:
67-
- To cherry-pick between a range of release tags (more common): `git cherry-pick "v5.6.0..v5.6.1" -m 1`
68-
- To cherry-pick a single commit (not as common): `git cherry-pick a887f1d -m 1`
69-
- If getting GPG errors, modify the local git config: `git config commit.gpgsign false`, but modify it back to `true` after you are done cherry-picking and rebasing (before amending commit)
69+
* To cherry-pick between a range of release tags (more common): `git cherry-pick "v5.6.0..v5.6.1" -m 1`
70+
* To cherry-pick a single commit (not as common): `git cherry-pick a887f1d -m 1`
71+
* If getting GPG errors, modify the local git config: `git config commit.gpgsign false`, but modify it back to `true` after you are done cherry-picking and rebasing (before amending commit)
7072
5. Review merge conflicts - use a combination of `git cherry-pick --skip` (for when readme/starter posts are updated) and `cherry-pick --continue` (to continue after you resolve real merge conflicts)
71-
6. Starting in Chirpy v5.6.0, run: `npm run build && git add assets/js/dist _sass/dist -f && git commit -m "update js assets"` ([docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide#upgrade-the-fork))
72-
- You can also run a command that's referenced in the `init.sh` to remove this from `.gitignore`: `sed -i '' "/.*\/dist$/d" .gitignore`
73+
6. Starting in Chirpy v5.6.0, run: `npm run build && git add assets/js/dist _sass/vendors -f && git commit -m "update js assets"` ([docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki/Upgrade-Guide#upgrade-the-fork))
7374
7. Rebase the number of commits you just brought in (you should see icon in VS Code): `git rebase -i HEAD~16`
74-
- Leave the top commit as `pick` but change the rest to `squash`
75-
- Update the commit message as appropriate
75+
* Leave the top commit as `pick` but change the rest to `squash`
76+
* Update the commit message as appropriate
7677
8. Pay close attention to the terminal output as to which new files are being created and if they should be deleted (new files show up as `create mode 100644 file.ext`)
77-
- For example, we wouldn't want to commit a GitHub workflow or issue template that wasn't needed here
78-
- If there are new files that we don't want to track, delete the files, commit, and run another rebase `git rebase -i HEAD~2`
79-
- This command can help with tracking new files in the most recent commit: `git diff-tree --compact-summary -r HEAD --diff-filter=A`
80-
9. Ensure commit signing is enabled: `git config commit.gpgsign true`
78+
* For example, we wouldn't want to commit a GitHub workflow or issue template that wasn't needed here
79+
* If there are new files that we don't want to track, delete the files, commit, and run another rebase `git rebase -i HEAD~2`
80+
* This command can help with tracking new files in the most recent commit: `git diff-tree --compact-summary -r HEAD --diff-filter=A`
81+
9. Ensure commit signing is enabled: `git config commit.gpgsign true`
8182
10. Update author and commit time: `git commit --amend --author "Josh Johanning <joshjohanning@github.com>" --date=now -S`
8283
11. [Test changes locally before pushing](#building--testing-locally)
8384

_config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,9 @@ exclude:
212212
- tools
213213
- README.md
214214
- LICENSE
215-
- "*.config.js"
216-
- package*.json
215+
- purgecss.js
216+
- rollup.config.js
217+
- "package*.json"
217218

218219
jekyll-archives:
219220
enabled: [categories, tags]

_data/locales/hu-HU.yml

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,23 @@ tabs:
1414
categories: Kategóriák
1515
tags: Címkék
1616
archives: Archívum
17-
about: Rólam
17+
about: Bemutatkozás
1818

1919
# the text displayed in the search bar & search results
2020
search:
2121
hint: keresés
2222
cancel: Mégse
23-
no_results: Oops! Nincs találat a keresésre.
23+
no_results: Hoppá! Nincs találat a keresésre.
2424

2525
panel:
2626
lastmod: Legutóbb frissítve
2727
trending_tags: Népszerű Címkék
2828
toc: Tartalom
29-
links: Blog linkek
3029

3130
copyright:
3231
# Shown at the bottom of the post
3332
license:
34-
template: A bejegyzés :LICENSE_NAME licenccel rendelkezik.
33+
template: A bejegyzést a szerző :LICENSE_NAME licenc alatt engedélyezte.
3534
name: CC BY 4.0
3635
link: https://creativecommons.org/licenses/by/4.0/
3736

@@ -42,7 +41,7 @@ copyright:
4241
Creative Commons Attribution 4.0 International (CC BY 4.0) licenccel rendelkeznek,
4342
hacsak másképp nincs jelezve.
4443
45-
meta: Készítve :PLATFORM motorral :THEME témával
44+
meta: Készítve :THEME témával a :PLATFORM platformra.
4645

4746
not_found:
4847
statement: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat.
@@ -73,7 +72,21 @@ post:
7372
title: Link másolása
7473
succeed: Link sikeresen másolva!
7574

75+
# Date time format.
76+
# See: <http://strftime.net/>, <https://day.js.org/docs/en/display/format>
77+
df:
78+
post:
79+
strftime: "%Y. %B. %e."
80+
dayjs: "YYYY. MMMM D."
81+
archives:
82+
strftime: "%B"
83+
dayjs: "MMM"
84+
7685
# categories page
7786
categories:
78-
category_measure: kategória
79-
post_measure: bejegyzés
87+
category_measure:
88+
singular: kategória
89+
plural: kategória
90+
post_measure:
91+
singular: bejegyzés
92+
plural: bejegyzés

_data/origin/cors.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
2020
# Libraries
2121

2222
toc:
23-
css: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.css
24-
js: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.js
23+
css: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.css
24+
js: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.js
2525

2626
fontawesome:
27-
css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css
27+
css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.7.1/css/all.min.css
2828

2929
search:
3030
js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js
3131

3232
mermaid:
33-
js: https://cdn.jsdelivr.net/npm/mermaid@11.0.2/dist/mermaid.min.js
33+
js: https://cdn.jsdelivr.net/npm/mermaid@11.4.0/dist/mermaid.min.js
3434

3535
dayjs:
3636
js:

_includes/analytics/cloudflare.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
src="https://static.cloudflareinsights.com/beacon.min.js"
55
data-cf-beacon='{"token": "{{ site.analytics.cloudflare.id }}"}'
66
></script>
7-
<!-- End Cloudflare Web Analytics -->

_includes/analytics/fathom.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<script
33
src="https://cdn.usefathom.com/script.js"
44
data-site="{{ site.analytics.fathom.id }}"
5-
defer>
6-
</script>
7-
<!-- End Fathom Code -->
5+
defer
6+
></script>

_includes/analytics/google.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Global site tag (gtag.js) - Google Analytics -->
22
<script defer src="https://www.googletagmanager.com/gtag/js?id={{ site.analytics.google.id }}"></script>
33
<script>
4-
document.addEventListener('DOMContentLoaded', function (event) {
4+
document.addEventListener('DOMContentLoaded', () => {
55
window.dataLayer = window.dataLayer || [];
66
function gtag() {
77
dataLayer.push(arguments);

_includes/analytics/matomo.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<!-- Matomo -->
2-
<script type="text/javascript">
3-
var _paq = window._paq = window._paq || [];
4-
_paq.push(['trackPageView']);
5-
_paq.push(['enableLinkTracking']);
6-
(function() {
2+
<script>
3+
document.addEventListener('DOMContentLoaded', () => {
4+
var _paq = (window._paq = window._paq || []);
5+
_paq.push(['trackPageView']);
6+
_paq.push(['enableLinkTracking']);
77
var u="//{{ site.analytics.matomo.domain }}/";
88
_paq.push(['setTrackerUrl', u+'matomo.php']);
99
_paq.push(['setSiteId', {{ site.analytics.matomo.id }}]);
1010
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
1111
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
12-
})();
12+
});
1313
</script>
14-
<!-- End Matomo Code -->
File renamed without changes.

0 commit comments

Comments
 (0)