From 9630fd647f89740d137d9a8d5aa559b44369c796 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 12 May 2024 07:35:58 +0800 Subject: [PATCH 001/177] ci(release): pass secrets to called workflow --- .github/workflows/cd.yml | 3 +++ .github/workflows/publish.yml | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 160750d6..d0cc84a3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -35,3 +35,6 @@ jobs: publish: needs: release uses: ./.github/workflows/publish.yml + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILDER: ${{ secrets.BUILDER }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 20e46915..99114ea3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -5,6 +5,11 @@ on: branches: - docs workflow_call: + secrets: + GH_PAT: + required: true + BUILDER: + required: true jobs: launch: From c4b58e350265362e1e78119bea9529fc0fcf20cc Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 17 May 2024 00:03:53 +0800 Subject: [PATCH 002/177] build: upgrade dependencies Updates `@fortawesome/fontawesome-free` to 6.5.2 - [Release notes](https://github.com/FortAwesome/Font-Awesome/releases) - [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md) - [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.5.1...6.5.2) Updates `dayjs` to 1.11.11 - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.11.10...v1.11.11) Updates `mermaid` to 10.9.0 - [Release notes](https://github.com/mermaid-js/mermaid/releases) - [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/CHANGELOG.md) - [Commits](https://github.com/mermaid-js/mermaid/compare/v10.8.0...v10.9.0) Updates `tocbot` to 4.27.20 - [Release notes](https://github.com/tscanlin/tocbot/releases) - [Changelog](https://github.com/tscanlin/tocbot/blob/master/CHANGELOG.md) - [Commits](https://github.com/tscanlin/tocbot/compare/v4.25.0...v4.27.20) --- _data/origin/cors.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index abedb6c6..18806665 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.js fontawesome: - css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/all.min.css + css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css search: js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js mermaid: - js: https://cdn.jsdelivr.net/npm/mermaid@10.8.0/dist/mermaid.min.js + js: https://cdn.jsdelivr.net/npm/mermaid@10.9.0/dist/mermaid.min.js dayjs: js: - common: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/dayjs.min.js - locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/locale/:LOCALE.min.js - relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/relativeTime.min.js - localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/localizedFormat.min.js + common: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/dayjs.min.js + locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/locale/:LOCALE.min.js + relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/relativeTime.min.js + localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/localizedFormat.min.js glightbox: css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css From 5cdde7dbc5d2ae7dfba4fd53e2991d3acc2a073d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 17 May 2024 20:11:08 +0800 Subject: [PATCH 003/177] ci: enable ci/style-lint for the `hotfix` branches --- .github/workflows/ci.yml | 1 + .github/workflows/style-lint.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 078e4f13..fa8d0c9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ on: push: branches: - "master" + - "hotfix/**" paths-ignore: - ".github/**" - "!.github/workflows/ci.yml" diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index 89eeaeff..a2cf4f69 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -2,7 +2,7 @@ name: "Style Lint" on: push: - branches: ["master"] + branches: ["master", "hotfix/**"] paths: ["_sass/**/*.scss"] pull_request: paths: ["_sass/**/*.scss"] From 00a27a1b85f665d0642b77babd54c6903fbdeb22 Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Sat, 18 May 2024 14:47:12 +0400 Subject: [PATCH 004/177] fix: audio/video path apply variable `media_subpath` (#1745) --- _includes/embed/audio.html | 2 +- _includes/embed/video.html | 2 +- _posts/2019-08-08-write-a-new-post.md | 331 ++++++++++++-------------- 3 files changed, 152 insertions(+), 183 deletions(-) diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html index e2b89790..cf928a7f 100644 --- a/_includes/embed/audio.html +++ b/_includes/embed/audio.html @@ -4,7 +4,7 @@ {% unless src contains '://' %} {%- capture src -%} - {% include media-url.html src=src %} + {% include media-url.html src=src subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} diff --git a/_includes/embed/video.html b/_includes/embed/video.html index 712a266a..9b6918f7 100644 --- a/_includes/embed/video.html +++ b/_includes/embed/video.html @@ -5,7 +5,7 @@ {% unless video_url contains '://' %} {%- capture video_url -%} - {% include media-url.html src=video_url %} + {% include media-url.html src=video_url subpath=page.media_subpath %} {%- endcapture -%} {% endunless %} diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index bda7705e..e6259ba3 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -107,76 +107,35 @@ comments: false --- ``` -## Mathematics - -We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: - -[mathjax]: https://www.mathjax.org/ +## Media -```yaml ---- -math: true ---- -``` +We refer to images, audio and video as media resources in _Chirpy_. -After enabling the mathematical feature, you can add math equations with the following syntax: +### URL Prefix -- **Block math** should be added with `$$ math $$` with **mandatory** blank lines before and after `$$` - - **Inserting equation numbering** should be added with `$$\begin{equation} math \end{equation}$$` - - **Referencing equation numbering** should be done with `\label{eq:label_name}` in the equation block and `\eqref{eq:label_name}` inline with text (see example below) -- **Inline math** (in lines) should be added with `$$ math $$` without any blank line before or after `$$` -- **Inline math** (in lists) should be added with `\$$ math $$` +From time to time we have to define duplicate URL prefixes for multiple resources in a post, which is a boring task that you can avoid by setting two parameters. -```markdown - - -$$ -LaTeX_math_expression -$$ - - - -$$ -\begin{equation} - LaTeX_math_expression - \label{eq:label_name} -\end{equation} -$$ +- If you are using a CDN to host media files, you can specify the `cdn` in `_config.yml`{: .filepath }. The URLs of media resources for site avatar and posts are then prefixed with the CDN domain name. -Can be referenced as \eqref{eq:label_name}. - - - -"Lorem ipsum dolor sit amet, $$ LaTeX_math_expression $$ consectetur adipiscing elit." - - - -1. \$$ LaTeX_math_expression $$ -2. \$$ LaTeX_math_expression $$ -3. \$$ LaTeX_math_expression $$ -``` - -> Starting with `v7.0.0`, configuration options for **MathJax** have been moved to file `assets/js/data/mathjax.js`{: .filepath }, and you can change the options as needed, such as adding [extensions][mathjax-exts]. -> If you are building the site via `chirpy-starter`, copy that file from the gem installation directory (check with command `bundle info --path jekyll-theme-chirpy`) to the same directory in your repository. -{: .prompt-tip } - -[mathjax-exts]: https://docs.mathjax.org/en/latest/input/tex/extensions/index.html - -## Mermaid + ```yaml + cdn: https://cdn.com + ``` + {: file='_config.yml' .nolineno } -[**Mermaid**](https://github.com/mermaid-js/mermaid) is a great diagram generation tool. To enable it on your post, add the following to the YAML block: +- To specify the resource path prefix for the current post/page range, set `media_subpath` in the _front matter_ of the post: -```yaml ---- -mermaid: true ---- -``` + ```yaml + --- + media_subpath: /path/to/media/ + --- + ``` + {: .nolineno } -Then you can use it like other markdown languages: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. +The option `site.cdn` and `page.media_subpath` can be used individually or in combination to flexibly compose the final resource URL: `[site.cdn/][page.media_subpath/]file.ext` -## Images +### Images -### Caption +#### Caption Add italics to the next line of an image, then it will become the caption and appear at the bottom of the image: @@ -186,7 +145,7 @@ _Image Caption_ ``` {: .nolineno} -### Size +#### Size In order to prevent the page content layout from shifting when the image is loaded, we should set the width and height for each image. @@ -205,7 +164,7 @@ Starting from _Chirpy v5.0.0_, `height` and `width` support abbreviations (`heig ``` {: .nolineno} -### Position +#### Position By default, the image is centered, but you can specify the position by using one of the classes `normal`, `left`, and `right`. @@ -235,7 +194,7 @@ By default, the image is centered, but you can specify the position by using one ``` {: .nolineno} -### Dark/Light mode +#### Dark/Light mode You can make images follow theme preferences in dark/light mode. This requires you to prepare two images, one for dark mode and one for light mode, and then assign them a specific class (`dark` or `light`): @@ -244,7 +203,7 @@ You can make images follow theme preferences in dark/light mode. This requires y ![Dark mode only](/path/to/dark-mode.png){: .dark } ``` -### Shadow +#### Shadow The screenshots of the program window can be considered to show the shadow effect: @@ -253,56 +212,7 @@ The screenshots of the program window can be considered to show the shadow effec ``` {: .nolineno} -### CDN URL - -If you host the media resources on the CDN, you can save the time of repeatedly writing the CDN URL by assigning the variable `cdn` of `_config.yml`{: .filepath} file: - -```yaml -cdn: https://cdn.com -``` -{: file='_config.yml' .nolineno} - -Once `cdn` is assigned, the CDN URL will be added to the path of all media resources (site avatar, posts' images, audio and video files) starting with `/`. - -For instance, when using images: - -```markdown -![The flower](/path/to/flower.png) -``` -{: .nolineno} - -The parsing result will automatically add the CDN prefix `https://cdn.com` before the image path: - -```html -The flower -``` -{: .nolineno } - -### Media Subpath - -When a post contains many images, it will be a time-consuming task to repeatedly define the path of the media resources. To solve this, we can define this path in the YAML block of the post: - -```yml ---- -media_subpath: /img/path/ ---- -``` - -And then, the image source of Markdown can write the file name directly: - -```md -![The flower](flower.png) -``` -{: .nolineno } - -The output will be: - -```html -The flower -``` -{: .nolineno } - -### Preview Image +#### Preview Image If you want to add an image at the top of the post, please provide an image with a resolution of `1200 x 630`. Please note that if the image aspect ratio does not meet `1.91 : 1`, the image will be scaled and cropped. @@ -316,7 +226,7 @@ image: --- ``` -Note that the [`media_subpath`](#media-subpath) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. +Note that the [`media_subpath`](#url-prefix) can also be passed to the preview image, that is, when it has been set, the attribute `path` only needs the image file name. For simple use, you can also just use `image` to define the path. @@ -326,7 +236,7 @@ image: /path/to/image --- ``` -### LQIP +#### LQIP For preview images: @@ -346,6 +256,86 @@ For normal images: ``` {: .nolineno } +### Video + +#### Social Media Platform + +You can embed videos from social media platforms with the following syntax: + +```liquid +{% include embed/{Platform}.html id='{ID}' %} +``` + +Where `Platform` is the lowercase of the platform name, and `ID` is the video ID. + +The following table shows how to get the two parameters we need in a given video URL, and you can also know the currently supported video platforms. + +| Video URL | Platform | ID | +| -------------------------------------------------------------------------------------------------- | ---------- | :------------- | +| [https://www.**youtube**.com/watch?v=**H-B46URT4mg**](https://www.youtube.com/watch?v=H-B46URT4mg) | `youtube` | `H-B46URT4mg` | +| [https://www.**twitch**.tv/videos/**1634779211**](https://www.twitch.tv/videos/1634779211) | `twitch` | `1634779211` | +| [https://www.**bilibili**.com/video/**BV1Q44y1B7Wf**](https://www.bilibili.com/video/BV1Q44y1B7Wf) | `bilibili` | `BV1Q44y1B7Wf` | + +#### Video Files + +If you want to embed a video file directly, use the following syntax: + +```liquid +{% include embed/video.html src='{URL}' %} +``` + +Where `URL` is an URL to a video file e.g. `/path/to/sample/video.mp4`. + +You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed. + +- `poster='/path/to/poster.png'` — poster image for a video that is shown while video is downloading +- `title='Text'` — title for a video that appears below the video and looks same as for images +- `autoplay=true` — video automatically begins to play back as soon as it can +- `loop=true` — automatically seek back to the start upon reaching the end of the video +- `muted=true` — audio will be initially silenced +- `types` — specify the extensions of additional video formats separated by `|`. Ensure these files exist in the same directory as your primary video file. + +Consider an example utilizing all of the above: + +```liquid +{% + include embed/video.html + src='/path/to/video.mp4' + types='ogg|mov' + poster='poster.png' + title='Demo video' + autoplay=true + loop=true + muted=true +%} +``` + +### Audios + +If you want to embed an audio file directly, use the following syntax: + +```liquid +{% include embed/audio.html src='{URL}' %} +``` + +Where `URL` is an URL to an audio file e.g. `/path/to/audio.mp3`. + +You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed. + +- `title='Text'` — title for an audio that appears below the audio and looks same as for images +- `types` — specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file. + +Consider an example utilizing all of the above: + +```liquid +{% + include embed/audio.html + src='/path/to/audio.mp3' + types='ogg|wav|aac' + title='Demo audio' +%} +``` + ## Pinned Posts You can pin one or more posts to the top of the home page, and the fixed posts are sorted in reverse order according to their release date. Enable by: @@ -443,95 +433,74 @@ If you want to display the **Liquid** snippet, surround the liquid code with `{% Or adding `render_with_liquid: false` (Requires Jekyll 4.0 or higher) to the post's YAML block. -## Videos - -### Video Sharing Platform - -You can embed a video with the following syntax: - -```liquid -{% include embed/{Platform}.html id='{ID}' %} ``` -Where `Platform` is the lowercase of the platform name, and `ID` is the video ID. - -The following table shows how to get the two parameters we need in a given video URL, and you can also know the currently supported video platforms. - -| Video URL | Platform | ID | -| -------------------------------------------------------------------------------------------------- | ---------- | :------------- | -| [https://www.**youtube**.com/watch?v=**H-B46URT4mg**](https://www.youtube.com/watch?v=H-B46URT4mg) | `youtube` | `H-B46URT4mg` | -| [https://www.**twitch**.tv/videos/**1634779211**](https://www.twitch.tv/videos/1634779211) | `twitch` | `1634779211` | -| [https://www.**bilibili**.com/video/**BV1Q44y1B7Wf**](https://www.bilibili.com/video/BV1Q44y1B7Wf) | `bilibili` | `BV1Q44y1B7Wf` | +## Mathematics -### Video File +We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: -If you want to embed a video file directly, use the following syntax: +[mathjax]: https://www.mathjax.org/ -```liquid -{% include embed/video.html src='{URL}' %} +```yaml +--- +math: true +--- ``` -Where `URL` is an URL to a video file e.g. `/assets/img/sample/video.mp4`. +After enabling the mathematical feature, you can add math equations with the following syntax: -You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed. +- **Block math** should be added with `$$ math $$` with **mandatory** blank lines before and after `$$` + - **Inserting equation numbering** should be added with `$$\begin{equation} math \end{equation}$$` + - **Referencing equation numbering** should be done with `\label{eq:label_name}` in the equation block and `\eqref{eq:label_name}` inline with text (see example below) +- **Inline math** (in lines) should be added with `$$ math $$` without any blank line before or after `$$` +- **Inline math** (in lists) should be added with `\$$ math $$` -- `poster='/path/to/poster.png'` - poster image for a video that is shown while video is downloading -- `title='Text'` - title for a video that appears below the video and looks same as for images -- `autoplay=true` - video automatically begins to play back as soon as it can -- `loop=true` - automatically seek back to the start upon reaching the end of the video -- `muted=true` - audio will be initially silenced -- `types` - specify the extensions of additional video formats separated by `|`. Ensure these files exist in the same directory as your primary video file. +```markdown + -Consider an example utilizing all of the above: +$$ +LaTeX_math_expression +$$ -```liquid -{% - include embed/video.html - src='/path/to/video/video.mp4' - types='ogg|mov' - poster='poster.png' - title='Demo video' - autoplay=true - loop=true - muted=true -%} -``` + -> It's not recommended to host video files in `assets` folder as they cannot be cached by PWA and may cause issues. -> Instead, use CDN to host video files. Alternatively, use a separate folder that is excluded from PWA (see `pwa.deny_paths` setting in `_config.yml`). -{: .prompt-warning } +$$ +\begin{equation} + LaTeX_math_expression + \label{eq:label_name} +\end{equation} +$$ + +Can be referenced as \eqref{eq:label_name}. -## Audios + -### Audio File +"Lorem ipsum dolor sit amet, $$ LaTeX_math_expression $$ consectetur adipiscing elit." -If you want to embed an audio file directly, use the following syntax: + -```liquid -{% include embed/audio.html src='{URL}' %} +1. \$$ LaTeX_math_expression $$ +2. \$$ LaTeX_math_expression $$ +3. \$$ LaTeX_math_expression $$ ``` -Where `URL` is an URL to an audio file e.g. `/assets/img/sample/audio.mp3`. +> Starting with `v7.0.0`, configuration options for **MathJax** have been moved to file `assets/js/data/mathjax.js`{: .filepath }, and you can change the options as needed, such as adding [extensions][mathjax-exts]. +> If you are building the site via `chirpy-starter`, copy that file from the gem installation directory (check with command `bundle info --path jekyll-theme-chirpy`) to the same directory in your repository. +{: .prompt-tip } -You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed. +[mathjax-exts]: https://docs.mathjax.org/en/latest/input/tex/extensions/index.html -- `title='Text'` - title for an audio that appears below the audio and looks same as for images -- `types` - specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file. +## Mermaid -Consider an example utilizing all of the above: +[**Mermaid**](https://github.com/mermaid-js/mermaid) is a great diagram generation tool. To enable it on your post, add the following to the YAML block: -```liquid -{% - include embed/audio.html - src='/path/to/audio/audio.mp3' - types='ogg|wav|aac' - title='Demo audio' -%} +```yaml +--- +mermaid: true +--- ``` -> It's not recommended to host audio files in `assets` folder as they cannot be cached by PWA and may cause issues. -> Instead, use CDN to host audio files. Alternatively, use a separate folder that is excluded from PWA (see `pwa.deny_paths` setting in `_config.yml`). -{: .prompt-warning } +Then you can use it like other markdown languages: surround the graph code with ```` ```mermaid ```` and ```` ``` ````. ## Learn More From 33a1fa7cae2181625e2f335708d59de4dd20ee7d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 18 May 2024 18:52:45 +0800 Subject: [PATCH 005/177] fix(analytics): goatcounter pv greater than 1K cannot be converted to numbers (#1762) The goatcounter PV report splits numbers with spaces, e.g. 1024 would be '1 024' --- _includes/pageviews/goatcounter.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_includes/pageviews/goatcounter.html b/_includes/pageviews/goatcounter.html index af536dbd..e62fd698 100644 --- a/_includes/pageviews/goatcounter.html +++ b/_includes/pageviews/goatcounter.html @@ -9,7 +9,8 @@ fetch(url) .then((response) => response.json()) .then((data) => { - pv.innerText = new Intl.NumberFormat().format(data.count); + const count = data.count.replace(/\s/g, ''); + pv.innerText = new Intl.NumberFormat().format(count); }) .catch((error) => { pv.innerText = '1'; From 20987f2afe033cf9af8d6b534079b5bd06f6a30f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 18 May 2024 11:01:22 +0000 Subject: [PATCH 006/177] chore(release): 7.0.1 ## [7.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.0...v7.0.1) (2024-05-18) ### Bug Fixes * **analytics:** goatcounter pv greater than 1K cannot be converted to numbers ([#1762](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1762)) ([33a1fa7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/33a1fa7cae2181625e2f335708d59de4dd20ee7d)) * audio/video path apply variable `media_subpath` ([#1745](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1745)) ([00a27a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/00a27a1b85f665d0642b77babd54c6903fbdeb22)) --- docs/CHANGELOG.md | 7 +++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 777e27b2..abe0a178 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.0...v7.0.1) (2024-05-18) + +### Bug Fixes + +* **analytics:** goatcounter pv greater than 1K cannot be converted to numbers ([#1762](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1762)) ([33a1fa7](https://github.com/cotes2020/jekyll-theme-chirpy/commit/33a1fa7cae2181625e2f335708d59de4dd20ee7d)) +* audio/video path apply variable `media_subpath` ([#1745](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1745)) ([00a27a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/00a27a1b85f665d0642b77babd54c6903fbdeb22)) + ## [7.0.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v6.5.5...v7.0.0) (2024-05-11) ### ⚠ BREAKING CHANGES diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 88d5c424..91d618c1 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-chirpy" - spec.version = "7.0.0" + spec.version = "7.0.1" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 00f85453..8600aa4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "7.0.0", + "version": "7.0.1", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git", From 0102abae062be24ec289fb7facb11950aca79e3f Mon Sep 17 00:00:00 2001 From: Jason <50330957+itsjason-net@users.noreply.github.com> Date: Sat, 18 May 2024 06:05:09 -0500 Subject: [PATCH 007/177] feat: add Bluesky social links (#1759) --- _data/contact.yml | 4 ++++ _data/share.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/_data/contact.yml b/_data/contact.yml index 1ed228a0..d6819e0d 100644 --- a/_data/contact.yml +++ b/_data/contact.yml @@ -26,3 +26,7 @@ # - type: stack-overflow # icon: 'fab fa-stack-overflow' # url: '' # Fill with your stackoverflow homepage +# +# - type: bluesky +# icon: 'fa-brands fa-bluesky' +# url: '' # Fill with your Bluesky profile link diff --git a/_data/share.yml b/_data/share.yml index b1d077dc..0aa28fd4 100644 --- a/_data/share.yml +++ b/_data/share.yml @@ -36,3 +36,7 @@ platforms: # link: "https://fosstodon.org/" # - label: photog.social # link: "https://photog.social/" + # + # - type: Bluesky + # icon: "fa-brands fa-bluesky" + # link: "https://bsky.app/intent/compose?text=TITLE%20URL" From 64ae7a3671335409e11a9b467d5a89847528b812 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 30 May 2024 03:33:35 +0800 Subject: [PATCH 008/177] docs: correct markdown syntax of tutorial (#1787) --- _posts/2019-08-08-write-a-new-post.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index e6259ba3..3ad1438b 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -433,8 +433,6 @@ If you want to display the **Liquid** snippet, surround the liquid code with `{% Or adding `render_with_liquid: false` (Requires Jekyll 4.0 or higher) to the post's YAML block. -``` - ## Mathematics We use [**MathJax**][mathjax] to generate mathematics. For website performance reasons, the mathematical feature won't be loaded by default. But it can be enabled by: From 1c5fa0880d3bb21c7a3a5f53d0e7d3bab146baba Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 1 Jun 2024 04:11:01 +0800 Subject: [PATCH 009/177] refactor: restore shell script extensions Without an extension, the shell script configuration in `.gitattribute` will not work. --- .github/workflows/ci.yml | 2 +- _posts/2019-08-09-getting-started.md | 2 +- package.json | 4 ++-- tools/{init => init.sh} | 0 tools/{release => release.sh} | 2 +- tools/{run => run.sh} | 0 tools/{test => test.sh} | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename tools/{init => init.sh} (100%) rename tools/{release => release.sh} (98%) rename tools/{run => run.sh} (100%) rename tools/{test => test.sh} (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa8d0c9e..ca60bd67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,4 +42,4 @@ jobs: run: npm i && npm run build - name: Test Site - run: bash tools/test + run: bash tools/test.sh diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 1cea5be9..3e0327a7 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -35,7 +35,7 @@ Sign in to GitHub to [fork **Chirpy**](https://github.com/cotes2020/jekyll-theme Next, clone the repository to your local machine, make sure it has [Node.js][nodejs] installed, then go to the root directory of the repo and run the following command: ```console -$ bash tools/init +$ bash tools/init.sh ``` > If you don't want to deploy your site on GitHub Pages, append option `--no-gh` at the end of the above command. diff --git a/package.json b/package.json index 8600aa4e..2c065bb6 100644 --- a/package.json +++ b/package.json @@ -156,8 +156,8 @@ [ "@semantic-release/exec", { - "prepareCmd": "bash tools/release --prepare", - "publishCmd": "bash tools/release" + "prepareCmd": "bash tools/release.sh --prepare", + "publishCmd": "bash tools/release.sh" } ], [ diff --git a/tools/init b/tools/init.sh similarity index 100% rename from tools/init rename to tools/init.sh diff --git a/tools/release b/tools/release.sh similarity index 98% rename from tools/release rename to tools/release.sh index c2ea59e1..6d010b63 100755 --- a/tools/release +++ b/tools/release.sh @@ -37,7 +37,7 @@ help() { echo " 2. Merge the release branch into the default branch" echo echo "Usage:" - echo " bash ./tools/release [options]" + echo " bash $0 [options]" echo echo "Options:" echo " --prepare Preparation for release" diff --git a/tools/run b/tools/run.sh similarity index 100% rename from tools/run rename to tools/run.sh diff --git a/tools/test b/tools/test.sh similarity index 97% rename from tools/test rename to tools/test.sh index fe47d446..331de1c3 100755 --- a/tools/test +++ b/tools/test.sh @@ -19,7 +19,7 @@ help() { echo echo "Usage:" echo - echo " bash ./tools/test [options]" + echo " bash $0 [options]" echo echo "Options:" echo ' -c, --config "" Specify config file(s)' From 1e3d4a6323ba3eed06a57f8bf1b2edefd890b127 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 3 Jun 2024 21:12:54 +0800 Subject: [PATCH 010/177] feat(dev): support vscode dev-container (#1781) --- .devcontainer/devcontainer.json | 31 +++++++++++++++++++++++++++++++ .devcontainer/post-create.sh | 10 ++++++++++ .github/dependabot.yml | 4 ++++ .gitignore | 2 +- .vscode/extensions.json | 12 +----------- .vscode/settings.json | 6 +++--- README.md | 9 +++++---- tools/run.sh | 4 ++++ 8 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .devcontainer/post-create.sh diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..a891b7ee --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,31 @@ +{ + "name": "Jekyll", + "image": "mcr.microsoft.com/devcontainers/jekyll:2-bullseye", + "onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", + "postCreateCommand": "bash .devcontainer/post-create.sh", + "customizations": { + "vscode": { + "settings": { + "terminal.integrated.defaultProfile.linux": "zsh", + // Speed up extension installation + "extensions.verifySignature": false + }, + "extensions": [ + // Liquid tags auto-complete + "killalau.vscode-liquid-snippets", + // Liquid syntax highlighting and formatting + "Shopify.theme-check-vscode", + // Shell + "timonwong.shellcheck", + "mkhl.shfmt", + // Common formatter + "EditorConfig.EditorConfig", + "esbenp.prettier-vscode", + "stylelint.vscode-stylelint", + "yzhang.markdown-all-in-one", + // Git + "mhutchie.git-graph" + ] + } + } +} diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh new file mode 100644 index 00000000..14422cbf --- /dev/null +++ b/.devcontainer/post-create.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if [ -f package.json ]; then + bash -i -c "nvm install --lts && nvm install-latest-npm" + npm i + npm run build +fi + +# Install dependencies for shfmt extension +curl -sS https://webi.sh/shfmt | sh &>/dev/null diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 393fa980..82bf3f77 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,3 +23,7 @@ updates: - "major" schedule: interval: "weekly" + - package-ecosystem: "devcontainers" + directory: "/" + schedule: + interval: weekly diff --git a/.gitignore b/.gitignore index d6bf5096..e7803e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ package-lock.json # IDE configurations .idea -.vscode +.vscode/* !.vscode/settings.json !.vscode/extensions.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 52bd6fbd..082bc94c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,13 +1,3 @@ { - "recommendations": [ - // Liquid tags auto-complete - "killalau.vscode-liquid-snippets", - // Liquid syntax highlighting and formatting - "Shopify.theme-check-vscode", - // Common formatter - "esbenp.prettier-vscode", - "foxundermoon.shell-format", - "stylelint.vscode-stylelint", - "yzhang.markdown-all-in-one" - ] + "recommendations": ["ms-vscode-remote.remote-containers"] } diff --git a/.vscode/settings.json b/.vscode/settings.json index b0e2e099..787a0c84 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -15,13 +15,13 @@ "editor.defaultFormatter": "Shopify.theme-check-vscode" }, "[shellscript]": { - "editor.defaultFormatter": "foxundermoon.shell-format" + "editor.defaultFormatter": "mkhl.shfmt" }, // Disable vscode built-in stylelint "css.validate": false, "scss.validate": false, "less.validate": false, // Stylint extension settings - "stylelint.snippet": ["css", "less", "postcss", "scss"], - "stylelint.validate": ["css", "less", "postcss", "scss"] + "stylelint.snippet": ["css", "scss"], + "stylelint.validate": ["css", "scss"] } diff --git a/README.md b/README.md index 747b8bc1..6f3b158e 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ A minimal, responsive, and feature-rich Jekyll theme for technical writing. - [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)][gem]  - [![CI](https://github.com/cotes2020/jekyll-theme-chirpy/actions/workflows/ci.yml/badge.svg?branch=master&event=push)][ci]  + [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=gainsboro&label=gem&color=brightgreen)][gem]  + [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github&logoColor=gainsboro)][ci]  [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)][codacy]  - [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)][license]  - [![996.icu](https://img.shields.io/badge/link-996.icu-%23FF4D5B.svg)](https://996.icu) + [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy)][license]  + [![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&logo=visualstudiocode&logoColor=gainsboro&message=Open&color=deepskyblue)][open-container] [**Live Demo** →][demo] @@ -72,6 +72,7 @@ This project is published under [MIT License][license]. [ci]: https://github.com/cotes2020/jekyll-theme-chirpy/actions/workflows/ci.yml?query=event%3Apush+branch%3Amaster [codacy]: https://app.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade [license]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE +[open-container]: https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/cotes2020/jekyll-theme-chirpy [jekyllrb]: https://jekyllrb.com/ [clipartmax]: https://www.clipartmax.com/middle/m2i8b1m2K9Z5m2K9_ant-clipart-childrens-ant-cute/ [demo]: https://cotes2020.github.io/chirpy-demo/ diff --git a/tools/run.sh b/tools/run.sh index 04f23f5e..0efc452d 100755 --- a/tools/run.sh +++ b/tools/run.sh @@ -46,5 +46,9 @@ if $prod; then command="JEKYLL_ENV=production $command" fi +if [ -e /proc/1/cgroup ] && grep -q docker /proc/1/cgroup; then + command="$command --force_polling" +fi + echo -e "\n> $command\n" eval "$command" From 3b46629dc0c4bf401cc4775121adfa2cdd342043 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 4 Jun 2024 01:36:27 +0800 Subject: [PATCH 011/177] build(deps-dev): bump the npm group across 1 directory with 8 updates Updates the requirements on [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core), [@babel/plugin-transform-class-properties](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-class-properties), [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env), [conventional-changelog-conventionalcommits](https://github.com/conventional-changelog/conventional-changelog/tree/HEAD/packages/conventional-changelog-conventionalcommits), [rollup](https://github.com/rollup/rollup), [rollup-plugin-license](https://github.com/mjeanroy/rollup-plugin-license), [semantic-release](https://github.com/semantic-release/semantic-release) and [stylelint](https://github.com/stylelint/stylelint) to permit the latest version. Updates `@babel/core` to 7.24.6 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-core) Updates `@babel/plugin-transform-class-properties` to 7.24.6 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-plugin-transform-class-properties) Updates `@babel/preset-env` to 7.24.6 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-preset-env) Updates `conventional-changelog-conventionalcommits` from 7.0.2 to 8.0.0 - [Release notes](https://github.com/conventional-changelog/conventional-changelog/releases) - [Changelog](https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/conventional-changelog-conventionalcommits/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/conventional-changelog/commits/conventional-changelog-conventionalcommits-v8.0.0/packages/conventional-changelog-conventionalcommits) Updates `rollup` to 4.18.0 - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v4.17.2...v4.18.0) Updates `rollup-plugin-license` to 3.4.0 - [Changelog](https://github.com/mjeanroy/rollup-plugin-license/blob/master/CHANGELOG.md) - [Commits](https://github.com/mjeanroy/rollup-plugin-license/compare/v3.3.1...v3.4.0) Updates `semantic-release` from 23.1.1 to 24.0.0 - [Release notes](https://github.com/semantic-release/semantic-release/releases) - [Commits](https://github.com/semantic-release/semantic-release/compare/v23.1.1...v24.0.0) Updates `stylelint` to 16.6.1 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.5.0...16.6.1) --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 2c065bb6..57489865 100644 --- a/package.json +++ b/package.json @@ -26,9 +26,9 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "@babel/core": "^7.24.5", - "@babel/plugin-transform-class-properties": "^7.24.1", - "@babel/preset-env": "^7.24.5", + "@babel/core": "^7.24.6", + "@babel/plugin-transform-class-properties": "^7.24.6", + "@babel/preset-env": "^7.24.6", "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@rollup/plugin-babel": "^6.0.4", @@ -39,13 +39,13 @@ "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", "concurrently": "^8.2.2", - "conventional-changelog-conventionalcommits": "^7.0.2", + "conventional-changelog-conventionalcommits": "^8.0.0", "husky": "^9.0.11", "purgecss": "^6.0.0", - "rollup": "^4.17.2", - "rollup-plugin-license": "^3.3.1", - "semantic-release": "^23.1.1", - "stylelint": "^16.5.0", + "rollup": "^4.18.0", + "rollup-plugin-license": "^3.4.0", + "semantic-release": "^24.0.0", + "stylelint": "^16.6.1", "stylelint-config-standard-scss": "^13.1.0" }, "prettier": { From 88b844ce80a4aada081ec919d652c2fddb2fa77e Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 4 Jun 2024 19:26:17 +0800 Subject: [PATCH 012/177] build(deps): improve dependency grouping --- .github/dependabot.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 82bf3f77..a51f37eb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,11 +8,10 @@ updates: directory: "/" versioning-strategy: increase groups: - npm: - update-types: - - "major" - - "minor" - - "patch" + prod-deps: + dependency-type: production + dev-deps: + dependency-type: development schedule: interval: "weekly" - package-ecosystem: "github-actions" From 250880c088955f7d2f09129edc69ae7b9486d1ef Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 4 Jun 2024 19:28:02 +0800 Subject: [PATCH 013/177] docs: change ordering of badges --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6f3b158e..2cc38073 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ A minimal, responsive, and feature-rich Jekyll theme for technical writing. - [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=gainsboro&label=gem&color=brightgreen)][gem]  - [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github&logoColor=gainsboro)][ci]  - [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)][codacy]  + [![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&logo=visualstudiocode&message=Open&color=deepskyblue)][open-container]  + [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=tomato)][gem]  [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy)][license]  - [![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&logo=visualstudiocode&logoColor=gainsboro&message=Open&color=deepskyblue)][open-container] + [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github)][ci]  + [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)][codacy] [**Live Demo** →][demo] From 7ca9c5978425d2ca052ce14cc0592c16436b8174 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:51:10 +0800 Subject: [PATCH 014/177] build(deps-dev): remove package `rollup-plugin-license` (#1796) The `rollup-plugin-license` has been using too many deprecated dependencies, so it is necessary to remove it. As an alternative, this changes uses Rollup `output.banner` to insert copyright information. Since `terser` runs after `output`, it is not possible to insert the Front Matter defining permlink for `sw.js` through the same way (Jekyll Front Matter is YAML rather than JS, which would cause errors with terser). Therefore, _Jekyll Collection_ is now used to add permlink to `sw.js`, with the collection named `app`, and the directory placed in `_app`. This directory is not tracked by git, but it will be included when building the gem. --- .gitignore | 1 + _config.yml | 7 +++-- _includes/js-selector.html | 7 +++-- _javascript/_copyright | 1 - _javascript/pwa/_frontmatter | 3 --- jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- rollup.config.js | 50 +++++++++++++++++------------------- tools/init.sh | 2 +- tools/release.sh | 18 ++----------- 10 files changed, 35 insertions(+), 58 deletions(-) delete mode 100644 _javascript/_copyright delete mode 100644 _javascript/pwa/_frontmatter diff --git a/.gitignore b/.gitignore index e7803e6e..104d0531 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ Gemfile.lock .jekyll-cache .jekyll-metadata _site +_app # RubyGems *.gem diff --git a/_config.yml b/_config.yml index 613b043b..8e54ea7f 100644 --- a/_config.yml +++ b/_config.yml @@ -168,6 +168,9 @@ collections: tabs: output: true sort_by: order + app: + output: true + permalink: /:name defaults: - scope: @@ -190,10 +193,6 @@ defaults: values: layout: page permalink: /:title/ - - scope: - path: assets/js/dist - values: - swcache: true sass: style: compressed diff --git a/_includes/js-selector.html b/_includes/js-selector.html index b229b70d..99651076 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -6,8 +6,6 @@ -{% assign js_dist = '/assets/js/dist/' %} - {% if page.layout == 'post' or page.layout == 'page' or page.layout == 'home' %} {% assign urls = urls | append: ',' | append: site.data.origin[type]['lazy-polyfill'].js %} @@ -62,7 +60,8 @@ {% assign js = 'commons' %} {% endcase %} -{% capture script %}{{ js_dist }}{{ js }}.min.js{% endcapture %} +{% capture script %}/assets/js/dist/{{ js }}.min.js{% endcapture %} + {% if page.math %} @@ -93,7 +92,7 @@ {% if jekyll.environment == 'production' %} {% if site.pwa.enabled %} - + {% endif %} diff --git a/_javascript/_copyright b/_javascript/_copyright deleted file mode 100644 index 60a706be..00000000 --- a/_javascript/_copyright +++ /dev/null @@ -1 +0,0 @@ -Chirpy v<%= pkg.version %> | © 2019 <%= pkg.author %> | <%= pkg.license %> Licensed | <%= pkg.homepage %> diff --git a/_javascript/pwa/_frontmatter b/_javascript/pwa/_frontmatter deleted file mode 100644 index 97ecf0a6..00000000 --- a/_javascript/pwa/_frontmatter +++ /dev/null @@ -1,3 +0,0 @@ ---- -permalink: /:basename ---- diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 91d618c1..2c77572b 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").select { |f| - f.match(%r!^((_(includes|layouts|sass|(data\/(locales|origin)))|assets)\/|README|LICENSE)!i) + f.match(%r!^((_(includes|layouts|sass|app|(data\/(locales|origin)))|assets)\/|README|LICENSE)!i) } spec.metadata = { diff --git a/package.json b/package.json index 57489865..21cab364 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, "author": "Cotes Chung", "license": "MIT", + "since": 2019, "bugs": { "url": "https://github.com/cotes2020/jekyll-theme-chirpy/issues" }, @@ -43,7 +44,6 @@ "husky": "^9.0.11", "purgecss": "^6.0.0", "rollup": "^4.18.0", - "rollup-plugin-license": "^3.4.0", "semantic-release": "^24.0.0", "stylelint": "^16.6.1", "stylelint-config-standard-scss": "^13.1.0" diff --git a/rollup.config.js b/rollup.config.js index 823401e0..94507b92 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,38 +1,43 @@ import babel from '@rollup/plugin-babel'; import terser from '@rollup/plugin-terser'; -import license from 'rollup-plugin-license'; import { nodeResolve } from '@rollup/plugin-node-resolve'; -import fs from 'fs'; -import path from 'path'; import yaml from '@rollup/plugin-yaml'; +import fs from 'fs'; +import pkg from './package.json'; const SRC_DEFAULT = '_javascript'; const DIST_DEFAULT = 'assets/js/dist'; + const SRC_PWA = `${SRC_DEFAULT}/pwa`; +const DIST_PWA = '_app'; + +const banner = `/*! + * ${pkg.name} v${pkg.version} | © ${pkg.since} ${pkg.author} | ${pkg.license} Licensed | ${pkg.homepage} + */`; const isProd = process.env.BUILD === 'production'; -if (fs.existsSync(DIST_DEFAULT)) { - fs.rm(DIST_DEFAULT, { recursive: true, force: true }, (err) => { - if (err) { - throw err; - } - }); +function cleanup(...directories) { + for (const dir of directories) { + fs.rm(dir, { recursive: true, force: true }, (err) => { + if (err) { + console.error(`Failed to remove directory ${dir}: ${err}`); + } + }); + } } function build(filename, opts = {}) { const src = opts.src || SRC_DEFAULT; const dist = opts.dist || DIST_DEFAULT; - const bannerUrl = - opts.bannerUrl || path.join(__dirname, SRC_DEFAULT, '_copyright'); - const commentStyle = opts.commentStyle || 'ignored'; return { - input: [`${src}/${filename}.js`], + input: `${src}/${filename}.js`, output: { file: `${dist}/${filename}.min.js`, format: 'iife', name: 'Chirpy', + banner, sourcemap: !isProd }, watch: { @@ -46,18 +51,13 @@ function build(filename, opts = {}) { }), nodeResolve(), yaml(), - isProd && commentStyle === 'none' && terser(), - license({ - banner: { - commentStyle, - content: { file: bannerUrl } - } - }), - isProd && commentStyle !== 'none' && terser() + isProd && terser() ] }; } +cleanup(DIST_DEFAULT, DIST_PWA); + export default [ build('commons'), build('home'), @@ -65,10 +65,6 @@ export default [ build('page'), build('post'), build('misc'), - build('app', { src: SRC_PWA }), - build('sw', { - src: SRC_PWA, - bannerUrl: path.join(__dirname, SRC_PWA, '_frontmatter'), - commentStyle: 'none' - }) + build('app', { src: SRC_PWA, dist: DIST_PWA }), + build('sw', { src: SRC_PWA, dist: DIST_PWA }) ]; diff --git a/tools/init.sh b/tools/init.sh index ed478d79..c0c4e183 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -92,7 +92,7 @@ init_files() { npm i && npm run build # track the CSS/JS output - _sedi "/.*\/dist$/d" .gitignore + _sedi "/.*\/dist$/d;/^_app$/d" .gitignore } commit() { diff --git a/tools/release.sh b/tools/release.sh index 6d010b63..e505f1a2 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -17,6 +17,7 @@ CONFIG="_config.yml" CSS_DIST="_sass/dist" JS_DIST="assets/js/dist" +PWA_DIST="_app" FILES=( "$GEM_SPEC" @@ -111,20 +112,13 @@ prepare() { ## Build a Gem package build_gem() { - if $opt_pkg; then - BACKUP_PATH="$(mktemp -d)" - mkdir -p "$BACKUP_PATH"/css "$BACKUP_PATH"/js - [[ -d $CSS_DIST ]] && cp "$CSS_DIST"/* "$BACKUP_PATH"/css - [[ -d $JS_DIST ]] && cp "$JS_DIST"/* "$BACKUP_PATH"/js - fi - # Remove unnecessary theme settings sed -i -E "s/(^timezone:).*/\1/;s/(^cdn:).*/\1/;s/(^avatar:).*/\1/" $CONFIG rm -f ./*.gem npm run build # add CSS/JS distribution files to gem package - git add "$CSS_DIST" "$JS_DIST" -f + git add "$CSS_DIST" "$JS_DIST" "$PWA_DIST" -f echo -e "\n> gem build $GEM_SPEC\n" gem build "$GEM_SPEC" @@ -132,14 +126,6 @@ build_gem() { echo -e "\n> Resume file changes ...\n" git reset git checkout . - - if $opt_pkg; then - # restore the dist files for future development - mkdir -p "$CSS_DIST" "$JS_DIST" - cp "$BACKUP_PATH"/css/* "$CSS_DIST" - cp "$BACKUP_PATH"/js/* "$JS_DIST" - rm -rf "$BACKUP_PATH" - fi } # Push the gem to RubyGems.org (using $GEM_HOST_API_KEY) From cf853f14e4acb3deb097c57ef151b20f47ed84cb Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 7 Jun 2024 19:27:54 +0800 Subject: [PATCH 015/177] chore: upgrade `husky` v9 settings --- .husky/commit-msg | 5 +---- package.json | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) mode change 100755 => 100644 .husky/commit-msg diff --git a/.husky/commit-msg b/.husky/commit-msg old mode 100755 new mode 100644 index 7f23494b..0a4b97de --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx --no -- commitlint --edit ${1} +npx --no -- commitlint --edit $1 diff --git a/package.json b/package.json index 21cab364..d6f442b6 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "watch:js": "rollup -c --bundleConfigAsCjs -w", "lint:scss": "stylelint _sass/**/*.scss", "lint:fix:scss": "npm run lint:scss -- --fix", - "test": "npm run lint:scss" + "test": "npm run lint:scss", + "prepare": "husky" }, "dependencies": { "@popperjs/core": "^2.11.8", From f1d35832f425814cf0ee5dd3513597999bb31fc0 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:45:59 +0800 Subject: [PATCH 016/177] build(devcontainer): add omz plugins & verify extension signature VSCode fixed signature validation hangs in v1.90 --- .devcontainer/devcontainer.json | 4 +--- .devcontainer/post-create.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a891b7ee..39c428df 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,9 +6,7 @@ "customizations": { "vscode": { "settings": { - "terminal.integrated.defaultProfile.linux": "zsh", - // Speed up extension installation - "extensions.verifySignature": false + "terminal.integrated.defaultProfile.linux": "zsh" }, "extensions": [ // Liquid tags auto-complete diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 14422cbf..a4bc2825 100644 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -8,3 +8,11 @@ fi # Install dependencies for shfmt extension curl -sS https://webi.sh/shfmt | sh &>/dev/null + +# Add OMZ plugins +git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting +git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions +sed -i -E "s/^(plugins=\()(git)(\))/\1\2 zsh-syntax-highlighting zsh-autosuggestions\3/" ~/.zshrc + +# Avoid git log use less +echo -e "\nunset LESS" >>~/.zshrc From 0709854dc8f6099d38c2578967a02f73b4be0dc8 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 16 Jun 2024 22:25:41 +0800 Subject: [PATCH 017/177] fix: adapt the giscus localization parameter (#1810) --- _includes/comments/giscus.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_includes/comments/giscus.html b/_includes/comments/giscus.html index c8d48e67..f9becfe9 100644 --- a/_includes/comments/giscus.html +++ b/_includes/comments/giscus.html @@ -17,6 +17,12 @@ initTheme = darkTheme; } + let lang = '{{ site.comments.giscus.lang | default: lang }}'; + {%- comment -%} https://github.com/giscus/giscus/tree/main/locales {%- endcomment -%} + if (lang.length > 2 && !lang.startsWith('zh')) { + lang = lang.slice(0, 2); + } + let giscusAttributes = { src: 'https://giscus.app/client.js', 'data-repo': '{{ site.comments.giscus.repo}}', @@ -29,7 +35,7 @@ 'data-emit-metadata': '0', 'data-theme': initTheme, 'data-input-position': '{{ site.comments.giscus.input_position | default: 'bottom' }}', - 'data-lang': '{{ site.comments.giscus.lang | default: lang }}', + 'data-lang': lang, 'data-loading': 'lazy', crossorigin: 'anonymous', async: '' From 9ca7519239d878258300814a5b201fd5b926a192 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 27 Jun 2024 05:30:53 +0800 Subject: [PATCH 018/177] docs: unify the style of badges --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2cc38073..32210f53 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ A minimal, responsive, and feature-rich Jekyll theme for technical writing. - [![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&logo=visualstudiocode&message=Open&color=deepskyblue)][open-container]  + [![Open in Dev Containers](https://img.shields.io/badge/Dev_Containers-Open-deepskyblue?logo=visualstudiocode)][open-container]  [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=tomato)][gem]  [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy)][license]  [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github)][ci]  - [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)][codacy] + [![Codacy Badge](https://img.shields.io/codacy/grade/4e556876a3c54d5e8f2d2857c4f43894?logo=codacy)][codacy] [**Live Demo** →][demo] From c876731901784a72ef9d2e9e2936df65ddff5f61 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 1 Jul 2024 07:02:36 +0800 Subject: [PATCH 019/177] feat(ui): improve visibility of inline code (#1831) --- _sass/addon/syntax.scss | 2 +- _sass/colors/syntax-dark.scss | 2 +- _sass/colors/syntax-light.scss | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/_sass/addon/syntax.scss b/_sass/addon/syntax.scss index 68796f28..73c66aae 100644 --- a/_sass/addon/syntax.scss +++ b/_sass/addon/syntax.scss @@ -102,7 +102,7 @@ code { &.highlighter-rouge { font-size: $code-font-size; - padding: 3px 5px; + padding: 3px 6px; word-break: break-word; border-radius: 4px; background-color: var(--inline-code-bg); diff --git a/_sass/colors/syntax-dark.scss b/_sass/colors/syntax-dark.scss index d898c651..eb92204d 100644 --- a/_sass/colors/syntax-dark.scss +++ b/_sass/colors/syntax-dark.scss @@ -7,7 +7,7 @@ --highlight-bg-color: #151515; --highlighter-rouge-color: #c9def1; --highlight-lineno-color: #808080; - --inline-code-bg: #323238; + --inline-code-bg: rgba(255, 255, 255, 0.05); --code-color: #b0b0b0; --code-header-text-color: #6a6a6a; --code-header-muted-color: #353535; diff --git a/_sass/colors/syntax-light.scss b/_sass/colors/syntax-light.scss index 6562c76f..76aa6691 100644 --- a/_sass/colors/syntax-light.scss +++ b/_sass/colors/syntax-light.scss @@ -8,17 +8,13 @@ --highlight-bg-color: #f6f8fa; --highlighter-rouge-color: #3f596f; --highlight-lineno-color: #9e9e9e; - --inline-code-bg: #f6f6f7; + --inline-code-bg: rgba(25, 25, 28, 0.05); --code-color: #3a3a3a; --code-header-text-color: #a3a3a3; --code-header-muted-color: #e5e5e5; --code-header-icon-color: #c9c8c8; --clipboard-checked-color: #43c743; - [class^='prompt-'] { - --inline-code-bg: #fbfafa; - } - /* --- Syntax highlight theme from `rougify style github` --- */ .highlight table td { From fbba0a4204f6aea9816b92b357ccd0969d41c53f Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 2 Jul 2024 06:00:39 +0800 Subject: [PATCH 020/177] chore: fix typos in project files and docs --- _config.yml | 24 +++++------ .../modules/components/search-display.js | 2 +- _posts/2019-08-08-text-and-typography.md | 8 ++-- _posts/2019-08-08-write-a-new-post.md | 14 +++---- _posts/2019-08-09-getting-started.md | 40 +++++++++---------- _sass/addon/module.scss | 2 +- _sass/colors/typography-dark.scss | 2 +- _sass/colors/typography-light.scss | 2 +- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/_config.yml b/_config.yml index 8e54ea7f..d862178c 100644 --- a/_config.yml +++ b/_config.yml @@ -16,20 +16,20 @@ timezone: Asia/Shanghai title: Chirpy # the main title -tagline: A text-focused Jekyll theme # it will display as the sub-title +tagline: A text-focused Jekyll theme # it will display as the subtitle description: >- # used by seo meta and the atom feed A minimal, responsive and feature-rich Jekyll theme for technical writing. # Fill in the protocol & hostname for your site. -# e.g. 'https://username.github.io', note that it does not end with a '/'. +# E.g. 'https://username.github.io', note that it does not end with a '/'. url: "" github: - username: github_username # change to your github username + username: github_username # change to your GitHub username twitter: - username: twitter_username # change to your twitter username + username: twitter_username # change to your Twitter username social: # Change to your full name. @@ -38,8 +38,8 @@ social: email: example@domain.com # change to your email address links: # The first element serves as the copyright owner's link - - https://twitter.com/username # change to your twitter homepage - - https://github.com/username # change to your github homepage + - https://twitter.com/username # change to your Twitter homepage + - https://github.com/username # change to your GitHub homepage # Uncomment below to add more social links # - https://www.facebook.com/username # - https://www.linkedin.com/in/username @@ -71,7 +71,7 @@ analytics: cloudflare: id: # fill in your Cloudflare Web Analytics token -# Pageviews settings +# Page views settings pageviews: provider: # now only supports 'goatcounter' @@ -83,8 +83,8 @@ pageviews: # # Available options: # -# light - Use the light color scheme -# dark - Use the dark color scheme +# light — Use the light color scheme +# dark — Use the dark color scheme # theme_mode: # [light | dark] @@ -106,7 +106,7 @@ social_preview_image: # string, local or CORS resources toc: true comments: - # Global switch for the post comment system. Keeping it empty means disabled. + # Global switch for the post-comment system. Keeping it empty means disabled. provider: # [disqus | utterances | giscus] # The provider options are as follows: disqus: @@ -136,9 +136,9 @@ assets: env: # [development | production] pwa: - enabled: true # the option for PWA feature (installable) + enabled: true # The option for PWA feature (installable) cache: - enabled: true # the option for PWA offline cache + enabled: true # The option for PWA offline cache # Paths defined here will be excluded from the PWA cache. # Usually its value is the `baseurl` of another website that # shares the same domain name as the current website. diff --git a/_javascript/modules/components/search-display.js b/_javascript/modules/components/search-display.js index 21d634ef..40059ac1 100644 --- a/_javascript/modules/components/search-display.js +++ b/_javascript/modules/components/search-display.js @@ -1,5 +1,5 @@ /** - * This script make #search-result-wrapper switch to unloaded or shown automatically. + * This script make #search-result-wrapper switch to unload or shown automatically. */ const btnSbTrigger = document.getElementById('sidebar-trigger'); diff --git a/_posts/2019-08-08-text-and-typography.md b/_posts/2019-08-08-text-and-typography.md index 7064d5d4..a8db26a0 100644 --- a/_posts/2019-08-08-text-and-typography.md +++ b/_posts/2019-08-08-text-and-typography.md @@ -18,16 +18,16 @@ image: -# H1 - heading +# H1 — heading {: .mt-4 .mb-0 } -## H2 - heading +## H2 — heading {: data-toc-skip='' .mt-4 .mb-0 } -### H3 - heading +### H3 — heading {: data-toc-skip='' .mt-4 .mb-0 } -#### H4 - heading +#### H4 — heading {: data-toc-skip='' .mt-4 } diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 3ad1438b..69eaf34a 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -31,7 +31,7 @@ tags: [TAG] # TAG names should always be lowercase ### Timezone of Date -In order to accurately record the release date of a post, you should not only set up the `timezone` of `_config.yml`{: .filepath} but also provide the post's timezone in variable `date` of its Front Matter block. Format: `+/-TTTT`, e.g. `+0800`. +To accurately record the release date of a post, you should not only set up the `timezone` of `_config.yml`{: .filepath} but also provide the post's timezone in variable `date` of its Front Matter block. Format: `+/-TTTT`, e.g. `+0800`. ### Categories and Tags @@ -147,7 +147,7 @@ _Image Caption_ #### Size -In order to prevent the page content layout from shifting when the image is loaded, we should set the width and height for each image. +To prevent the page content layout from shifting when the image is loaded, we should set the width and height for each image. ```markdown ![Desktop View](/assets/img/sample/mockup.png){: width="700" height="400" } @@ -284,7 +284,7 @@ If you want to embed a video file directly, use the following syntax: {% include embed/video.html src='{URL}' %} ``` -Where `URL` is an URL to a video file e.g. `/path/to/sample/video.mp4`. +Where `URL` is a URL to a video file e.g. `/path/to/sample/video.mp4`. You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed. @@ -295,7 +295,7 @@ You can also specify additional attributes for the embedded video file. Here is - `muted=true` — audio will be initially silenced - `types` — specify the extensions of additional video formats separated by `|`. Ensure these files exist in the same directory as your primary video file. -Consider an example utilizing all of the above: +Consider an example using all of the above: ```liquid {% @@ -318,14 +318,14 @@ If you want to embed an audio file directly, use the following syntax: {% include embed/audio.html src='{URL}' %} ``` -Where `URL` is an URL to an audio file e.g. `/path/to/audio.mp3`. +Where `URL` is a URL to an audio file e.g. `/path/to/audio.mp3`. You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed. - `title='Text'` — title for an audio that appears below the audio and looks same as for images - `types` — specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file. -Consider an example utilizing all of the above: +Consider an example using all of the above: ```liquid {% @@ -365,7 +365,7 @@ There are several types of prompts: `tip`, `info`, `warning`, and `danger`. They ``` {: .nolineno } -### Filepath Hightlight +### Filepath Highlight ```md `/path/to/a/file.extend`{: .filepath} diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 3e0327a7..3cad3839 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -60,7 +60,7 @@ $ bundle ### Configuration -Update the variables of `_config.yml`{: .filepath} as needed. Some of them are typical options: +Update the variables in `_config.yml`{: .filepath} as needed. Some typical options include: - `url` - `avatar` @@ -69,17 +69,17 @@ Update the variables of `_config.yml`{: .filepath} as needed. Some of them are t ### Social Contact Options -Social contact options are displayed at the bottom of the sidebar. You can turn on/off the specified contacts in file `_data/contact.yml`{: .filepath }. +Social contact options are displayed at the bottom of the sidebar. You can enable or disable specific contacts in the `_data/contact.yml`{: .filepath} file. -### Customizing Stylesheet +### Customizing the Stylesheet -If you need to customize the stylesheet, copy the theme's `assets/css/jekyll-theme-chirpy.scss`{: .filepath} to the same path on your Jekyll site, and then add the custom style at the end of it. +To customize the stylesheet, copy the theme's `assets/css/jekyll-theme-chirpy.scss`{: .filepath} file to the same path in your Jekyll site, and add your custom styles at the end of the file. -Starting with version `6.2.0`, if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`{: .filepath}, copy the main sass file `_sass/main.scss`{: .filepath} into the `_sass`{: .filepath} directory in your site's source, then create a new file `_sass/variables-hook.scss`{: .filepath} and assign new value. +Starting with version `6.2.0`, if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`{: .filepath}, copy the main SASS file `_sass/main.scss`{: .filepath} to the `_sass`{: .filepath} directory in your site's source, then create a new file `_sass/variables-hook.scss`{: .filepath} and assign your new values there. -### Customing Static Assets +### Customizing Static Assets -Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined by file `_data/origin/cors.yml`{: .filepath }, and you can replace some of them according to the network conditions in the region where your website is published. +Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined in `_data/origin/cors.yml`{: .filepath }. You can replace some of them based on to the network conditions in the region where your website is published. Also, if you'd like to self-host the static assets, please refer to the [_chirpy-static-assets_](https://github.com/cotes2020/chirpy-static-assets#readme). @@ -95,42 +95,42 @@ After a few seconds, the local service will be published at _ Date: Thu, 4 Jul 2024 01:42:29 +0800 Subject: [PATCH 021/177] refactor: fix typos in locale variable statment -> statement --- _data/locales/ar.yml | 2 +- _data/locales/bg-BG.yml | 2 +- _data/locales/cs-CZ.yml | 2 +- _data/locales/de-DE.yml | 4 ++-- _data/locales/el-GR.yml | 2 +- _data/locales/en.yml | 2 +- _data/locales/es-ES.yml | 2 +- _data/locales/fi-FI.yml | 2 +- _data/locales/fr-FR.yml | 2 +- _data/locales/hu-HU.yml | 2 +- _data/locales/id-ID.yml | 2 +- _data/locales/it-IT.yml | 2 +- _data/locales/ko-KR.yml | 2 +- _data/locales/my-MM.yml | 2 +- _data/locales/pt-BR.yml | 2 +- _data/locales/ru-RU.yml | 4 ++-- _data/locales/sl-SI.yml | 2 +- _data/locales/sv-SE.yml | 2 +- _data/locales/th.yml | 2 +- _data/locales/tr-TR.yml | 2 +- _data/locales/uk-UA.yml | 2 +- _data/locales/vi-VN.yml | 2 +- _data/locales/zh-CN.yml | 2 +- _data/locales/zh-TW.yml | 2 +- assets/404.html | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/_data/locales/ar.yml b/_data/locales/ar.yml index c6082981..a79e0200 100644 --- a/_data/locales/ar.yml +++ b/_data/locales/ar.yml @@ -43,7 +43,7 @@ copyright: meta: باستخدام :PLATFORM السمة :THEME not_found: - statment: عذرا, الرابط التالي غير صالح أو انه يشير إلى صفحة غير موجودة. + statement: عذرا, الرابط التالي غير صالح أو انه يشير إلى صفحة غير موجودة. notification: update_found: يتوفر اصدار جديد للمحتوى. diff --git a/_data/locales/bg-BG.yml b/_data/locales/bg-BG.yml index 3e049938..3fb060fd 100644 --- a/_data/locales/bg-BG.yml +++ b/_data/locales/bg-BG.yml @@ -43,7 +43,7 @@ copyright: meta: Създадено чрез :PLATFORM и :THEME тема not_found: - statment: Съжалявам, но на този URL адрес няма налично съдържание. + statement: Съжалявам, но на този URL адрес няма налично съдържание. notification: update_found: Налична е нова версия на съдържанието. diff --git a/_data/locales/cs-CZ.yml b/_data/locales/cs-CZ.yml index e515c08f..cf93f614 100644 --- a/_data/locales/cs-CZ.yml +++ b/_data/locales/cs-CZ.yml @@ -43,7 +43,7 @@ copyright: meta: Použití :PLATFORM s motivem :THEME not_found: - statment: Omlouváme se, adresu URL jsme špatně umístili nebo odkazuje na něco, co neexistuje. + statement: Omlouváme se, adresu URL jsme špatně umístili nebo odkazuje na něco, co neexistuje. notification: update_found: Je k dispozici nová verze obsahu. diff --git a/_data/locales/de-DE.yml b/_data/locales/de-DE.yml index 6b187b4c..6c9d91d4 100644 --- a/_data/locales/de-DE.yml +++ b/_data/locales/de-DE.yml @@ -42,7 +42,7 @@ copyright: meta: Powered by :PLATFORM with :THEME theme not_found: - statment: Entschuldigung, dieser Link verweist auf keine vorhandene Ressource. + statement: Entschuldigung, dieser Link verweist auf keine vorhandene Ressource. notification: update_found: Eine neue Version ist verfügbar. @@ -76,7 +76,7 @@ df: post: strftime: "%d.%m.%Y" dayjs: "DD.MM.YYYY" - + # categories page categories: category_measure: diff --git a/_data/locales/el-GR.yml b/_data/locales/el-GR.yml index ab5fb0e7..b6d2a866 100644 --- a/_data/locales/el-GR.yml +++ b/_data/locales/el-GR.yml @@ -43,7 +43,7 @@ copyright: meta: Αξιοποιώντας την :PLATFORM theme :THEME not_found: - statment: Συγνώμη, έχουμε τοποθετήσει λάθος αυτήν την διεύθυνση URL ή υποδεικνύει κάτι που δεν υπάρχει. + statement: Συγνώμη, έχουμε τοποθετήσει λάθος αυτήν την διεύθυνση URL ή υποδεικνύει κάτι που δεν υπάρχει. notification: update_found: Υπάρχει διαθέσιμη μια νέα έκδοση του περιεχομένου. diff --git a/_data/locales/en.yml b/_data/locales/en.yml index 0dbe7136..152d090a 100644 --- a/_data/locales/en.yml +++ b/_data/locales/en.yml @@ -43,7 +43,7 @@ copyright: meta: Using the :THEME theme for :PLATFORM. not_found: - statment: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. + statement: Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. notification: update_found: A new version of content is available. diff --git a/_data/locales/es-ES.yml b/_data/locales/es-ES.yml index 55292308..8f8d149e 100644 --- a/_data/locales/es-ES.yml +++ b/_data/locales/es-ES.yml @@ -43,7 +43,7 @@ copyright: meta: Hecho con :PLATFORM usando el tema :THEME not_found: - statment: Lo sentimos, hemos perdido esa URL o apunta a algo que no existe. + statement: Lo sentimos, hemos perdido esa URL o apunta a algo que no existe. notification: update_found: Hay una nueva versión de contenido disponible. diff --git a/_data/locales/fi-FI.yml b/_data/locales/fi-FI.yml index c817d2b8..60c98620 100644 --- a/_data/locales/fi-FI.yml +++ b/_data/locales/fi-FI.yml @@ -42,7 +42,7 @@ copyright: meta: Käytetään :PLATFORM iä Teema :THEME not_found: - statment: Valitettavasti tällä URL-osoitteella ei ole saatavilla sisältöä. + statement: Valitettavasti tällä URL-osoitteella ei ole saatavilla sisältöä. notification: update_found: Uusi versio sisällöstä on saatavilla. diff --git a/_data/locales/fr-FR.yml b/_data/locales/fr-FR.yml index 72b034db..3f3c9a0c 100644 --- a/_data/locales/fr-FR.yml +++ b/_data/locales/fr-FR.yml @@ -43,7 +43,7 @@ copyright: meta: Propulsé par :PLATFORM avec le thème :THEME not_found: - statment: Désolé, nous avons égaré cette URL ou elle pointe vers quelque chose qui n'existe pas. + statement: Désolé, nous avons égaré cette URL ou elle pointe vers quelque chose qui n'existe pas. notification: update_found: Une nouvelle version du contenu est disponible. diff --git a/_data/locales/hu-HU.yml b/_data/locales/hu-HU.yml index b09f2cdc..53d88e96 100644 --- a/_data/locales/hu-HU.yml +++ b/_data/locales/hu-HU.yml @@ -45,7 +45,7 @@ copyright: meta: Készítve :PLATFORM motorral :THEME témával not_found: - statment: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat. + statement: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat. notification: update_found: Elérhető a tartalom új verziója. diff --git a/_data/locales/id-ID.yml b/_data/locales/id-ID.yml index 29ad1569..d772ec34 100644 --- a/_data/locales/id-ID.yml +++ b/_data/locales/id-ID.yml @@ -43,7 +43,7 @@ copyright: meta: Didukung oleh :PLATFORM dengan tema :THEME not_found: - statment: Maaf, kami gagal menemukan URL itu atau memang mengarah ke sesuatu yang tidak ada. + statement: Maaf, kami gagal menemukan URL itu atau memang mengarah ke sesuatu yang tidak ada. notification: update_found: Versi konten baru tersedia. diff --git a/_data/locales/it-IT.yml b/_data/locales/it-IT.yml index cf7b691b..c8dfb447 100644 --- a/_data/locales/it-IT.yml +++ b/_data/locales/it-IT.yml @@ -42,7 +42,7 @@ copyright: meta: Servizio offerto da :PLATFORM con tema :THEME not_found: - statment: Ci scusiamo, non è stato possibile trovare l'URL in questione. Potrebbe puntare ad una pagina non esistente. + statement: Ci scusiamo, non è stato possibile trovare l'URL in questione. Potrebbe puntare ad una pagina non esistente. notification: update_found: Nuova versione del contenuto disponibile. diff --git a/_data/locales/ko-KR.yml b/_data/locales/ko-KR.yml index 4dd221b9..82976349 100644 --- a/_data/locales/ko-KR.yml +++ b/_data/locales/ko-KR.yml @@ -43,7 +43,7 @@ copyright: meta: Powered by :PLATFORM with :THEME theme not_found: - statment: 해당 URL은 존재하지 않습니다. + statement: 해당 URL은 존재하지 않습니다. notification: update_found: 새 버전의 콘텐츠를 사용할 수 있습니다. diff --git a/_data/locales/my-MM.yml b/_data/locales/my-MM.yml index 98848d59..d5bf728f 100644 --- a/_data/locales/my-MM.yml +++ b/_data/locales/my-MM.yml @@ -43,7 +43,7 @@ copyright: meta: Powered by :PLATFORM with :THEME theme not_found: - statment: ဝမ်းနည်းပါသည်၊ ကျွန်ုပ်တို့သည် အဆိုပါ URL ကို မှားယွင်းစွာ နေရာချထားခြင်း သို့မဟုတ် ၎င်းသည် မရှိသောအရာကို ညွှန်ပြနေပါသည်။ + statement: ဝမ်းနည်းပါသည်၊ ကျွန်ုပ်တို့သည် အဆိုပါ URL ကို မှားယွင်းစွာ နေရာချထားခြင်း သို့မဟုတ် ၎င်းသည် မရှိသောအရာကို ညွှန်ပြနေပါသည်။ notification: update_found: အကြောင်းအရာဗားရှင်းအသစ်ကို ရနိုင်ပါပြီ။ diff --git a/_data/locales/pt-BR.yml b/_data/locales/pt-BR.yml index 4cef833d..7ca60a74 100644 --- a/_data/locales/pt-BR.yml +++ b/_data/locales/pt-BR.yml @@ -43,7 +43,7 @@ copyright: meta: Feito com :PLATFORM usando o tema :THEME not_found: - statment: Desculpe, a página não foi encontrada. + statement: Desculpe, a página não foi encontrada. notification: update_found: Uma nova versão do conteúdo está disponível. diff --git a/_data/locales/ru-RU.yml b/_data/locales/ru-RU.yml index 185407c1..868ba957 100644 --- a/_data/locales/ru-RU.yml +++ b/_data/locales/ru-RU.yml @@ -42,7 +42,7 @@ copyright: meta: Использует тему :THEME для :PLATFORM not_found: - statment: Извините, мы перепутали URL-адрес или он указывает на что-то несуществующее. + statement: Извините, мы перепутали URL-адрес или он указывает на что-то несуществующее. notification: update_found: Доступна новая версия контента. @@ -76,7 +76,7 @@ df: post: strftime: "%d.%m.%Y" dayjs: "DD.MM.YYYY" - + # categories page categories: category_measure: diff --git a/_data/locales/sl-SI.yml b/_data/locales/sl-SI.yml index 7ab18b1d..4d9434d4 100644 --- a/_data/locales/sl-SI.yml +++ b/_data/locales/sl-SI.yml @@ -43,7 +43,7 @@ copyright: meta: Uporabljena :PLATFORM tema :THEME #Using the :PLATFORM theme :THEME not_found: - statment: Oprostite, hiperpovezava je neustrezna ali vsebina ne obstajata. #Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. + statement: Oprostite, hiperpovezava je neustrezna ali vsebina ne obstajata. #Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. notification: update_found: Novejša različica vsebine je na voljo. #A new version of content is available. diff --git a/_data/locales/sv-SE.yml b/_data/locales/sv-SE.yml index 7ec2ee23..decb59cf 100644 --- a/_data/locales/sv-SE.yml +++ b/_data/locales/sv-SE.yml @@ -43,7 +43,7 @@ copyright: meta: Byggd med :PLATFORM och temat :THEME not_found: - statment: Ursäkta, vi har tappat bort den här webbadressen eller så pekar den på något som inte längre finns. + statement: Ursäkta, vi har tappat bort den här webbadressen eller så pekar den på något som inte längre finns. notification: update_found: Det finns en ny version av innehållet. diff --git a/_data/locales/th.yml b/_data/locales/th.yml index 22cb00aa..a3f41a0e 100644 --- a/_data/locales/th.yml +++ b/_data/locales/th.yml @@ -43,7 +43,7 @@ copyright: meta: กำลังใช้ธีมของ :PLATFORM ชื่อ :THEME not_found: - statment: ขออภัย เราวาง URL นั้นไว้ผิดที่ หรือมันชี้ไปยังสิ่งที่ไม่มีอยู่ + statement: ขออภัย เราวาง URL นั้นไว้ผิดที่ หรือมันชี้ไปยังสิ่งที่ไม่มีอยู่ notification: update_found: มีเวอร์ชันใหม่ของเนื้อหา diff --git a/_data/locales/tr-TR.yml b/_data/locales/tr-TR.yml index 50d81102..768f57cd 100644 --- a/_data/locales/tr-TR.yml +++ b/_data/locales/tr-TR.yml @@ -43,7 +43,7 @@ copyright: meta: :PLATFORM ve :THEME teması not_found: - statment: Üzgünüz, bu linki yanlış yerleştirdik veya var olmayan bir şeye işaret ediyor. + statement: Üzgünüz, bu linki yanlış yerleştirdik veya var olmayan bir şeye işaret ediyor. notification: update_found: İçeriğin yeni bir sürümü mevcut. diff --git a/_data/locales/uk-UA.yml b/_data/locales/uk-UA.yml index b6050738..8fef52e8 100644 --- a/_data/locales/uk-UA.yml +++ b/_data/locales/uk-UA.yml @@ -43,7 +43,7 @@ copyright: meta: Powered by :PLATFORM with :THEME theme not_found: - statment: Вибачте, це посилання вказує на ресурс, що не існує. + statement: Вибачте, це посилання вказує на ресурс, що не існує. notification: update_found: Доступна нова версія вмісту. diff --git a/_data/locales/vi-VN.yml b/_data/locales/vi-VN.yml index 617431a0..6c2ceffd 100644 --- a/_data/locales/vi-VN.yml +++ b/_data/locales/vi-VN.yml @@ -42,7 +42,7 @@ copyright: meta: Trang web này được tạo bởi :PLATFORM với chủ đề :THEME not_found: - statment: Xin lỗi, chúng tôi đã đặt nhầm URL hoặc đường dẫn trỏ đến một trang nào đó không tồn tại. + statement: Xin lỗi, chúng tôi đã đặt nhầm URL hoặc đường dẫn trỏ đến một trang nào đó không tồn tại. notification: update_found: Đã có phiên bản mới của nội dung. diff --git a/_data/locales/zh-CN.yml b/_data/locales/zh-CN.yml index f8281346..5c134101 100644 --- a/_data/locales/zh-CN.yml +++ b/_data/locales/zh-CN.yml @@ -42,7 +42,7 @@ copyright: meta: 本站采用 :PLATFORM 主题 :THEME not_found: - statment: 抱歉，我们放错了该 URL，或者它指向了不存在的内容。 + statement: 抱歉，我们放错了该 URL，或者它指向了不存在的内容。 notification: update_found: 发现新版本的内容。 diff --git a/_data/locales/zh-TW.yml b/_data/locales/zh-TW.yml index 911253b6..33a4330b 100644 --- a/_data/locales/zh-TW.yml +++ b/_data/locales/zh-TW.yml @@ -42,7 +42,7 @@ copyright: meta: 本網站使用 :PLATFORM 產生，採用 :THEME 主題 not_found: - statment: 抱歉，您可能正在存取一個已被移動的 URL，或者它從未存在。 + statement: 抱歉，您可能正在存取一個已被移動的 URL，或者它從未存在。 notification: update_found: 發現新版本更新。 diff --git a/assets/404.html b/assets/404.html index 5b46cc8c..af89d6d1 100644 --- a/assets/404.html +++ b/assets/404.html @@ -11,4 +11,4 @@ {% include lang.html %} -

{{ site.data.locales[lang].not_found.statment }}

+

{{ site.data.locales[lang].not_found.statement }}

From db9e58bab23f5cc4993efa36d90ae390be7d6e3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:49:30 +0800 Subject: [PATCH 022/177] build(deps-dev): bump the dev-deps group with 3 updates (#1824) Updates the requirements on [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core), [@babel/plugin-transform-class-properties](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-class-properties) and [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) to permit the latest version. Updates `@babel/core` to 7.24.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.7/packages/babel-core) Updates `@babel/plugin-transform-class-properties` to 7.24.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.7/packages/babel-plugin-transform-class-properties) Updates `@babel/preset-env` to 7.24.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.7/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:development dependency-group: dev-deps - dependency-name: "@babel/plugin-transform-class-properties" dependency-type: direct:development dependency-group: dev-deps - dependency-name: "@babel/preset-env" dependency-type: direct:development dependency-group: dev-deps ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d6f442b6..7d4835f3 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "@babel/core": "^7.24.6", - "@babel/plugin-transform-class-properties": "^7.24.6", - "@babel/preset-env": "^7.24.6", + "@babel/core": "^7.24.7", + "@babel/plugin-transform-class-properties": "^7.24.7", + "@babel/preset-env": "^7.24.7", "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@rollup/plugin-babel": "^6.0.4", From a07a57ec922249d3a22da56fbcb30d83eadef728 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 4 Jul 2024 02:21:22 +0800 Subject: [PATCH 023/177] feat(ui): make `info-prompt` icon looks like the letter "i" (#1835) --- _sass/addon/commons.scss | 4 ++-- _sass/addon/module.scss | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index e6cf7c26..4087d241 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -107,8 +107,8 @@ blockquote { } } - @include prompt('tip', '\f0eb', 'regular'); - @include prompt('info', '\f06a'); + @include prompt('tip', '\f0eb', $fa-style: 'regular'); + @include prompt('info', '\f06a', $rotate: 180); @include prompt('warning', '\f06a'); @include prompt('danger', '\f071'); } diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index edc5f3ef..9e85adc0 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -187,7 +187,7 @@ transform: translateX(-50%); } -@mixin prompt($type, $fa-content, $fa-style: 'solid') { +@mixin prompt($type, $fa-content, $fa-style: 'solid', $rotate: 0) { &.prompt-#{$type} { background-color: var(--prompt-#{$type}-bg); @@ -195,6 +195,10 @@ content: $fa-content; color: var(--prompt-#{$type}-icon-color); font: var(--fa-font-#{$fa-style}); + + @if $rotate != 0 { + transform: rotate(#{$rotate}deg); + } } } } From 8673e1335f0771eac364d0a2866f27476d61a58b Mon Sep 17 00:00:00 2001 From: Daniel Singleton <48238314+goodnightdaniel@users.noreply.github.com> Date: Fri, 5 Jul 2024 05:03:01 -0700 Subject: [PATCH 024/177] feat: add Reddit social option (#1836) --- _data/contact.yml | 4 ++++ _data/share.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/_data/contact.yml b/_data/contact.yml index d6819e0d..87df4606 100644 --- a/_data/contact.yml +++ b/_data/contact.yml @@ -30,3 +30,7 @@ # - type: bluesky # icon: 'fa-brands fa-bluesky' # url: '' # Fill with your Bluesky profile link +# +# - type: reddit +# icon: 'fa-brands fa-reddit' +# url: '' # Fill with your Reddit profile link diff --git a/_data/share.yml b/_data/share.yml index 0aa28fd4..04bac44c 100644 --- a/_data/share.yml +++ b/_data/share.yml @@ -40,3 +40,7 @@ platforms: # - type: Bluesky # icon: "fa-brands fa-bluesky" # link: "https://bsky.app/intent/compose?text=TITLE%20URL" + # + # - type: Reddit + # icon: "fa-brands fa-square-reddit" + # link: "https://www.reddit.com/submit?url=URL&title=TITLE" From e3a78b6243f7056105d72185bb6e94b436834e5b Mon Sep 17 00:00:00 2001 From: Daniel Singleton <48238314+goodnightdaniel@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:53:02 -0700 Subject: [PATCH 025/177] feat: add Threads social links (#1837) --- _data/contact.yml | 4 ++++ _data/share.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/_data/contact.yml b/_data/contact.yml index 87df4606..ed40acb7 100644 --- a/_data/contact.yml +++ b/_data/contact.yml @@ -34,3 +34,7 @@ # - type: reddit # icon: 'fa-brands fa-reddit' # url: '' # Fill with your Reddit profile link +# +# - type: threads +# icon: 'fa-brands fa-threads' +# url: '' # Fill with your Threads profile link diff --git a/_data/share.yml b/_data/share.yml index 04bac44c..6f975680 100644 --- a/_data/share.yml +++ b/_data/share.yml @@ -44,3 +44,7 @@ platforms: # - type: Reddit # icon: "fa-brands fa-square-reddit" # link: "https://www.reddit.com/submit?url=URL&title=TITLE" + # + # - type: Threads + # icon: "fa-brands fa-square-threads" + # link: "https://www.threads.net/intent/post?text=TITLE%20URL" From e4db1a176f3f69f676cbc0bf27b1d5a657ece05e Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Thu, 11 Jul 2024 00:14:47 +0400 Subject: [PATCH 026/177] feat(dev): add vscode tasks (#1843) --- .gitignore | 1 + .vscode/tasks.json | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index 104d0531..5d05699c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ package-lock.json .vscode/* !.vscode/settings.json !.vscode/extensions.json +!.vscode/tasks.json # Misc _sass/dist diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..99ed5c5b --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,64 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Run Jekyll Server", + "type": "shell", + "command": "./tools/run.sh", + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [], + "detail": "Runs the Jekyll server with live reload." + }, + { + "label": "Build Jekyll Site", + "type": "shell", + "command": "./tools/test.sh", + "group": { + "kind": "build" + }, + "problemMatcher": [], + "detail": "Build the Jekyll site for production." + }, + { + "label": "Build JS (watch)", + "type": "shell", + "command": "npm run watch:js", + "group": { + "kind": "build" + }, + "problemMatcher": [], + "detail": "Build JS files in watch mode." + }, + { + "label": "Build CSS", + "type": "shell", + "command": "npm run build:css", + "group": { + "kind": "build" + }, + "problemMatcher": [], + "detail": "Build CSS files." + }, + { + "label": "Build JS & CSS", + "type": "shell", + "command": "npm run build", + "group": { + "kind": "build" + }, + "problemMatcher": [], + "detail": "Build JS & CSS for production." + }, + { + "label": "Run Jekyll Server + Build JS (watch)", + "dependsOn": ["Run Jekyll Server", "Build JS (watch)"], + "group": { + "kind": "build" + }, + "detail": "Runs both the Jekyll server with live reload and build JS files in watch mode." + } + ] +} From 8c30f0a9c349eb039bc7fa151ed140e2eb26a643 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 12 Jul 2024 02:03:52 +0800 Subject: [PATCH 027/177] build(dev): support for running tasks in macOS --- .vscode/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 787a0c84..1d784c0e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,5 +23,9 @@ "less.validate": false, // Stylint extension settings "stylelint.snippet": ["css", "scss"], - "stylelint.validate": ["css", "scss"] + "stylelint.validate": ["css", "scss"], + // Run tasks in macOS + "terminal.integrated.profiles.osx": { + "zsh": { "path": "/bin/zsh", "args": ["-l", "-i"] } + } } From 979f86cf64e1fcace4231fb070c7e6398fd4e5ec Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Wed, 17 Jul 2024 19:32:48 +0400 Subject: [PATCH 028/177] fix: avoid caching pageviews data (#1849) --- _javascript/pwa/sw.js | 16 ++++++++++++++-- assets/js/data/swconf.js | 26 ++++++++++++++++++-------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/_javascript/pwa/sw.js b/_javascript/pwa/sw.js index bc67bd83..94b64bf7 100644 --- a/_javascript/pwa/sw.js +++ b/_javascript/pwa/sw.js @@ -3,11 +3,23 @@ import { baseurl } from '../../_config.yml'; importScripts(`${baseurl}/assets/js/data/swconf.js`); const purge = swconf.purge; +const interceptor = swconf.interceptor; function verifyUrl(url) { - const requestPath = new URL(url).pathname; + const requestUrl = new URL(url); + const requestPath = requestUrl.pathname; - for (const path of swconf.denyPaths) { + if (!requestUrl.protocol.startsWith('http')) { + return false; + } + + for (const prefix of interceptor.urlPrefixes) { + if (requestUrl.href.startsWith(prefix)) { + return false; + } + } + + for (const path of interceptor.paths) { if (requestPath.startsWith(path)) { return false; } diff --git a/assets/js/data/swconf.js b/assets/js/data/swconf.js index 5c1ed292..798888a9 100644 --- a/assets/js/data/swconf.js +++ b/assets/js/data/swconf.js @@ -22,14 +22,24 @@ const swconf = { {% endfor %} ], - {%- comment -%} The request url with below path will not be cached. {%- endcomment -%} - denyPaths: [ - {% for path in site.pwa.cache.deny_paths %} - {% unless path == empty %} - '{{ path | relative_url }}'{%- unless forloop.last -%},{%- endunless -%} - {% endunless %} - {% endfor %} - ], + interceptor: { + {%- comment -%} URLs containing the following paths will not be cached. {%- endcomment -%} + paths: [ + {% for path in site.pwa.cache.deny_paths %} + {% unless path == empty %} + '{{ path | relative_url }}'{%- unless forloop.last -%},{%- endunless -%} + {% endunless %} + {% endfor %} + ], + + {%- comment -%} URLs containing the following prefixes will not be cached. {%- endcomment -%} + urlPrefixes: [ + {% if site.analytics.goatcounter.id != nil and site.pageviews.provider == 'goatcounter' %} + 'https://{{ site.analytics.goatcounter.id }}.goatcounter.com/counter/' + {% endif %} + ] + }, + purge: false {% else %} purge: true From b641b364809ea15c46d16ce1379a267d395d55d0 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 18 Jul 2024 01:20:17 +0800 Subject: [PATCH 029/177] ci: set node version to LTS There are some problems with the latest version. See: https://github.com/cotes2020/jekyll-theme-chirpy/actions/runs/9977150040 --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/style-lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d0cc84a3..4f2da0e3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: latest + node-version: lts/* - run: npm install - run: npx semantic-release diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca60bd67..50a158b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: latest + node-version: lts/* - name: Build Assets run: npm i && npm run build diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index a2cf4f69..f84f3bcc 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -18,6 +18,6 @@ jobs: - name: Setup Node uses: actions/setup-node@v4 with: - node-version: latest + node-version: lts/* - run: npm i - run: npm test From 5c5910f1fc661ec3dce203ac961c7f64f1991895 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:17:11 +0800 Subject: [PATCH 030/177] fix: remove extra dual-mode images from lightbox (#1883) --- _javascript/modules/components/img-popup.js | 41 +++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js index b5c7c6ea..6c3e733a 100644 --- a/_javascript/modules/components/img-popup.js +++ b/_javascript/modules/components/img-popup.js @@ -4,12 +4,47 @@ * Dependencies: https://github.com/biati-digital/glightbox */ -const IMG_CLASS = 'popup'; +const html = document.documentElement; +const lightImages = '.popup:not(.dark)'; +const darkImages = '.popup:not(.light)'; +let selector = lightImages; + +function updateImages(lightbox) { + if (selector === lightImages) { + selector = darkImages; + } else { + selector = lightImages; + } + + lightbox.destroy(); + lightbox = GLightbox({ selector: `${selector}` }); +} export function imgPopup() { - if (document.getElementsByClassName(IMG_CLASS).length === 0) { + if (document.querySelector('.popup') === null) { return; } - GLightbox({ selector: `.${IMG_CLASS}` }); + if ( + (html.hasAttribute('data-mode') && + html.getAttribute('data-mode') === 'dark') || + (!html.hasAttribute('data-mode') && + window.matchMedia('(prefers-color-scheme: dark)').matches) + ) { + selector = darkImages; + } + + let lightbox = GLightbox({ selector: `${selector}` }); + + if (document.getElementById('mode-toggle')) { + window.addEventListener('message', (event) => { + if ( + event.source === window && + event.data && + event.data.direction === ModeToggle.ID + ) { + updateImages(lightbox); + } + }); + } } From 35fdea0c4fa6faa927dd1346b1def9d6531ce003 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:25:55 +0800 Subject: [PATCH 031/177] docs: add devcontainers tutorial (#1844) --- _posts/2019-08-09-getting-started.md | 90 +++++++++++++++------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 3cad3839..6cbd4e69 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -11,51 +11,60 @@ pin: true media_subpath: '/posts/20180809' --- -## Prerequisites +## Creating a site repository -Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of the basic environment. [Git](https://git-scm.com/) also needs to be installed. +There are two methods to create a site repository for **Chirpy**: -## Installation +- [**Using the starter**](#option-1-using-the-starter) — This approach simplifies upgrades and isolates unnecessary project files, enabling you to concentrate on your content. It's ideal for those who want a hassle-free setup focused primarily on writing. +- [**Forking the theme**](#option-2-forking-the-theme) — This method allows for customization and development but presents challenges during upgrades. It is not recommended to use this approach unless you are familiar with Jekyll and plan to modify this project. -### Creating a New Site +### Option 1: using the starter -There are two ways to create a new repository for this theme: +1. Sign in to GitHub and navigate to the [**starter**][starter]. +2. Click the Use this template button and then select Create a new repository. -- [**Using the Chirpy Starter**](#option-1-using-the-chirpy-starter) — Easy to upgrade, isolates irrelevant project files so you can focus on writing. -- [**GitHub Fork**](#option-2-github-fork) — Convenient for custom development, but difficult to upgrade. Unless you are familiar with Jekyll and are determined to tweak or contribute to this project, this approach is not recommended. +### Option 2: forking the theme -#### Option 1. Using the Chirpy Starter +Sign in to GitHub and [fork the theme](https://github.com/cotes2020/jekyll-theme-chirpy/fork). -Sign in to GitHub and browse to [**Chirpy Starter**][starter], click the button Use this template > Create a new repository, and name the new repository `USERNAME.github.io`, where `USERNAME` represents your GitHub username. +## Name your new repository -#### Option 2. GitHub Fork +Rename your repository to `.github.io`. The `username` represents your lowercase GitHub username. -Sign in to GitHub to [fork **Chirpy**](https://github.com/cotes2020/jekyll-theme-chirpy/fork), and then rename it to `USERNAME.github.io` (`USERNAME` means your username). +## Setting up the environment -Next, clone the repository to your local machine, make sure it has [Node.js][nodejs] installed, then go to the root directory of the repo and run the following command: +The easiest way to set up the runtime environment, especially on Windows, is by using [Dev Containers](#setting-up-in-dev-containers). This method installs all packages within a Docker container, isolating them from the host machine and ensuring no interference with existing settings. -```console -$ bash tools/init.sh -``` +For Unix-like systems, besides using Dev Containers, you can also [natively set up](#setting-up-natively) the runtime environment to achieve optimal performance. + +### Setting up in Dev Containers -> If you don't want to deploy your site on GitHub Pages, append option `--no-gh` at the end of the above command. -{: .prompt-info } +1. Install Docker: + - On Windows/macOS, install [Docker Desktop][docker-desktop]. + - On Linux, install [Docker Engine][docker-engine]. +2. Install [VS Code][vscode] and the [Dev Containers extension][dev-containers]. +3. Clone your repository: + - For Docker Desktop: Start VS Code and [clone your repo in a container volume][dc-clone-in-vol]. + - For Docker Engine: Clone your repo to the local disk, then launch VS Code and [open your repo in the container][dc-open-in-container]. +4. Wait a few minutes for Dev Containers to finish installing. -The above command will: +### Setting up natively -1. Check out the code to the [latest tag][latest-tag] (to ensure the stability of your site: as the code for the default branch is under development). -2. Remove non-essential sample files and take care of GitHub-related files. -3. Build CSS/JS assets files and then make them tracked by Git. -4. Automatically create a new commit to save the changes above. +1. Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of the basic environment. Ensure that [Git](https://git-scm.com/) is also installed. +2. Clone your repository to a local disk. +3. If your site is created by forking the theme, install [Node.js][nodejs] and run `bash tools/init.sh` in the root directory. This will initialize the repository files and create a commit to save the changes. +4. Install the dependencies by running `bundle`. -### Installing Dependencies +### Start the local server -Before running local server for the first time, go to the root directory of your site and run: +To run the site locally, use the following command: ```console -$ bundle +$ bundle exec jekyll s ``` +After a few seconds, the local server will be available at . + ## Usage ### Configuration @@ -67,31 +76,21 @@ Update the variables in `_config.yml`{: .filepath} as needed. Some typical optio - `timezone` - `lang` -### Social Contact Options +### Social contact options Social contact options are displayed at the bottom of the sidebar. You can enable or disable specific contacts in the `_data/contact.yml`{: .filepath} file. -### Customizing the Stylesheet +### Customizing the stylesheet To customize the stylesheet, copy the theme's `assets/css/jekyll-theme-chirpy.scss`{: .filepath} file to the same path in your Jekyll site, and add your custom styles at the end of the file. Starting with version `6.2.0`, if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`{: .filepath}, copy the main SASS file `_sass/main.scss`{: .filepath} to the `_sass`{: .filepath} directory in your site's source, then create a new file `_sass/variables-hook.scss`{: .filepath} and assign your new values there. -### Customizing Static Assets - -Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined in `_data/origin/cors.yml`{: .filepath }. You can replace some of them based on to the network conditions in the region where your website is published. +### Customizing static assets -Also, if you'd like to self-host the static assets, please refer to the [_chirpy-static-assets_](https://github.com/cotes2020/chirpy-static-assets#readme). - -### Running Local Server - -You may want to preview the site contents before publishing, so just run it by: - -```console -$ bundle exec jekyll s -``` +Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined in `_data/origin/cors.yml`{: .filepath }. You can replace some of them based on the network conditions in the region where your website is published. -After a few seconds, the local service will be published at __. +If you prefer to self-host the static assets, refer to the [_chirpy-static-assets_](https://github.com/cotes2020/chirpy-static-assets#readme) repository. ## Deployment @@ -99,7 +98,7 @@ Before deploying, check the `_config.yml`{: .filepath} file and ensure the `url` Now you can choose _ONE_ of the following methods to deploy your Jekyll site. -### Deploy Using GitHub Actions +### Deploy using GitHub Actions Prepare the following: @@ -120,7 +119,7 @@ Next, configure the _Pages_ service: You can now visit the URL provided by GitHub to access your site. -### Manual Build and Deployment +### Manual build and deployment For self-hosted servers, you will need to build the site on your local machine and then upload the site files to the server. @@ -135,4 +134,9 @@ Unless you specified the output path, the generated site files will be placed in [nodejs]: https://nodejs.org/ [starter]: https://github.com/cotes2020/chirpy-starter [pages-workflow-src]: https://docs.github.com/en/pages/getting-started-with-github-pages/configuring-a-publishing-source-for-your-github-pages-site#publishing-with-a-custom-github-actions-workflow -[latest-tag]: https://github.com/cotes2020/jekyll-theme-chirpy/tags +[docker-desktop]: https://www.docker.com/products/docker-desktop/ +[docker-engine]: https://docs.docker.com/engine/install/ +[vscode]: https://code.visualstudio.com/ +[dev-containers]: https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers +[dc-clone-in-vol]: https://code.visualstudio.com/docs/devcontainers/containers#_quick-start-open-a-git-repository-or-github-pr-in-an-isolated-container-volume +[dc-open-in-container]: https://code.visualstudio.com/docs/devcontainers/containers#_quick-start-open-an-existing-folder-in-a-container From e347d0632f063b514a030f85f9900bee8397f1cc Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:43:38 +0800 Subject: [PATCH 032/177] build: update ruby version requirements `html-proofer` 5.x requires Ruby `>= 3.1, < 4.0` --- jekyll-theme-chirpy.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 2c77572b..a1b97cc2 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |spec| "plugin_type" => "theme" } - spec.required_ruby_version = ">= 3.0" + spec.required_ruby_version = "~> 3.1" spec.add_runtime_dependency "jekyll", "~> 4.3" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" From 23729c9c8f2c803a839d5579d954efd85abf82c5 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:24:30 -0400 Subject: [PATCH 033/177] refactor: update the sass mixed declarations (#1872) See: https://sass-lang.com/d/mixed-decls --- _sass/addon/commons.scss | 22 +++++++++++----------- _sass/addon/syntax.scss | 6 +++--- _sass/colors/typography-dark.scss | 12 ++++++------ _sass/colors/typography-light.scss | 16 ++++++++-------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 4087d241..c4c68e78 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -1,6 +1,8 @@ /* The common styles */ html { + font-size: 16px; + @media (prefers-color-scheme: light) { &:not([data-mode]), &[data-mode='light'] { @@ -22,8 +24,6 @@ html { @include light-scheme; } } - - font-size: 16px; } body { @@ -218,13 +218,13 @@ i { #access-lastmod { a { + color: inherit; + &:hover { @extend %link-hover; } @extend %no-bottom-border; - - color: inherit; } } @@ -682,15 +682,15 @@ $btn-mb: 0.5rem; background: var(--sidebar-bg); border-right: 1px solid var(--sidebar-border-color); + /* Hide scrollbar for IE, Edge and Firefox */ + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + /* Hide scrollbar for Chrome, Safari and Opera */ &::-webkit-scrollbar { display: none; } - /* Hide scrollbar for IE, Edge and Firefox */ - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - %sidebar-link-hover { &:hover { color: var(--sidebar-active-color); @@ -1036,6 +1036,9 @@ search { padding-bottom: 3rem; a { + font-size: 1.4rem; + line-height: 2.5rem; + &:hover { @extend %link-hover; } @@ -1043,9 +1046,6 @@ search { @extend %link-color; @extend %no-bottom-border; @extend %heading; - - font-size: 1.4rem; - line-height: 2.5rem; } > article { diff --git a/_sass/addon/syntax.scss b/_sass/addon/syntax.scss index 73c66aae..b0efd202 100644 --- a/_sass/addon/syntax.scss +++ b/_sass/addon/syntax.scss @@ -50,13 +50,13 @@ html { @extend %rounded; @extend %code-snippet-bg; + overflow: auto; + padding-bottom: 0.75rem; + @at-root figure#{&} { @extend %code-snippet-bg; } - overflow: auto; - padding-bottom: 0.75rem; - pre { margin-bottom: 0; font-size: $code-font-size; diff --git a/_sass/colors/typography-dark.scss b/_sass/colors/typography-dark.scss index 7d0fd302..12427ec4 100644 --- a/_sass/colors/typography-dark.scss +++ b/_sass/colors/typography-dark.scss @@ -84,27 +84,29 @@ --prompt-danger-bg: rgb(86, 28, 8, 0.8); --prompt-danger-icon-color: #cd0202; - /* tags */ + /* Tags */ --tag-border: rgb(59, 79, 88); --tag-shadow: rgb(32, 33, 33); --dash-color: rgb(63, 65, 68); --search-tag-bg: #292828; - /* categories */ + /* Categories */ --categories-border: rgb(64, 66, 69, 0.5); --categories-hover-bg: rgb(73, 75, 76); --categories-icon-hover-color: white; - /* archives */ + /* Archive */ --timeline-node-bg: rgb(150, 152, 156); --timeline-color: rgb(63, 65, 68); --timeline-year-dot-color: var(--timeline-color); + color-scheme: dark; + .light { display: none; } - /* categories */ + /* Categories */ .categories.card, .list-group-item { background-color: var(--card-bg); @@ -138,8 +140,6 @@ ); } - color-scheme: dark; - /* stylelint-disable-next-line selector-id-pattern */ #disqus_thread { color-scheme: none; diff --git a/_sass/colors/typography-light.scss b/_sass/colors/typography-light.scss index 557f937d..78000746 100644 --- a/_sass/colors/typography-light.scss +++ b/_sass/colors/typography-light.scss @@ -92,14 +92,6 @@ --tag-hover: rgb(222, 226, 230); --search-tag-bg: #f8f9fa; - [class^='prompt-'] { - --link-underline-color: rgb(219, 216, 216); - } - - .dark { - display: none; - } - /* Categories */ --categories-border: rgba(0, 0, 0, 0.125); --categories-hover-bg: var(--btn-border-color); @@ -109,4 +101,12 @@ --timeline-color: rgba(0, 0, 0, 0.075); --timeline-node-bg: #c2c6cc; --timeline-year-dot-color: #ffffff; + + [class^='prompt-'] { + --link-underline-color: rgb(219, 216, 216); + } + + .dark { + display: none; + } } /* light-scheme */ From d74bfaeda25f5b75d665b99b38b44f6f8dc98df1 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 13 Aug 2024 13:50:40 +0800 Subject: [PATCH 034/177] chore(tools): improve the init-script --- tools/init.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/init.sh b/tools/init.sh index c0c4e183..603e5175 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -80,13 +80,13 @@ init_files() { rm -rf .github && mkdir -p .github/workflows mv "$temp/$ACTIONS_WORKFLOW" .github/workflows/"$ACTIONS_WORKFLOW" rm -rf "$temp" - - ## Cleanup image settings in site config - _sedi "s/(^timezone:).*/\1/;s/(^.*cdn:).*/\1/;s/(^avatar:).*/\1/" _config.yml fi + # Cleanup image settings in site config + _sedi "s/(^timezone:).*/\1/;s/(^.*cdn:).*/\1/;s/(^avatar:).*/\1/" _config.yml + # remove the other files - rm -rf _posts/* + rm -rf tools/init.sh tools/release.sh _posts/* # build assets npm i && npm run build From 7f83c3d00dd2a535c847d162d6c17d695f45eb0d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:05:39 +0800 Subject: [PATCH 035/177] refactor: improve the efficiency of `GLightbox` switching Repeatedly using `GLightbox.destroy()` (>= 4 times) will cause `GLightbox` to fail to generate new objects --- _javascript/modules/components/img-popup.js | 22 +++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js index 6c3e733a..ac120435 100644 --- a/_javascript/modules/components/img-popup.js +++ b/_javascript/modules/components/img-popup.js @@ -9,15 +9,18 @@ const lightImages = '.popup:not(.dark)'; const darkImages = '.popup:not(.light)'; let selector = lightImages; -function updateImages(lightbox) { +function updateImages(current, reverse) { if (selector === lightImages) { selector = darkImages; } else { selector = lightImages; } - lightbox.destroy(); - lightbox = GLightbox({ selector: `${selector}` }); + if (reverse === null) { + reverse = GLightbox({ selector: `${selector}` }); + } + + [current, reverse] = [reverse, current]; } export function imgPopup() { @@ -25,6 +28,11 @@ export function imgPopup() { return; } + const hasDualImages = !( + document.querySelector('.popup.light') === null && + document.querySelector('.popup.dark') === null + ); + if ( (html.hasAttribute('data-mode') && html.getAttribute('data-mode') === 'dark') || @@ -34,16 +42,18 @@ export function imgPopup() { selector = darkImages; } - let lightbox = GLightbox({ selector: `${selector}` }); + let current = GLightbox({ selector: `${selector}` }); + + if (hasDualImages && document.getElementById('mode-toggle')) { + let reverse = null; - if (document.getElementById('mode-toggle')) { window.addEventListener('message', (event) => { if ( event.source === window && event.data && event.data.direction === ModeToggle.ID ) { - updateImages(lightbox); + updateImages(current, reverse); } }); } From efd2941ce08f8bb2a56e543ee04da7525c2bacc7 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:28:14 +0800 Subject: [PATCH 036/177] build: resume platform-specific dependencies --- Gemfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 672e9e4b..66f9337d 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,11 @@ source "https://rubygems.org" gemspec -group :test do - gem "html-proofer", "~> 5.0" +gem "html-proofer", "~> 5.0", group: :test + +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", ">= 1", "< 3" + gem "tzinfo-data" end + +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] From 99eaf6089ecc663730f638c699969250d0f406b5 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:28:57 +0800 Subject: [PATCH 037/177] chore: remove duplicate config --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1d784c0e..5e8a04f3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,6 @@ // Prettier "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, - "prettier.trailingComma": "none", // Shopify Liquid "files.associations": { "*.html": "liquid" From bf6c996c4ea69c2be2deda4d8606de776f6689b5 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:31:22 +0800 Subject: [PATCH 038/177] chore: move entries in git-ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5d05699c..b528d6d1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ Gemfile.lock .jekyll-cache .jekyll-metadata _site -_app # RubyGems *.gem @@ -26,3 +25,4 @@ package-lock.json # Misc _sass/dist assets/js/dist +_app From befc4ce9c5026f67f99bce66e223d056229f0bdb Mon Sep 17 00:00:00 2001 From: Julius Gamanyi <85777+juliusgb@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:21:29 +0200 Subject: [PATCH 039/177] feat(analytics): add fathom analytics (#1913) --- _config.yml | 2 ++ _includes/analytics/fathom.html | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 _includes/analytics/fathom.html diff --git a/_config.yml b/_config.yml index d862178c..fea93d3f 100644 --- a/_config.yml +++ b/_config.yml @@ -70,6 +70,8 @@ analytics: domain: # fill in your Matomo domain cloudflare: id: # fill in your Cloudflare Web Analytics token + fathom: + id: # fill in your Fathom Site ID # Page views settings pageviews: diff --git a/_includes/analytics/fathom.html b/_includes/analytics/fathom.html new file mode 100644 index 00000000..4b603d3a --- /dev/null +++ b/_includes/analytics/fathom.html @@ -0,0 +1,7 @@ + + + From 80bd7928a02c75c843a550bd377d11b574e8bfda Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 24 Aug 2024 22:27:35 +0800 Subject: [PATCH 040/177] feat(ui): improve block quote layout --- _sass/addon/commons.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index c4c68e78..5412b92f 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -80,9 +80,10 @@ img { } blockquote { - border-left: 5px solid var(--blockquote-border-color); + border-left: 0.125rem solid var(--blockquote-border-color); padding-left: 1rem; color: var(--blockquote-text-color); + margin-top: 0.5rem; > p:last-child { margin-bottom: 0; From 707a209424f3a82868935dd46591c318e700355c Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:12:00 +0800 Subject: [PATCH 041/177] refactor: improve heading layout --- _sass/addon/commons.scss | 21 +++++++++++++++------ _sass/addon/module.scss | 11 ----------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 5412b92f..2735eb87 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -42,20 +42,29 @@ body { @extend %heading; @if $i > 1 { - @extend %section; @extend %anchor; } @if $i < 5 { - $factor: 0.18rem; + $size-factor: 0.25rem; - @if $i == 1 { - $factor: 0.23rem; + @if $i > 1 { + $size-factor: 0.18rem; + + main & { + @if $i == 2 { + margin: 2.5rem 0 1.25rem; + } @else { + margin: 2rem 0 1rem; + } + } } - font-size: 1rem + (5 - $i) * $factor; + & { + font-size: 1rem + (5 - $i) * $size-factor; + } } @else { - font-size: 1rem; + font-size: 1.05rem; } } } diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index 9e85adc0..77fecca4 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -10,17 +10,6 @@ font-family: $font-family-heading; } -%section { - main & { - margin-top: 2.5rem; - margin-bottom: 1.25rem; - - &:focus { - outline: none; /* avoid outline in Safari */ - } - } -} - %anchor { .anchor { font-size: 80%; From 64c7262245e878534971a2e3a2630b614daf72f3 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:12:28 +0800 Subject: [PATCH 042/177] feat(ui): set `` font to 'Lato' --- _sass/addon/commons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 2735eb87..c6aa02fe 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -124,7 +124,7 @@ blockquote { } kbd { - font-family: inherit; + font-family: Lato, sans-serif; display: inline-block; vertical-align: middle; line-height: 1.3rem; From 8cfd7214943806925342613d9107473de53f6524 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 25 Aug 2024 00:25:29 +0800 Subject: [PATCH 043/177] build(deps-dev): bump the dev-deps --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 7d4835f3..a73fee71 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "@babel/core": "^7.24.7", - "@babel/plugin-transform-class-properties": "^7.24.7", - "@babel/preset-env": "^7.24.7", - "@commitlint/cli": "^19.3.0", + "@babel/core": "^7.25.2", + "@babel/plugin-transform-class-properties": "^7.25.4", + "@babel/preset-env": "^7.25.4", + "@commitlint/cli": "^19.4.0", "@commitlint/config-conventional": "^19.2.2", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-node-resolve": "^15.2.3", @@ -42,11 +42,11 @@ "@semantic-release/git": "^10.0.1", "concurrently": "^8.2.2", "conventional-changelog-conventionalcommits": "^8.0.0", - "husky": "^9.0.11", + "husky": "^9.1.5", "purgecss": "^6.0.0", - "rollup": "^4.18.0", - "semantic-release": "^24.0.0", - "stylelint": "^16.6.1", + "rollup": "^4.21.0", + "semantic-release": "^24.1.0", + "stylelint": "^16.8.2", "stylelint-config-standard-scss": "^13.1.0" }, "prettier": { From 5f4dab1745059929b04d7e998e8dbccd2a741b9c Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:18:34 +0800 Subject: [PATCH 044/177] build: upgrade dependencies --- _data/origin/basic.yml | 6 +++--- _data/origin/cors.yml | 16 ++++++++-------- assets/lib | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/_data/origin/basic.yml b/_data/origin/basic.yml index 9027e6e4..2d529822 100644 --- a/_data/origin/basic.yml +++ b/_data/origin/basic.yml @@ -20,9 +20,9 @@ mermaid: dayjs: js: common: /assets/lib/dayjs/dayjs.min.js - locale: /assets/lib/dayjs/locale/en.min.js - relativeTime: /assets/lib/dayjs/plugin/relativeTime.min.js - localizedFormat: /assets/lib/dayjs/plugin/localizedFormat.min.js + locale: /assets/lib/dayjs/locale/en.js + relativeTime: /assets/lib/dayjs/plugin/relativeTime.js + localizedFormat: /assets/lib/dayjs/plugin/localizedFormat.js glightbox: css: /assets/lib/glightbox/glightbox.min.css diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index 18806665..aff32f71 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.29.20/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.29.20/dist/tocbot.min.js fontawesome: - css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css + css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css search: js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js mermaid: - js: https://cdn.jsdelivr.net/npm/mermaid@10.9.0/dist/mermaid.min.js + js: https://cdn.jsdelivr.net/npm/mermaid@11.0.2/dist/mermaid.min.js dayjs: js: - common: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/dayjs.min.js - locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/locale/:LOCALE.min.js - relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/relativeTime.min.js - localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/localizedFormat.min.js + common: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/dayjs.min.js + locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/locale/:LOCALE.js + relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/plugin/relativeTime.js + localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/plugin/localizedFormat.js glightbox: css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css diff --git a/assets/lib b/assets/lib index b9c58cf4..8d23eb0c 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit b9c58cf485a7dcbc833e698d67dd1850bdc93eb3 +Subproject commit 8d23eb0c91f38ff0162be118bb9c9517f8675cd6 From 31e19c6d0ff0e4c11dfbf39caf0f49ad83f4074e Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 25 Aug 2024 18:17:38 +0800 Subject: [PATCH 045/177] refactor(ui): standardize the border radius (#1920) Impact: - Increase the border radius of inline code and `` tags - Variable `$base-radius` renamed to `$radius-lg` --- _sass/addon/commons.scss | 2 +- _sass/addon/module.scss | 2 +- _sass/addon/syntax.scss | 6 +++--- _sass/addon/variables.scss | 3 ++- _sass/layout/categories.scss | 2 +- _sass/layout/home.scss | 4 ++-- _sass/layout/post.scss | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index c6aa02fe..465cb085 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -134,7 +134,7 @@ kbd { padding-top: 0.1rem; color: var(--kbd-text-color); background-color: var(--kbd-bg-color); - border-radius: 0.25rem; + border-radius: $radius-sm; border: solid 1px var(--kbd-wrap-color); box-shadow: inset 0 -2px 0 var(--kbd-wrap-color); } diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index 77fecca4..42db4e2d 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -81,7 +81,7 @@ } %rounded { - border-radius: $base-radius; + border-radius: $radius-lg; } %img-caption { diff --git a/_sass/addon/syntax.scss b/_sass/addon/syntax.scss index b0efd202..6bd7b406 100644 --- a/_sass/addon/syntax.scss +++ b/_sass/addon/syntax.scss @@ -102,9 +102,9 @@ code { &.highlighter-rouge { font-size: $code-font-size; - padding: 3px 6px; + padding: 3px 5px; word-break: break-word; - border-radius: 4px; + border-radius: $radius-sm; background-color: var(--inline-code-bg); } @@ -261,7 +261,7 @@ div { .content > & { @include ml-mr(0); - border-radius: $base-radius; + border-radius: $radius-lg; } .code-header { diff --git a/_sass/addon/variables.scss b/_sass/addon/variables.scss index 8924a00b..1d51cb14 100644 --- a/_sass/addon/variables.scss +++ b/_sass/addon/variables.scss @@ -16,7 +16,8 @@ $search-max-width: 200px !default; $footer-height: 5rem !default; $footer-height-large: 6rem !default; /* screen width: < 850px */ $main-content-max-width: 1250px !default; -$base-radius: 0.625rem !default; +$radius-sm: 6px !default; +$radius-lg: 10px !default; $back2top-size: 2.75rem !default; /* syntax highlight */ diff --git a/_sass/layout/categories.scss b/_sass/layout/categories.scss index 330d3d35..f12b9633 100644 --- a/_sass/layout/categories.scss +++ b/_sass/layout/categories.scss @@ -16,7 +16,7 @@ } .card-header { - $radius: calc($base-radius - 1px); + $radius: calc($radius-lg - 1px); padding: 0.75rem; border-radius: $radius; diff --git a/_sass/layout/home.scss b/_sass/layout/home.scss index 7f9fd2e8..0d95d7ba 100644 --- a/_sass/layout/home.scss +++ b/_sass/layout/home.scss @@ -20,7 +20,7 @@ background: none; %img-radius { - border-radius: $base-radius $base-radius 0 0; + border-radius: $radius-lg $radius-lg 0 0; } .preview-img { @@ -131,7 +131,7 @@ /* Tablet */ @media all and (min-width: 768px) { %img-radius { - border-radius: 0 $base-radius $base-radius 0; + border-radius: 0 $radius-lg $radius-lg 0; } #post-list { diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index 112541db..815db933 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -173,12 +173,12 @@ header { } &:first-child { - border-radius: $base-radius 0 0 $base-radius; + border-radius: $radius-lg 0 0 $radius-lg; left: 0.5px; } &:last-child { - border-radius: 0 $base-radius $base-radius 0; + border-radius: 0 $radius-lg $radius-lg 0; right: 0.5px; } } From 604e01eb3670c380a4c610552c02a607d12552f8 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 26 Aug 2024 00:49:05 +0800 Subject: [PATCH 046/177] chore(deps): correct `Tocbot` version number --- _data/origin/cors.yml | 4 ++-- assets/lib | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index aff32f71..afdb3d9e 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -20,8 +20,8 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.29.20/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.29.20/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.js fontawesome: css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css diff --git a/assets/lib b/assets/lib index 8d23eb0c..a231bc7e 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit 8d23eb0c91f38ff0162be118bb9c9517f8675cd6 +Subproject commit a231bc7e2c67198e604950cb2be9147a0b2020c0 From fc3d1012584e70db572f72894c427ecef20cdfa0 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:49:48 +0800 Subject: [PATCH 047/177] build: improve the JS build for PWA (#1923) --- .gitignore | 1 - _config.yml | 3 --- jekyll-theme-chirpy.gemspec | 2 +- rollup.config.js | 44 +++++++++++++++++++++---------------- tools/init.sh | 2 +- tools/release.sh | 3 +-- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index b528d6d1..0082d900 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ package-lock.json # Misc _sass/dist assets/js/dist -_app diff --git a/_config.yml b/_config.yml index fea93d3f..7a9b11a3 100644 --- a/_config.yml +++ b/_config.yml @@ -170,9 +170,6 @@ collections: tabs: output: true sort_by: order - app: - output: true - permalink: /:name defaults: - scope: diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index a1b97cc2..76ebe673 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.license = "MIT" spec.files = `git ls-files -z`.split("\x0").select { |f| - f.match(%r!^((_(includes|layouts|sass|app|(data\/(locales|origin)))|assets)\/|README|LICENSE)!i) + f.match(%r!^((_(includes|layouts|sass|(data\/(locales|origin)))|assets)\/|README|LICENSE)!i) } spec.metadata = { diff --git a/rollup.config.js b/rollup.config.js index 94507b92..22016b04 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -6,35 +6,40 @@ import fs from 'fs'; import pkg from './package.json'; const SRC_DEFAULT = '_javascript'; -const DIST_DEFAULT = 'assets/js/dist'; - const SRC_PWA = `${SRC_DEFAULT}/pwa`; -const DIST_PWA = '_app'; +const DIST = 'assets/js/dist'; const banner = `/*! * ${pkg.name} v${pkg.version} | © ${pkg.since} ${pkg.author} | ${pkg.license} Licensed | ${pkg.homepage} */`; +const frontmatter = `---\npermalink: /:basename\n---\n`; + const isProd = process.env.BUILD === 'production'; -function cleanup(...directories) { - for (const dir of directories) { - fs.rm(dir, { recursive: true, force: true }, (err) => { - if (err) { - console.error(`Failed to remove directory ${dir}: ${err}`); - } - }); - } +function cleanup() { + fs.rmSync(DIST, { recursive: true, force: true }); + console.log(`> Directory "${DIST}" has been cleaned.`); } -function build(filename, opts = {}) { - const src = opts.src || SRC_DEFAULT; - const dist = opts.dist || DIST_DEFAULT; +function insertFrontmatter() { + return { + name: 'insert-frontmatter', + generateBundle(_, bundle) { + for (const chunkOrAsset of Object.values(bundle)) { + if (chunkOrAsset.type === 'chunk') { + chunkOrAsset.code = frontmatter + chunkOrAsset.code; + } + } + } + }; +} +function build(filename, { src = SRC_DEFAULT, jekyll = false } = {}) { return { input: `${src}/${filename}.js`, output: { - file: `${dist}/${filename}.min.js`, + file: `${DIST}/${filename}.min.js`, format: 'iife', name: 'Chirpy', banner, @@ -51,12 +56,13 @@ function build(filename, opts = {}) { }), nodeResolve(), yaml(), - isProd && terser() + isProd && terser(), + jekyll && insertFrontmatter() ] }; } -cleanup(DIST_DEFAULT, DIST_PWA); +cleanup(); export default [ build('commons'), @@ -65,6 +71,6 @@ export default [ build('page'), build('post'), build('misc'), - build('app', { src: SRC_PWA, dist: DIST_PWA }), - build('sw', { src: SRC_PWA, dist: DIST_PWA }) + build('app', { src: SRC_PWA, jekyll: true }), + build('sw', { src: SRC_PWA, jekyll: true }) ]; diff --git a/tools/init.sh b/tools/init.sh index 603e5175..2ad72ab9 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -92,7 +92,7 @@ init_files() { npm i && npm run build # track the CSS/JS output - _sedi "/.*\/dist$/d;/^_app$/d" .gitignore + _sedi "/.*\/dist$/d" .gitignore } commit() { diff --git a/tools/release.sh b/tools/release.sh index e505f1a2..522c892c 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -17,7 +17,6 @@ CONFIG="_config.yml" CSS_DIST="_sass/dist" JS_DIST="assets/js/dist" -PWA_DIST="_app" FILES=( "$GEM_SPEC" @@ -118,7 +117,7 @@ build_gem() { npm run build # add CSS/JS distribution files to gem package - git add "$CSS_DIST" "$JS_DIST" "$PWA_DIST" -f + git add "$CSS_DIST" "$JS_DIST" -f echo -e "\n> gem build $GEM_SPEC\n" gem build "$GEM_SPEC" From 8b7dba71e34531bfa38d6a3b2d1118a83bbf959a Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 27 Aug 2024 15:18:52 +0800 Subject: [PATCH 048/177] docs: update tutorial and readme Change Dev Containers logo in README: Simple Icons has removed all Microsoft icons due to copyright restrictions, see --- README.md | 8 ++-- _posts/2019-08-09-getting-started.md | 67 ++++++++++++++++------------ 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 32210f53..7e57b2a5 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ A minimal, responsive, and feature-rich Jekyll theme for technical writing. - [![Open in Dev Containers](https://img.shields.io/badge/Dev_Containers-Open-deepskyblue?logo=visualstudiocode)][open-container]  - [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=tomato)][gem]  - [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy)][license]  [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github)][ci]  - [![Codacy Badge](https://img.shields.io/codacy/grade/4e556876a3c54d5e8f2d2857c4f43894?logo=codacy)][codacy] + [![Codacy Badge](https://img.shields.io/codacy/grade/4e556876a3c54d5e8f2d2857c4f43894?logo=codacy)][codacy]  + [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy?color=goldenrod)][license]  + [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=orange)][gem]  + [![Open in Dev Containers](https://img.shields.io/badge/Dev_Containers-Open-deepskyblue?logo=linuxcontainers)][open-container] [**Live Demo** →][demo] diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 6cbd4e69..3b41a3ca 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -11,33 +11,35 @@ pin: true media_subpath: '/posts/20180809' --- -## Creating a site repository +## Creating a Site Repository -There are two methods to create a site repository for **Chirpy**: +When creating your site repository, you have two options depending on your needs: -- [**Using the starter**](#option-1-using-the-starter) — This approach simplifies upgrades and isolates unnecessary project files, enabling you to concentrate on your content. It's ideal for those who want a hassle-free setup focused primarily on writing. -- [**Forking the theme**](#option-2-forking-the-theme) — This method allows for customization and development but presents challenges during upgrades. It is not recommended to use this approach unless you are familiar with Jekyll and plan to modify this project. +### Option 1. Using the Starter (Recommended) -### Option 1: using the starter +This approach simplifies upgrades, isolates unnecessary files, and is perfect for users who want to focus on writing with minimal configuration. 1. Sign in to GitHub and navigate to the [**starter**][starter]. 2. Click the Use this template button and then select Create a new repository. +3. Name the new repository `.github.io`, replacing `username` with your lowercase GitHub username. -### Option 2: forking the theme +### Option 2. Forking the Theme -Sign in to GitHub and [fork the theme](https://github.com/cotes2020/jekyll-theme-chirpy/fork). +This approach is convenient for modifying features or UI design, but presents challenges during upgrades. So don't try this unless you are familiar with Jekyll and plan to heavily modify this theme. -## Name your new repository +1. Sign in to GitHub. +2. [Fork the theme repository](https://github.com/cotes2020/jekyll-theme-chirpy/fork). +3. Name the new repository `.github.io`, replacing `username` with your lowercase GitHub username. -Rename your repository to `.github.io`. The `username` represents your lowercase GitHub username. +## Setting up the Environment -## Setting up the environment +Once your repository is created, it's time to set up your development environment. There are two primary methods: -The easiest way to set up the runtime environment, especially on Windows, is by using [Dev Containers](#setting-up-in-dev-containers). This method installs all packages within a Docker container, isolating them from the host machine and ensuring no interference with existing settings. +### Using Dev Containers (Recommended for Windows) -For Unix-like systems, besides using Dev Containers, you can also [natively set up](#setting-up-natively) the runtime environment to achieve optimal performance. +Dev Containers offer an isolated environment using Docker, which prevents conflicts with your system and ensures all dependencies are managed within the container. -### Setting up in Dev Containers +**Steps**: 1. Install Docker: - On Windows/macOS, install [Docker Desktop][docker-desktop]. @@ -45,27 +47,34 @@ For Unix-like systems, besides using Dev Containers, you can also [natively set 2. Install [VS Code][vscode] and the [Dev Containers extension][dev-containers]. 3. Clone your repository: - For Docker Desktop: Start VS Code and [clone your repo in a container volume][dc-clone-in-vol]. - - For Docker Engine: Clone your repo to the local disk, then launch VS Code and [open your repo in the container][dc-open-in-container]. -4. Wait a few minutes for Dev Containers to finish installing. + - For Docker Engine: Clone your repo locally, then [open it in a container][dc-open-in-container] via VS Code. +4. Wait for the Dev Containers setup to complete. -### Setting up natively +### Setting up Natively (Recommended for Unix-like OS) -1. Follow the instructions in the [Jekyll Docs](https://jekyllrb.com/docs/installation/) to complete the installation of the basic environment. Ensure that [Git](https://git-scm.com/) is also installed. -2. Clone your repository to a local disk. -3. If your site is created by forking the theme, install [Node.js][nodejs] and run `bash tools/init.sh` in the root directory. This will initialize the repository files and create a commit to save the changes. -4. Install the dependencies by running `bundle`. +For Unix-like systems, you can set up the environment natively for optimal performance, though you can also use Dev Containers as an alternative. -### Start the local server +**Steps**: + +1. Follow the [Jekyll installation guide](https://jekyllrb.com/docs/installation/) to install Jekyll and ensure [Git](https://git-scm.com/) is installed. +2. Clone your repository to your local machine. +3. If you forked the theme, install [Node.js][nodejs] and run `bash tools/init.sh` in the root directory to initialize the repository. +4. Run command `bundle` in the root of your repository to install the dependencies. + +## Usage + +### Start the Jekyll Server To run the site locally, use the following command: -```console +```terminal $ bundle exec jekyll s ``` -After a few seconds, the local server will be available at . +> If you are using Dev Containers, you must run that command in the **VS Code** Terminal. +{: .prompt-info } -## Usage +After a few seconds, the local server will be available at . ### Configuration @@ -76,17 +85,17 @@ Update the variables in `_config.yml`{: .filepath} as needed. Some typical optio - `timezone` - `lang` -### Social contact options +### Social Contact Options Social contact options are displayed at the bottom of the sidebar. You can enable or disable specific contacts in the `_data/contact.yml`{: .filepath} file. -### Customizing the stylesheet +### Customizing the Stylesheet To customize the stylesheet, copy the theme's `assets/css/jekyll-theme-chirpy.scss`{: .filepath} file to the same path in your Jekyll site, and add your custom styles at the end of the file. Starting with version `6.2.0`, if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`{: .filepath}, copy the main SASS file `_sass/main.scss`{: .filepath} to the `_sass`{: .filepath} directory in your site's source, then create a new file `_sass/variables-hook.scss`{: .filepath} and assign your new values there. -### Customizing static assets +### Customizing Static Assets Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined in `_data/origin/cors.yml`{: .filepath }. You can replace some of them based on the network conditions in the region where your website is published. @@ -98,7 +107,7 @@ Before deploying, check the `_config.yml`{: .filepath} file and ensure the `url` Now you can choose _ONE_ of the following methods to deploy your Jekyll site. -### Deploy using GitHub Actions +### Deploy Using Github Actions Prepare the following: @@ -119,7 +128,7 @@ Next, configure the _Pages_ service: You can now visit the URL provided by GitHub to access your site. -### Manual build and deployment +### Manual Build and Deployment For self-hosted servers, you will need to build the site on your local machine and then upload the site files to the server. From a784f0a0f907797104cc5e3b5256151ad4055645 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 27 Aug 2024 07:28:55 +0000 Subject: [PATCH 049/177] chore(release): 7.1.0 ## [7.1.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.1...v7.1.0) (2024-08-27) ### Features * add Bluesky social links ([#1759](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1759)) ([0102aba](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0102abae062be24ec289fb7facb11950aca79e3f)) * add Reddit social option ([#1836](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1836)) ([8673e13](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8673e1335f0771eac364d0a2866f27476d61a58b)) * add Threads social links ([#1837](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1837)) ([e3a78b6](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e3a78b6243f7056105d72185bb6e94b436834e5b)) * **analytics:** add fathom analytics ([#1913](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1913)) ([befc4ce](https://github.com/cotes2020/jekyll-theme-chirpy/commit/befc4ce9c5026f67f99bce66e223d056229f0bdb)) * **dev:** add vscode tasks ([#1843](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1843)) ([e4db1a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e4db1a176f3f69f676cbc0bf27b1d5a657ece05e)) * **dev:** support vscode dev-container ([#1781](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1781)) ([1e3d4a6](https://github.com/cotes2020/jekyll-theme-chirpy/commit/1e3d4a6323ba3eed06a57f8bf1b2edefd890b127)) * **ui:** improve block quote layout ([80bd792](https://github.com/cotes2020/jekyll-theme-chirpy/commit/80bd7928a02c75c843a550bd377d11b574e8bfda)) * **ui:** improve visibility of inline code ([#1831](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1831)) ([c876731](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c876731901784a72ef9d2e9e2936df65ddff5f61)) * **ui:** make `info-prompt` icon looks like the letter "i" ([#1835](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1835)) ([a07a57e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/a07a57ec922249d3a22da56fbcb30d83eadef728)) * **ui:** set `` font to 'Lato' ([64c7262](https://github.com/cotes2020/jekyll-theme-chirpy/commit/64c7262245e878534971a2e3a2630b614daf72f3)) ### Bug Fixes * adapt the giscus localization parameter ([#1810](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1810)) ([0709854](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0709854dc8f6099d38c2578967a02f73b4be0dc8)) * avoid caching pageviews data ([#1849](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1849)) ([979f86c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/979f86cf64e1fcace4231fb070c7e6398fd4e5ec)) * remove extra dual-mode images from lightbox ([#1883](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1883)) ([5c5910f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5c5910f1fc661ec3dce203ac961c7f64f1991895)) --- docs/CHANGELOG.md | 21 +++++++++++++++++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index abe0a178..5d58c621 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [7.1.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.1...v7.1.0) (2024-08-27) + +### Features + +* add Bluesky social links ([#1759](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1759)) ([0102aba](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0102abae062be24ec289fb7facb11950aca79e3f)) +* add Reddit social option ([#1836](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1836)) ([8673e13](https://github.com/cotes2020/jekyll-theme-chirpy/commit/8673e1335f0771eac364d0a2866f27476d61a58b)) +* add Threads social links ([#1837](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1837)) ([e3a78b6](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e3a78b6243f7056105d72185bb6e94b436834e5b)) +* **analytics:** add fathom analytics ([#1913](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1913)) ([befc4ce](https://github.com/cotes2020/jekyll-theme-chirpy/commit/befc4ce9c5026f67f99bce66e223d056229f0bdb)) +* **dev:** add vscode tasks ([#1843](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1843)) ([e4db1a1](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e4db1a176f3f69f676cbc0bf27b1d5a657ece05e)) +* **dev:** support vscode dev-container ([#1781](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1781)) ([1e3d4a6](https://github.com/cotes2020/jekyll-theme-chirpy/commit/1e3d4a6323ba3eed06a57f8bf1b2edefd890b127)) +* **ui:** improve block quote layout ([80bd792](https://github.com/cotes2020/jekyll-theme-chirpy/commit/80bd7928a02c75c843a550bd377d11b574e8bfda)) +* **ui:** improve visibility of inline code ([#1831](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1831)) ([c876731](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c876731901784a72ef9d2e9e2936df65ddff5f61)) +* **ui:** make `info-prompt` icon looks like the letter "i" ([#1835](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1835)) ([a07a57e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/a07a57ec922249d3a22da56fbcb30d83eadef728)) +* **ui:** set `` font to 'Lato' ([64c7262](https://github.com/cotes2020/jekyll-theme-chirpy/commit/64c7262245e878534971a2e3a2630b614daf72f3)) + +### Bug Fixes + +* adapt the giscus localization parameter ([#1810](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1810)) ([0709854](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0709854dc8f6099d38c2578967a02f73b4be0dc8)) +* avoid caching pageviews data ([#1849](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1849)) ([979f86c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/979f86cf64e1fcace4231fb070c7e6398fd4e5ec)) +* remove extra dual-mode images from lightbox ([#1883](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1883)) ([5c5910f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5c5910f1fc661ec3dce203ac961c7f64f1991895)) + ## [7.0.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.0...v7.0.1) (2024-05-18) ### Bug Fixes diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 76ebe673..046e8eb3 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-chirpy" - spec.version = "7.0.1" + spec.version = "7.1.0" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index a73fee71..0dbc382a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "7.0.1", + "version": "7.1.0", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git", From 367262e74d1005bddf1328bb2b3a2b9e152c0086 Mon Sep 17 00:00:00 2001 From: denis-games <105583649+denis-games@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:38:46 +0200 Subject: [PATCH 050/177] fix(i18n): correct fr-FR translations (#1949) Co-authored-by: Denis Jean --- _data/locales/fr-FR.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/locales/fr-FR.yml b/_data/locales/fr-FR.yml index 3f3c9a0c..dce83c9f 100644 --- a/_data/locales/fr-FR.yml +++ b/_data/locales/fr-FR.yml @@ -14,7 +14,7 @@ tabs: categories: Catégories tags: Tags archives: Archives - about: A propos de + about: À propos # the text displayed in the search bar & search results search: @@ -32,12 +32,12 @@ copyright: license: template: Cet article est sous licence :LICENSE_NAME par l'auteur. name: CC BY 4.0 - link: https://creativecommons.org/licenses/by/4.0/ + link: https://creativecommons.org/licenses/by/4.0/deed.fr # Displayed in the footer brief: Certains droits réservés. verbose: >- - Sauf mention contraire, les articles de ce site sont publiés sous licence + Sauf mention contraire, les articles de ce site sont publiés sous la licence Creative Commons Attribution 4.0 International (CC BY 4.0) par l'auteur. meta: Propulsé par :PLATFORM avec le thème :THEME From 3ab3b844d2ac475c92d5f84afc0259abab9fcbcd Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:41:08 +0800 Subject: [PATCH 051/177] refactor: replace deprecated meta element Replace `apple-mobile-web-app-capable` with `mobile-web-app-capable` --- _includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head.html b/_includes/head.html index fd260c0e..af3acdb5 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -2,7 +2,7 @@ - + Date: Wed, 18 Sep 2024 22:32:26 +0800 Subject: [PATCH 052/177] fix(pwa): site baseurl not passed to `app.js` (#1955) --- _includes/js-selector.html | 5 ++++- _javascript/pwa/app.js | 12 ++++++++---- _javascript/pwa/sw.js | 4 +--- package.json | 1 - rollup.config.js | 4 +--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/_includes/js-selector.html b/_includes/js-selector.html index 99651076..4d77d06b 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -92,7 +92,10 @@ {% if jekyll.environment == 'production' %} {% if site.pwa.enabled %} - + {% endif %} diff --git a/_javascript/pwa/app.js b/_javascript/pwa/app.js index c71036a5..3c0ded23 100644 --- a/_javascript/pwa/app.js +++ b/_javascript/pwa/app.js @@ -1,15 +1,19 @@ -import { pwa, baseurl } from '../../_config.yml'; import Toast from 'bootstrap/js/src/toast'; if ('serviceWorker' in navigator) { - if (pwa.enabled) { - const swUrl = `${baseurl}/sw.min.js`; + // Get Jekyll config from URL parameters + const src = new URL(document.currentScript.src); + const register = src.searchParams.get('register'); + const baseUrl = src.searchParams.get('baseurl'); + + if (register) { + const swUrl = `${baseUrl}/sw.min.js`; const notification = document.getElementById('notification'); const btnRefresh = notification.querySelector('.toast-body>button'); const popupWindow = Toast.getOrCreateInstance(notification); navigator.serviceWorker.register(swUrl).then((registration) => { - // In case the user ignores the notification + // Restore the update window that was last manually closed by the user if (registration.waiting) { popupWindow.show(); } diff --git a/_javascript/pwa/sw.js b/_javascript/pwa/sw.js index 94b64bf7..ff9125dd 100644 --- a/_javascript/pwa/sw.js +++ b/_javascript/pwa/sw.js @@ -1,6 +1,4 @@ -import { baseurl } from '../../_config.yml'; - -importScripts(`${baseurl}/assets/js/data/swconf.js`); +importScripts('./assets/js/data/swconf.js'); const purge = swconf.purge; const interceptor = swconf.interceptor; diff --git a/package.json b/package.json index 0dbc382a..bab1a2f6 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", - "@rollup/plugin-yaml": "^4.1.2", "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", diff --git a/rollup.config.js b/rollup.config.js index 22016b04..19ba4da0 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,7 +1,6 @@ import babel from '@rollup/plugin-babel'; import terser from '@rollup/plugin-terser'; import { nodeResolve } from '@rollup/plugin-node-resolve'; -import yaml from '@rollup/plugin-yaml'; import fs from 'fs'; import pkg from './package.json'; @@ -43,7 +42,7 @@ function build(filename, { src = SRC_DEFAULT, jekyll = false } = {}) { format: 'iife', name: 'Chirpy', banner, - sourcemap: !isProd + sourcemap: !isProd && !jekyll }, watch: { include: `${src}/**` @@ -55,7 +54,6 @@ function build(filename, { src = SRC_DEFAULT, jekyll = false } = {}) { plugins: ['@babel/plugin-transform-class-properties'] }), nodeResolve(), - yaml(), isProd && terser(), jekyll && insertFrontmatter() ] From fac6116af1d9836df5220f63c09fdf3d36910795 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:41:28 +0800 Subject: [PATCH 053/177] build(dev-deps): bump 7 dependencies versions --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index bab1a2f6..18713522 100644 --- a/package.json +++ b/package.json @@ -31,21 +31,21 @@ "@babel/core": "^7.25.2", "@babel/plugin-transform-class-properties": "^7.25.4", "@babel/preset-env": "^7.25.4", - "@commitlint/cli": "^19.4.0", - "@commitlint/config-conventional": "^19.2.2", + "@commitlint/cli": "^19.5.0", + "@commitlint/config-conventional": "^19.5.0", "@rollup/plugin-babel": "^6.0.4", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-terser": "^0.4.4", "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", - "concurrently": "^8.2.2", + "concurrently": "^9.0.1", "conventional-changelog-conventionalcommits": "^8.0.0", - "husky": "^9.1.5", + "husky": "^9.1.6", "purgecss": "^6.0.0", - "rollup": "^4.21.0", - "semantic-release": "^24.1.0", - "stylelint": "^16.8.2", + "rollup": "^4.21.3", + "semantic-release": "^24.1.1", + "stylelint": "^16.9.0", "stylelint-config-standard-scss": "^13.1.0" }, "prettier": { From fd0df8320f7e4e2849c27f1be0f1232bf46a61bb Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 23 Sep 2024 11:56:31 +0000 Subject: [PATCH 054/177] chore(release): 7.1.1 ## [7.1.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.1.0...v7.1.1) (2024-09-23) ### Bug Fixes * **i18n:** correct fr-FR translations ([#1949](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1949)) ([367262e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/367262e74d1005bddf1328bb2b3a2b9e152c0086)) * **pwa:** site baseurl not passed to `app.js` ([#1955](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1955)) ([5a63244](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5a63244721d21b1ad3a0ae83420723a2f0379e8b)) --- docs/CHANGELOG.md | 7 +++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 5d58c621..3c59cef1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [7.1.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.1.0...v7.1.1) (2024-09-23) + +### Bug Fixes + +* **i18n:** correct fr-FR translations ([#1949](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1949)) ([367262e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/367262e74d1005bddf1328bb2b3a2b9e152c0086)) +* **pwa:** site baseurl not passed to `app.js` ([#1955](https://github.com/cotes2020/jekyll-theme-chirpy/issues/1955)) ([5a63244](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5a63244721d21b1ad3a0ae83420723a2f0379e8b)) + ## [7.1.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.0.1...v7.1.0) (2024-08-27) ### Features diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 046e8eb3..9de7dd04 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-chirpy" - spec.version = "7.1.0" + spec.version = "7.1.1" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 18713522..f93e76b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "7.1.0", + "version": "7.1.1", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git", From e6b87d28111457cbc2f497866b71d8a2d00e35bc Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Tue, 24 Sep 2024 04:21:34 +0400 Subject: [PATCH 055/177] chore: remove `h1` element from site title (#1960) --- _includes/sidebar.html | 4 +--- _sass/addon/commons.scss | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 4f0bb8ca..569585f6 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -11,9 +11,7 @@ {%- endif -%} -

- {{ site.title }} -

+ {{ site.title }}

{{ site.tagline }}

diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 465cb085..e2a0e615 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -738,6 +738,9 @@ $btn-mb: 0.5rem; } .site-title { + @extend %clickable-transition; + @extend %sidebar-link-hover; + font-family: inherit; font-weight: 900; font-size: 1.75rem; @@ -745,13 +748,8 @@ $btn-mb: 0.5rem; letter-spacing: 0.25px; margin-top: 1.25rem; margin-bottom: 0.5rem; - - a { - @extend %clickable-transition; - @extend %sidebar-link-hover; - - color: var(--site-title-color); - } + width: fit-content; + color: var(--site-title-color); } .site-subtitle { From 93f616b25d7ed6c4f090c50c8663f8c1f59947f4 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 26 Sep 2024 22:30:56 +0800 Subject: [PATCH 056/177] fix: pagination error when pinned posts exceed the page size (#1965) --- _layouts/home.html | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/_layouts/home.html b/_layouts/home.html index e44efe8f..451e391c 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -5,38 +5,45 @@ {% include lang.html %} -{% assign pinned = site.posts | where: 'pin', 'true' %} -{% assign default = site.posts | where_exp: 'item', 'item.pin != true and item.hidden != true' %} +{% assign all_pinned = site.posts | where: 'pin', 'true' %} +{% assign all_normal = site.posts | where_exp: 'item', 'item.pin != true and item.hidden != true' %} {% assign posts = '' | split: '' %} - + -{% assign offset = paginator.page | minus: 1 | times: paginator.per_page %} -{% assign pinned_num = pinned.size | minus: offset %} +{% assign visible_start = paginator.page | minus: 1 | times: paginator.per_page %} +{% assign visible_end = visible_start | plus: paginator.per_page %} -{% if pinned_num > 0 %} - {% for i in (offset..pinned.size) limit: pinned_num %} - {% assign posts = posts | push: pinned[i] %} +{% if all_pinned.size > visible_start %} + {% if all_pinned.size > visible_end %} + {% assign pinned_size = paginator.per_page %} + {% else %} + {% assign pinned_size = all_pinned.size | minus: visible_start %} + {% endif %} + + {% for i in (visible_start..all_pinned.size) limit: pinned_size %} + {% assign posts = posts | push: all_pinned[i] %} {% endfor %} {% else %} - {% assign pinned_num = 0 %} + {% assign pinned_size = 0 %} {% endif %} - + -{% assign default_beg = offset | minus: pinned.size %} +{% assign normal_size = paginator.posts | size | minus: pinned_size %} -{% if default_beg < 0 %} - {% assign default_beg = 0 %} -{% endif %} +{% if normal_size > 0 %} + {% if pinned_size > 0 %} + {% assign normal_start = 0 %} + {% else %} + {% assign normal_start = visible_start | minus: all_pinned.size %} + {% endif %} -{% assign default_num = paginator.posts | size | minus: pinned_num %} -{% assign default_end = default_beg | plus: default_num | minus: 1 %} + {% assign normal_end = normal_start | plus: normal_size | minus: 1 %} -{% if default_num > 0 %} - {% for i in (default_beg..default_end) %} - {% assign posts = posts | push: default[i] %} + {% for i in (normal_start..normal_end) %} + {% assign posts = posts | push: all_normal[i] %} {% endfor %} {% endif %} From 740bd84c51cbb929438ea538ddc942f97d1c1431 Mon Sep 17 00:00:00 2001 From: Bence Boros <39780892+borosbence@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:19:39 +0200 Subject: [PATCH 057/177] chore(i18n): update hungarian translation (#1976) --- _data/locales/hu-HU.yml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/_data/locales/hu-HU.yml b/_data/locales/hu-HU.yml index 53d88e96..be3a31b7 100644 --- a/_data/locales/hu-HU.yml +++ b/_data/locales/hu-HU.yml @@ -14,24 +14,23 @@ tabs: categories: Kategóriák tags: Címkék archives: Archívum - about: Rólam + about: Bemutatkozás # the text displayed in the search bar & search results search: hint: keresés cancel: Mégse - no_results: Oops! Nincs találat a keresésre. + no_results: Hoppá! Nincs találat a keresésre. panel: lastmod: Legutóbb frissítve trending_tags: Népszerű Címkék toc: Tartalom - links: Blog linkek copyright: # Shown at the bottom of the post license: - template: A bejegyzés :LICENSE_NAME licenccel rendelkezik. + template: A bejegyzést a szerző :LICENSE_NAME licenc alatt engedélyezte. name: CC BY 4.0 link: https://creativecommons.org/licenses/by/4.0/ @@ -42,7 +41,7 @@ copyright: Creative Commons Attribution 4.0 International (CC BY 4.0) licenccel rendelkeznek, hacsak másképp nincs jelezve. -meta: Készítve :PLATFORM motorral :THEME témával +meta: Készítve :THEME témával a :PLATFORM platformra. not_found: statement: Sajnáljuk, az URL-t rosszul helyeztük el, vagy valami nem létezőre mutat. @@ -73,7 +72,21 @@ post: title: Link másolása succeed: Link sikeresen másolva! +# Date time format. +# See: , +df: + post: + strftime: "%Y. %B. %e." + dayjs: "YYYY. MMMM D." + archives: + strftime: "%B" + dayjs: "MMM" + # categories page categories: - category_measure: kategória - post_measure: bejegyzés + category_measure: + singular: kategória + plural: kategória + post_measure: + singular: bejegyzés + plural: bejegyzés From 8a064a5e5a95cd22aa654f7c80da09d107262508 Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Fri, 11 Oct 2024 18:32:10 +0400 Subject: [PATCH 058/177] feat: show toc on mobile screens (#1964) --- _includes/toc-status.html | 10 + _includes/toc.html | 9 +- _javascript/modules/components/toc.js | 41 ++-- .../modules/components/toc/toc-desktop.js | 22 ++ .../modules/components/toc/toc-mobile.js | 117 ++++++++++ _javascript/modules/plugins.js | 2 +- _javascript/post.js | 7 +- _layouts/post.html | 28 ++- _sass/addon/commons.scss | 4 +- _sass/addon/module.scss | 7 + _sass/colors/typography-dark.scss | 2 +- _sass/colors/typography-light.scss | 2 +- _sass/layout/post.scss | 209 ++++++++++++++++++ 13 files changed, 430 insertions(+), 30 deletions(-) create mode 100644 _includes/toc-status.html create mode 100644 _javascript/modules/components/toc/toc-desktop.js create mode 100644 _javascript/modules/components/toc/toc-mobile.js diff --git a/_includes/toc-status.html b/_includes/toc-status.html new file mode 100644 index 00000000..4b71caee --- /dev/null +++ b/_includes/toc-status.html @@ -0,0 +1,10 @@ +{% comment %} + Determine TOC state and return it through variable "enable_toc" +{% endcomment %} + +{% assign enable_toc = false %} +{% if site.toc and page.toc %} + {% if page.content contains ' +

{{- site.data.locales[include.lang].panel.toc -}}

diff --git a/_javascript/modules/components/toc.js b/_javascript/modules/components/toc.js index 56ce26fa..765336ac 100644 --- a/_javascript/modules/components/toc.js +++ b/_javascript/modules/components/toc.js @@ -1,15 +1,30 @@ -export function toc() { - if (document.querySelector('main h2, main h3')) { - // see: https://github.com/tscanlin/tocbot#usage - tocbot.init({ - tocSelector: '#toc', - contentSelector: '.content', - ignoreSelector: '[data-toc-skip]', - headingSelector: 'h2, h3, h4', - orderedList: false, - scrollSmooth: false - }); - - document.getElementById('toc-wrapper').classList.remove('d-none'); +import { TocMobile as mobile } from './toc/toc-mobile'; +import { TocDesktop as desktop } from './toc/toc-desktop'; + +const desktopMode = matchMedia('(min-width: 1200px)'); + +function refresh(e) { + if (e.matches) { + mobile.hidePopup(); + desktop.refresh(); + } else { + mobile.refresh(); } } + +function init() { + if (document.querySelector('main>article[data-toc="true"]') === null) { + return; + } + + // Avoid create multiple instances of Tocbot. Ref: + if (desktopMode.matches) { + desktop.init(); + } else { + mobile.init(); + } + + desktopMode.onchange = refresh; +} + +export { init as initToc }; diff --git a/_javascript/modules/components/toc/toc-desktop.js b/_javascript/modules/components/toc/toc-desktop.js new file mode 100644 index 00000000..5021a72a --- /dev/null +++ b/_javascript/modules/components/toc/toc-desktop.js @@ -0,0 +1,22 @@ +export class TocDesktop { + /* Tocbot options Ref: https://github.com/tscanlin/tocbot#usage */ + static options = { + tocSelector: '#toc', + contentSelector: '.content', + ignoreSelector: '[data-toc-skip]', + headingSelector: 'h2, h3, h4', + orderedList: false, + scrollSmooth: false, + headingsOffset: 16 * 2 // 2rem + }; + + static refresh() { + tocbot.refresh(this.options); + } + + static init() { + if (document.getElementById('toc-wrapper')) { + tocbot.init(this.options); + } + } +} diff --git a/_javascript/modules/components/toc/toc-mobile.js b/_javascript/modules/components/toc/toc-mobile.js new file mode 100644 index 00000000..48b372df --- /dev/null +++ b/_javascript/modules/components/toc/toc-mobile.js @@ -0,0 +1,117 @@ +/** + * TOC button, topbar and popup for mobile devices + */ + +const $tocBar = document.getElementById('toc-bar'); +const $soloTrigger = document.getElementById('toc-solo-trigger'); +const $triggers = document.getElementsByClassName('toc-trigger'); +const $popup = document.getElementById('toc-popup'); +const $btnClose = document.getElementById('toc-popup-close'); + +const SCROLL_LOCK = 'overflow-hidden'; +const CLOSING = 'closing'; + +export class TocMobile { + static invisible = true; + static barHeight = 16 * 3; // 3rem + + static options = { + tocSelector: '#toc-popup-content', + contentSelector: '.content', + ignoreSelector: '[data-toc-skip]', + headingSelector: 'h2, h3, h4', + orderedList: false, + scrollSmooth: false, + collapseDepth: 4, + headingsOffset: this.barHeight + }; + + static initBar() { + const observer = new IntersectionObserver( + (entries) => { + entries.forEach((entry) => { + $tocBar.classList.toggle('invisible', entry.isIntersecting); + }); + }, + { rootMargin: `-${this.barHeight}px 0px 0px 0px` } + ); + + observer.observe($soloTrigger); + this.invisible = false; + } + + static listenAnchors() { + const $anchors = document.getElementsByClassName('toc-link'); + [...$anchors].forEach((anchor) => { + anchor.onclick = this.hidePopup; + }); + } + + static refresh() { + if (this.invisible) { + this.initComponents(); + } + tocbot.refresh(this.options); + this.listenAnchors(); + } + + static showPopup() { + TocMobile.lockScroll(true); + $popup.showModal(); + const activeItem = $popup.querySelector('li.is-active-li'); + activeItem.scrollIntoView({ block: 'center' }); + } + + static hidePopup() { + if (!$popup.open) { + return; + } + + $popup.toggleAttribute(CLOSING); + + $popup.addEventListener( + 'animationend', + () => { + $popup.toggleAttribute(CLOSING); + $popup.close(); + }, + { once: true } + ); + + TocMobile.lockScroll(false); + } + + static lockScroll(enable) { + document.documentElement.classList.toggle(SCROLL_LOCK, enable); + document.body.classList.toggle(SCROLL_LOCK, enable); + } + + static clickBackdrop(event) { + const rect = event.target.getBoundingClientRect(); + if ( + event.clientX < rect.left || + event.clientX > rect.right || + event.clientY < rect.top || + event.clientY > rect.bottom + ) { + TocMobile.hidePopup(); + } + } + + static initComponents() { + this.initBar(); + + [...$triggers].forEach((trigger) => { + trigger.onclick = this.showPopup; + }); + + $popup.onclick = this.clickBackdrop; + $btnClose.onclick = $popup.oncancel = this.hidePopup; + } + + static init() { + tocbot.init(this.options); + this.listenAnchors(); + this.initComponents(); + } +} diff --git a/_javascript/modules/plugins.js b/_javascript/modules/plugins.js index fb892e25..cc95c1bc 100644 --- a/_javascript/modules/plugins.js +++ b/_javascript/modules/plugins.js @@ -3,4 +3,4 @@ export { initClipboard } from './components/clipboard'; export { loadImg } from './components/img-loading'; export { imgPopup } from './components/img-popup'; export { initLocaleDatetime } from './components/locale-datetime'; -export { toc } from './components/toc'; +export { initToc } from './components/toc'; diff --git a/_javascript/post.js b/_javascript/post.js index 9340f05e..1c616ecd 100644 --- a/_javascript/post.js +++ b/_javascript/post.js @@ -1,14 +1,15 @@ -import { basic, initSidebar, initTopbar } from './modules/layouts'; +import { basic, initTopbar, initSidebar } from './modules/layouts'; + import { loadImg, imgPopup, initLocaleDatetime, initClipboard, - toc + initToc } from './modules/plugins'; loadImg(); -toc(); +initToc(); imgPopup(); initSidebar(); initLocaleDatetime(); diff --git a/_layouts/post.html b/_layouts/post.html index f17ceea8..bcc133f8 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -11,7 +11,9 @@ {% include lang.html %} -
+{% include toc-status.html %} + +

{{ page.title }}

{% if page.description %} @@ -95,6 +97,30 @@

{{ page.title }}

+ {% if enable_toc %} + + + + + +
+
{{- page.title -}}
+ +
+
+ + {% endif %} +
{{ content }}
diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index e2a0e615..e332f213 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -908,9 +908,7 @@ $btn-mb: 0.5rem; } #topbar { - button i { - color: #999999; - } + @extend %btn-color; #breadcrumb { font-size: 1rem; diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index 42db4e2d..34ac67b9 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -8,6 +8,7 @@ color: var(--heading-color); font-weight: 400; font-family: $font-family-heading; + scroll-margin-top: 3.5rem; } %anchor { @@ -134,6 +135,12 @@ } } +%btn-color { + button i { + color: #999999; + } +} + /* ---------- scss mixin --------- */ @mixin mt-mb($value) { diff --git a/_sass/colors/typography-dark.scss b/_sass/colors/typography-dark.scss index 12427ec4..664c9365 100644 --- a/_sass/colors/typography-dark.scss +++ b/_sass/colors/typography-dark.scss @@ -22,7 +22,6 @@ --btn-border-color: #2e2f31; --btn-backtotop-color: var(--text-color); --btn-backtotop-border-color: #212122; - --btn-box-shadow: var(--main-bg); --card-header-bg: #292929; --checkbox-color: rgb(118, 120, 121); --checkbox-checked-color: var(--link-color); @@ -60,6 +59,7 @@ /* Posts */ --toc-highlight: rgb(116, 178, 243); + --toc-popup-border-color: #373737; --tag-hover: rgb(43, 56, 62); --tb-odd-bg: #252526; /* odd rows of the posts' table */ --tb-even-bg: rgb(31, 31, 34); /* even rows of the posts' table */ diff --git a/_sass/colors/typography-light.scss b/_sass/colors/typography-light.scss index 78000746..b6fc5618 100644 --- a/_sass/colors/typography-light.scss +++ b/_sass/colors/typography-light.scss @@ -22,7 +22,6 @@ --btn-border-color: #e9ecef; --btn-backtotop-color: #686868; --btn-backtotop-border-color: #f1f1f1; - --btn-box-shadow: #eaeaea; --checkbox-color: #c5c5c5; --checkbox-checked-color: #07a8f7; --img-bg: radial-gradient( @@ -63,6 +62,7 @@ /* Posts */ --toc-highlight: #0550ae; + --toc-popup-border-color: lightgray; --btn-share-color: gray; --btn-share-hover-color: #0d6efd; --card-bg: white; diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index 815db933..be727006 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -228,6 +228,7 @@ header { } } +/* TOC panel */ #toc-wrapper { border-left: 1px solid rgba(158, 158, 158, 0.17); position: -webkit-sticky; @@ -290,6 +291,201 @@ header { } } +/* --- TOC button, bar and popup in mobile/tablet --- */ + +#toc-bar { + position: -webkit-sticky; + position: sticky; + top: 0; + z-index: 1; + margin: 0 -1rem; + height: $topbar-height; + background: var(--main-bg); + border-bottom: 1px solid var(--main-border-color); + transition: all 0.2s ease-in-out; + + @extend %btn-color; + + .label { + @extend %heading; + + margin-left: 0.25rem; + padding: 0 0.75rem; + color: inherit; + } + + &.invisible { + top: -$topbar-height; + transition: none; + } +} + +#toc-solo-trigger { + color: var(--text-muted-color); + border-color: var(--btn-border-color); + border-radius: $radius-lg; + + .label { + font-size: 1rem; + font-family: $font-family-heading; + } + + &:hover { + box-shadow: none; + background: none; + } +} + +@mixin slide-in { + from { + opacity: 0.7; + transform: translateY(-$topbar-height); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@mixin slide-out { + 0% { + transform: translateY(0); + opacity: 1; + } + + 100% { + transform: translateY(-$topbar-height); + opacity: 0; + } +} + +@-webkit-keyframes slide-in { + @include slide-in; +} + +@keyframes slide-in { + @include slide-in; +} + +@-webkit-keyframes slide-out { + @include slide-out; +} + +@keyframes slide-out { + @include slide-out; +} + +#toc-popup { + $slide-in: slide-in 0.3s ease-out; + $slide-out: slide-out 0.3s ease-out; + $curtain-height: 2rem; + + border-color: var(--toc-popup-border-color); + border-width: 1px; + border-radius: $radius-lg; + color: var(--text-color); + background: var(--main-bg); + margin-top: $topbar-height; + min-width: 20rem; + font-size: 1.05rem; + + @media all and (min-width: 576px) { + max-width: 32rem; + } + + &[open] { + -webkit-animation: $slide-in; + animation: $slide-in; + } + + &[closing] { + -webkit-animation: $slide-out; + animation: $slide-out; + } + + @media all and (min-width: 850px) { + left: $sidebar-width; + } + + .header { + @extend %btn-color; + + position: -webkit-sticky; + position: sticky; + top: 0; + background-color: inherit; + border-bottom: 1px solid var(--main-border-color); + + .label { + font-family: $font-family-heading; + } + } + + button:focus-visible { + box-shadow: none; + } + + ul { + list-style-type: none; + padding-left: 0; + + li { + ul, + & + li { + margin-top: 0.25rem; + } + + a { + display: flex; + line-height: 1.5; + padding: 0.375rem 0; + padding-right: 1.125rem; + + &.toc-link::before { + display: none; + } + } + } + } + + @for $i from 2 through 4 { + .node-name--H#{$i} { + padding-left: 1.125rem * ($i - 1); + } + } + + .is-active-link { + color: var(--toc-highlight) !important; + font-weight: 600; + } + + &::-webkit-backdrop { + -webkit-backdrop-filter: blur(5px); + backdrop-filter: blur(5px); + } + + &::backdrop { + -webkit-backdrop-filter: blur(5px); + backdrop-filter: blur(5px); + } + + &::after { + display: flex; + content: ''; + position: relative; + background: linear-gradient(transparent, var(--main-bg) 70%); + height: $curtain-height; + } + + #toc-popup-content { + overflow: auto; + max-height: calc(100vh - 4 * $topbar-height); + font-family: $font-family-heading; + margin-bottom: -$curtain-height; + } +} + /* --- Related Posts --- */ #related-posts { @@ -368,3 +564,16 @@ header { margin-right: -0.5rem; } } + +@media all and (min-width: 1200px) { + h2, + h3, + h4 { + scroll-margin-top: 2rem; + } + + #toc-bar, + #toc-solo-trigger { + display: none !important; + } +} From 03e302cbf68cc502a2b6bef0726186a0b3ef321c Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Sun, 13 Oct 2024 21:16:25 +0400 Subject: [PATCH 059/177] chore: close toc-popup gracefully with Esc key (#1990) --- _javascript/modules/components/toc/toc-mobile.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_javascript/modules/components/toc/toc-mobile.js b/_javascript/modules/components/toc/toc-mobile.js index 48b372df..8d717dd0 100644 --- a/_javascript/modules/components/toc/toc-mobile.js +++ b/_javascript/modules/components/toc/toc-mobile.js @@ -62,7 +62,11 @@ export class TocMobile { activeItem.scrollIntoView({ block: 'center' }); } - static hidePopup() { + static hidePopup(event) { + if (event?.type === 'cancel') { + event.preventDefault(); + } + if (!$popup.open) { return; } From 6f461132c00c7f7d557e0b865530bb256c1fe5be Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 19 Oct 2024 21:13:21 +0800 Subject: [PATCH 060/177] refactor: improve toc popup module --- _javascript/modules/components/toc.js | 5 +- .../modules/components/toc/toc-mobile.js | 48 ++++++++++--------- _layouts/post.html | 6 +-- _sass/layout/post.scss | 24 ++++++---- 4 files changed, 49 insertions(+), 34 deletions(-) diff --git a/_javascript/modules/components/toc.js b/_javascript/modules/components/toc.js index 765336ac..e9086eed 100644 --- a/_javascript/modules/components/toc.js +++ b/_javascript/modules/components/toc.js @@ -5,7 +5,10 @@ const desktopMode = matchMedia('(min-width: 1200px)'); function refresh(e) { if (e.matches) { - mobile.hidePopup(); + if (mobile.popupOpened) { + mobile.hidePopup(); + } + desktop.refresh(); } else { mobile.refresh(); diff --git a/_javascript/modules/components/toc/toc-mobile.js b/_javascript/modules/components/toc/toc-mobile.js index 8d717dd0..20e24a73 100644 --- a/_javascript/modules/components/toc/toc-mobile.js +++ b/_javascript/modules/components/toc/toc-mobile.js @@ -12,8 +12,8 @@ const SCROLL_LOCK = 'overflow-hidden'; const CLOSING = 'closing'; export class TocMobile { - static invisible = true; - static barHeight = 16 * 3; // 3rem + static #invisible = true; + static #barHeight = 16 * 3; // 3rem static options = { tocSelector: '#toc-popup-content', @@ -23,7 +23,7 @@ export class TocMobile { orderedList: false, scrollSmooth: false, collapseDepth: 4, - headingsOffset: this.barHeight + headingsOffset: this.#barHeight }; static initBar() { @@ -33,44 +33,40 @@ export class TocMobile { $tocBar.classList.toggle('invisible', entry.isIntersecting); }); }, - { rootMargin: `-${this.barHeight}px 0px 0px 0px` } + { rootMargin: `-${this.#barHeight}px 0px 0px 0px` } ); observer.observe($soloTrigger); - this.invisible = false; + this.#invisible = false; } static listenAnchors() { const $anchors = document.getElementsByClassName('toc-link'); [...$anchors].forEach((anchor) => { - anchor.onclick = this.hidePopup; + anchor.onclick = () => this.hidePopup(); }); } static refresh() { - if (this.invisible) { + if (this.#invisible) { this.initComponents(); } tocbot.refresh(this.options); this.listenAnchors(); } + static get popupOpened() { + return $popup.open; + } + static showPopup() { - TocMobile.lockScroll(true); + this.lockScroll(true); $popup.showModal(); const activeItem = $popup.querySelector('li.is-active-li'); activeItem.scrollIntoView({ block: 'center' }); } - static hidePopup(event) { - if (event?.type === 'cancel') { - event.preventDefault(); - } - - if (!$popup.open) { - return; - } - + static hidePopup() { $popup.toggleAttribute(CLOSING); $popup.addEventListener( @@ -82,7 +78,7 @@ export class TocMobile { { once: true } ); - TocMobile.lockScroll(false); + this.lockScroll(false); } static lockScroll(enable) { @@ -91,6 +87,10 @@ export class TocMobile { } static clickBackdrop(event) { + if ($popup.hasAttribute(CLOSING)) { + return; + } + const rect = event.target.getBoundingClientRect(); if ( event.clientX < rect.left || @@ -98,7 +98,7 @@ export class TocMobile { event.clientY < rect.top || event.clientY > rect.bottom ) { - TocMobile.hidePopup(); + this.hidePopup(); } } @@ -106,11 +106,15 @@ export class TocMobile { this.initBar(); [...$triggers].forEach((trigger) => { - trigger.onclick = this.showPopup; + trigger.onclick = () => this.showPopup(); }); - $popup.onclick = this.clickBackdrop; - $btnClose.onclick = $popup.oncancel = this.hidePopup; + $popup.onclick = (e) => this.clickBackdrop(e); + $btnClose.onclick = () => this.hidePopup(); + $popup.oncancel = (e) => { + e.preventDefault(); + this.hidePopup(); + }; } static init() { diff --git a/_layouts/post.html b/_layouts/post.html index bcc133f8..6a2deff7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -100,7 +100,7 @@

{{ page.title }}

{% if enable_toc %} @@ -113,8 +113,8 @@

{{ page.title }}

{{- page.title -}}
-
diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index be727006..01021f3f 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -380,12 +380,13 @@ header { $slide-in: slide-in 0.3s ease-out; $slide-out: slide-out 0.3s ease-out; $curtain-height: 2rem; + $backdrop: blur(5px); border-color: var(--toc-popup-border-color); border-width: 1px; border-radius: $radius-lg; color: var(--text-color); - background: var(--main-bg); + background: var(--card-bg); margin-top: $topbar-height; min-width: 20rem; font-size: 1.05rem; @@ -422,8 +423,15 @@ header { } } - button:focus-visible { - box-shadow: none; + button { + > i { + font-size: 1.25rem; + vertical-align: middle; + } + + &:focus-visible { + box-shadow: none; + } } ul { @@ -461,20 +469,20 @@ header { } &::-webkit-backdrop { - -webkit-backdrop-filter: blur(5px); - backdrop-filter: blur(5px); + -webkit-backdrop-filter: $backdrop; + backdrop-filter: $backdrop; } &::backdrop { - -webkit-backdrop-filter: blur(5px); - backdrop-filter: blur(5px); + -webkit-backdrop-filter: $backdrop; + backdrop-filter: $backdrop; } &::after { display: flex; content: ''; position: relative; - background: linear-gradient(transparent, var(--main-bg) 70%); + background: linear-gradient(transparent, var(--card-bg) 70%); height: $curtain-height; } From c1bd9eb9eece4cf3b7e76d750bcc4108aec63361 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 20 Oct 2024 13:47:54 +0800 Subject: [PATCH 061/177] refactor: reduce duplicate scss --- _sass/addon/commons.scss | 22 ++++++++++------------ _sass/addon/module.scss | 21 ++++++++++++++++++--- _sass/layout/archives.scss | 5 ++--- _sass/layout/category-tag.scss | 4 +--- _sass/layout/home.scss | 5 ++--- _sass/layout/post.scss | 26 ++++++++++++-------------- 6 files changed, 45 insertions(+), 38 deletions(-) diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index e332f213..2bf99b85 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -251,8 +251,8 @@ i { > p { margin-left: 0.25em; - margin-top: 0; - margin-bottom: 0; + + @include mt-mb(0); } } } @@ -769,8 +769,8 @@ $btn-mb: 0.5rem; li.nav-item { opacity: 0.9; width: 100%; - padding-left: 1.5rem; - padding-right: 1.5rem; + + @include pl-pr(1.5rem); a.nav-link { @include pt-pb(0.6rem); @@ -1043,7 +1043,7 @@ search { a { font-size: 1.4rem; - line-height: 2.5rem; + line-height: 1.5rem; &:hover { @extend %link-hover; @@ -1069,8 +1069,9 @@ search { } > p { - overflow: hidden; - text-overflow: ellipsis; + @extend %text-ellipsis; + + white-space: break-spaces; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; @@ -1086,10 +1087,7 @@ search { color: var(--topbar-text-color); text-align: center; width: 70%; - overflow: hidden; - text-overflow: ellipsis; word-break: keep-all; - white-space: nowrap; } #mask { @@ -1492,8 +1490,8 @@ search { #main-wrapper > .container { max-width: $main-content-max-width; - padding-left: 1.75rem !important; - padding-right: 1.75rem !important; + + @include pl-pr(1.75rem, true); } main.col-12, diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index 34ac67b9..1dfb735f 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -112,6 +112,16 @@ -webkit-box-orient: vertical; } +@mixin text-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +%text-ellipsis { + @include text-ellipsis; +} + %text-highlight { color: var(--text-muted-highlight-color); font-weight: 600; @@ -158,9 +168,14 @@ padding-bottom: $val; } -@mixin pl-pr($val) { - padding-left: $val; - padding-right: $val; +@mixin pl-pr($val, $important: false) { + @if $important { + padding-left: $val !important; + padding-right: $val !important; + } @else { + padding-left: $val; + padding-right: $val; + } } @mixin placeholder { diff --git a/_sass/layout/archives.scss b/_sass/layout/archives.scss index 3a2e86b1..fd1979b8 100644 --- a/_sass/layout/archives.scss +++ b/_sass/layout/archives.scss @@ -58,9 +58,8 @@ li { font-size: 1.1rem; line-height: 3rem; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + + @extend %text-ellipsis; &:nth-child(odd) { background-color: var(--main-bg, #ffffff); diff --git a/_sass/layout/category-tag.scss b/_sass/layout/category-tag.scss index 9e43a911..fe7d99ce 100644 --- a/_sass/layout/category-tag.scss +++ b/_sass/layout/category-tag.scss @@ -63,9 +63,7 @@ } > a { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + @include text-ellipsis; } } } diff --git a/_sass/layout/home.scss b/_sass/layout/home.scss index 0d95d7ba..7fff3ba1 100644 --- a/_sass/layout/home.scss +++ b/_sass/layout/home.scss @@ -74,9 +74,8 @@ > div:first-child { display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + + @extend %text-ellipsis; } } } diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index 01021f3f..b66e906c 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -1,6 +1,6 @@ -/* - Post-specific style -*/ +/** + * Post-specific styles + */ %btn-post-nav { width: 50%; @@ -97,7 +97,7 @@ header { &:hover { i { - @extend %btn-share-hovor; + @extend %btn-share-hover; } } } @@ -258,9 +258,8 @@ header { .toc-link { display: block; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + + @extend %text-ellipsis; &:hover { color: var(--toc-highlight); @@ -509,10 +508,11 @@ header { } p { + @extend %text-ellipsis; + font-size: 0.9rem; margin-bottom: 0.5rem; - overflow: hidden; - text-overflow: ellipsis; + white-space: break-spaces; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; @@ -534,7 +534,7 @@ header { max-width: 100%; } -%btn-share-hovor { +%btn-share-hover { color: var(--btn-share-hover-color) !important; } @@ -566,10 +566,8 @@ header { /* Hide SideBar and TOC */ @media all and (max-width: 849px) { .post-navigation { - padding-left: 0; - padding-right: 0; - margin-left: -0.5rem; - margin-right: -0.5rem; + @include pl-pr(0); + @include ml-mr(-0.5rem); } } From d4f7f39ece2d8feaca963b8bfba331268b28811e Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:42:07 +0800 Subject: [PATCH 062/177] refactor: simplify sidebar animation --- _javascript/modules/components/sidebar.js | 23 +++++++++-------------- _layouts/default.html | 2 +- _sass/addon/commons.scss | 10 ---------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/_javascript/modules/components/sidebar.js b/_javascript/modules/components/sidebar.js index 6b562d84..aed759ed 100644 --- a/_javascript/modules/components/sidebar.js +++ b/_javascript/modules/components/sidebar.js @@ -2,26 +2,21 @@ * Expand or close the sidebar in mobile screens. */ -const ATTR_DISPLAY = 'sidebar-display'; +const $sidebar = document.getElementById('sidebar'); +const $trigger = document.getElementById('sidebar-trigger'); +const $mask = document.getElementById('mask'); class SidebarUtil { - static isExpanded = false; + static #isExpanded = false; static toggle() { - if (SidebarUtil.isExpanded === false) { - document.body.setAttribute(ATTR_DISPLAY, ''); - } else { - document.body.removeAttribute(ATTR_DISPLAY); - } - - SidebarUtil.isExpanded = !SidebarUtil.isExpanded; + this.#isExpanded = !this.#isExpanded; + document.body.toggleAttribute('sidebar-display', this.#isExpanded); + $sidebar.classList.toggle('z-2', this.#isExpanded); + $mask.classList.toggle('d-none', !this.#isExpanded); } } export function sidebarExpand() { - document - .getElementById('sidebar-trigger') - .addEventListener('click', SidebarUtil.toggle); - - document.getElementById('mask').addEventListener('click', SidebarUtil.toggle); + $trigger.onclick = $mask.onclick = () => SidebarUtil.toggle(); } diff --git a/_layouts/default.html b/_layouts/default.html index ea438fe7..1590ef62 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -68,7 +68,7 @@ -
+
{% if site.pwa.enabled %} {% include_cached notification.html lang=lang %} diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 2bf99b85..5e8aceaa 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -688,7 +688,6 @@ $btn-mb: 0.5rem; height: 100%; overflow-y: auto; width: $sidebar-width; - z-index: 99; background: var(--sidebar-bg); border-right: 1px solid var(--sidebar-border-color); @@ -1091,16 +1090,7 @@ search { } #mask { - display: none; - position: fixed; inset: 0 0 0 0; - height: 100%; - width: 100%; - z-index: 1; - - @at-root [#{$sidebar-display}] & { - display: block !important; - } } /* --- basic wrappers --- */ From 74ed06321c1730dc788af3306b80a0f1739510d4 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:48:11 +0800 Subject: [PATCH 063/177] ci: block invalid pull requests (#2010) --- .github/workflows/pr-filter.yml | 22 ++++++++++++++ .github/workflows/scripts/pr-filter.js | 40 ++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 .github/workflows/pr-filter.yml create mode 100644 .github/workflows/scripts/pr-filter.js diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml new file mode 100644 index 00000000..b6bcd00a --- /dev/null +++ b/.github/workflows/pr-filter.yml @@ -0,0 +1,22 @@ +name: Block Invalid PR + +on: + pull_request_target: + types: [opened, reopened, edited] + +jobs: + check-template: + runs-on: ubuntu-latest + permissions: + pull-requests: write + steps: + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Check PR Content + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const script = require('.github/workflows/scripts/pr-filter.js'); + await script({ github, context }); diff --git a/.github/workflows/scripts/pr-filter.js b/.github/workflows/scripts/pr-filter.js new file mode 100644 index 00000000..e7206301 --- /dev/null +++ b/.github/workflows/scripts/pr-filter.js @@ -0,0 +1,40 @@ +function noTypes(markdown) { + if (/## Type of change/.test(markdown) && /- \[x\]/i.test(markdown)) { + return false; + } + return true; +} + +function noDescription(markdown) { + return ( + /## Description/.test(markdown) === false || + /## Description\s*\n\s*## \w+/.test(markdown) || + /## Description\s*\n\s*$/.test(markdown) + ); +} + +module.exports = async ({ github, context }) => { + const pr = context.payload.pull_request; + + if (pr.labels.length > 0) { + // Skip if the PR is already labeled (typically created by a deps-bot.) + return; + } + + const body = pr.body === null ? '' : pr.body.trim(); + const markdown = body.replace(//g, ''); + + if (body === '' || noTypes(markdown) || noDescription(markdown)) { + await github.rest.pulls.update({ + ...context.repo, + pull_number: pr.number, + state: 'closed' + }); + + await github.rest.issues.createComment({ + ...context.repo, + issue_number: pr.number, + body: "Oops, it seems you've submitted an invalid pull request. No worries, we'll close it for you." + }); + } +}; From c7f967529c294f9622f142470406f2be43ea4d35 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:58:07 +0800 Subject: [PATCH 064/177] ci: skip test for invalid PRs (#2013) --- .github/workflows/ci.yml | 7 +++++- .github/workflows/commitlint.yml | 3 ++- .github/workflows/pr-filter.yml | 17 +++++++++++--- .github/workflows/scripts/pr-filter.js | 31 ++++++++++++-------------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50a158b1..f909b7e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,5 @@ name: "CI" + on: push: branches: @@ -11,7 +12,7 @@ on: - "docs/**" - "README.md" - "LICENSE" - pull_request: + workflow_call: jobs: build: @@ -43,3 +44,7 @@ jobs: - name: Test Site run: bash tools/test.sh + + check-commit: + needs: build + uses: ./.github/workflows/commitlint.yml diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index c9c48c33..ac8726f3 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -1,5 +1,6 @@ name: Lint Commit Messages -on: pull_request + +on: workflow_call jobs: commitlint: diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml index b6bcd00a..fe393a29 100644 --- a/.github/workflows/pr-filter.yml +++ b/.github/workflows/pr-filter.yml @@ -1,22 +1,33 @@ -name: Block Invalid PR +name: PR Filter on: pull_request_target: - types: [opened, reopened, edited] + types: [opened, reopened] jobs: check-template: runs-on: ubuntu-latest permissions: pull-requests: write + steps: - name: Checkout Code uses: actions/checkout@v4 - name: Check PR Content + id: intercept uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} + result-encoding: string script: | const script = require('.github/workflows/scripts/pr-filter.js'); - await script({ github, context }); + return await script({ github, context }); + + - name: Abort due to invalid PR + if: ${{ steps.intercept.outputs.result != 'true' }} + run: exit 1 + + test: + needs: check-template + uses: ./.github/workflows/ci.yml diff --git a/.github/workflows/scripts/pr-filter.js b/.github/workflows/scripts/pr-filter.js index e7206301..f4190ddf 100644 --- a/.github/workflows/scripts/pr-filter.js +++ b/.github/workflows/scripts/pr-filter.js @@ -1,30 +1,25 @@ -function noTypes(markdown) { - if (/## Type of change/.test(markdown) && /- \[x\]/i.test(markdown)) { - return false; - } - return true; +function hasTypes(markdown) { + return /## Type of change/.test(markdown) && /-\s*\[x\]/i.test(markdown); } -function noDescription(markdown) { +function hasDescription(markdown) { return ( - /## Description/.test(markdown) === false || - /## Description\s*\n\s*## \w+/.test(markdown) || - /## Description\s*\n\s*$/.test(markdown) + /## Description/.test(markdown) && + !/## Description\s*\n\s*(##|\s*$)/.test(markdown) ); } module.exports = async ({ github, context }) => { const pr = context.payload.pull_request; - - if (pr.labels.length > 0) { - // Skip if the PR is already labeled (typically created by a deps-bot.) - return; - } - const body = pr.body === null ? '' : pr.body.trim(); const markdown = body.replace(//g, ''); + const action = context.payload.action; + + const isValid = + pr.labels.length > 0 || // PR create by Dependabot would have labels + (markdown !== '' && hasTypes(markdown) && hasDescription(markdown)); - if (body === '' || noTypes(markdown) || noDescription(markdown)) { + if (!isValid) { await github.rest.pulls.update({ ...context.repo, pull_number: pr.number, @@ -34,7 +29,9 @@ module.exports = async ({ github, context }) => { await github.rest.issues.createComment({ ...context.repo, issue_number: pr.number, - body: "Oops, it seems you've submitted an invalid pull request. No worries, we'll close it for you." + body: `Oops, it seems you've ${action} an invalid pull request. No worries, we'll close it for you.` }); } + + return isValid; }; From 4ef3cd8efc90518cc56b4e92306f81aa36feee70 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:56:32 +0800 Subject: [PATCH 065/177] ci: improve workflow triggers (#2017) - Unchain commit-lint and CI - Even if a commit does not meet the CI path filter, it still needs to lint the commit message. - Unchain PR filter and CI - The CI workflow needs to be triggered when the commits in a pull request are modified. - Allow manual publishing - Sometimes `semantic-release` will error out due to commit messages referencing discussions, but this does not affect the final RubyGems/GitHub Release. In such cases, manual triggering of the publish process is needed to complete the remaining publishing steps. --- .github/workflows/cd.yml | 7 +++---- .github/workflows/ci.yml | 25 ++++++++++++++----------- .github/workflows/commitlint.yml | 7 ++++++- .github/workflows/pr-filter.yml | 11 +---------- .github/workflows/publish.yml | 1 + .github/workflows/scripts/pr-filter.js | 10 +++++----- .github/workflows/style-lint.yml | 6 ++++-- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 4f2da0e3..c665f755 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -2,13 +2,12 @@ name: CD on: push: - branches: - - production - tags-ignore: - - "**" + branches: [production] + tags-ignore: ["**"] jobs: release: + if: ${{ ! startsWith(github.event.head_commit.message, 'chore(release)') }} permissions: contents: write issues: write diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f909b7e6..31b87863 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,18 +1,25 @@ -name: "CI" +name: CI on: push: branches: - - "master" - - "hotfix/**" + - master + - "hotfix/*" paths-ignore: - ".github/**" - "!.github/workflows/ci.yml" - - ".gitignore" + - .gitignore - "docs/**" - - "README.md" - - "LICENSE" - workflow_call: + - README.md + - LICENSE + pull_request: + paths-ignore: + - ".github/**" + - "!.github/workflows/ci.yml" + - .gitignore + - "docs/**" + - README.md + - LICENSE jobs: build: @@ -44,7 +51,3 @@ jobs: - name: Test Site run: bash tools/test.sh - - check-commit: - needs: build - uses: ./.github/workflows/commitlint.yml diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index ac8726f3..58f1a3ff 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -1,6 +1,11 @@ name: Lint Commit Messages -on: workflow_call +on: + push: + branches: + - master + - "hotfix/*" + pull_request: jobs: commitlint: diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml index fe393a29..42e1d640 100644 --- a/.github/workflows/pr-filter.yml +++ b/.github/workflows/pr-filter.yml @@ -19,15 +19,6 @@ jobs: uses: actions/github-script@v7 with: github-token: ${{ secrets.GITHUB_TOKEN }} - result-encoding: string script: | const script = require('.github/workflows/scripts/pr-filter.js'); - return await script({ github, context }); - - - name: Abort due to invalid PR - if: ${{ steps.intercept.outputs.result != 'true' }} - run: exit 1 - - test: - needs: check-template - uses: ./.github/workflows/ci.yml + await script({ github, context, core }); diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 99114ea3..b0f9713f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,6 +10,7 @@ on: required: true BUILDER: required: true + workflow_dispatch: jobs: launch: diff --git a/.github/workflows/scripts/pr-filter.js b/.github/workflows/scripts/pr-filter.js index f4190ddf..97242016 100644 --- a/.github/workflows/scripts/pr-filter.js +++ b/.github/workflows/scripts/pr-filter.js @@ -1,5 +1,5 @@ function hasTypes(markdown) { - return /## Type of change/.test(markdown) && /-\s*\[x\]/i.test(markdown); + return /## Type of change/.test(markdown) && /-\s\[x\]/i.test(markdown); } function hasDescription(markdown) { @@ -9,9 +9,9 @@ function hasDescription(markdown) { ); } -module.exports = async ({ github, context }) => { +module.exports = async ({ github, context, core }) => { const pr = context.payload.pull_request; - const body = pr.body === null ? '' : pr.body.trim(); + const body = pr.body === null ? '' : pr.body; const markdown = body.replace(//g, ''); const action = context.payload.action; @@ -31,7 +31,7 @@ module.exports = async ({ github, context }) => { issue_number: pr.number, body: `Oops, it seems you've ${action} an invalid pull request. No worries, we'll close it for you.` }); - } - return isValid; + core.setFailed('PR content does not meet template requirements.'); + } }; diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index f84f3bcc..5cb38a7a 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -1,8 +1,10 @@ -name: "Style Lint" +name: Style Lint on: push: - branches: ["master", "hotfix/**"] + branches: + - master + - "hotfix/*" paths: ["_sass/**/*.scss"] pull_request: paths: ["_sass/**/*.scss"] From 86b13c917f8f9477b10766fb621cbe987c025203 Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Fri, 1 Nov 2024 14:39:03 +0400 Subject: [PATCH 066/177] chore: improve feed interoperability (#2024) --- assets/feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/feed.xml b/assets/feed.xml index 0ab20e3b..d2aad4db 100644 --- a/assets/feed.xml +++ b/assets/feed.xml @@ -34,7 +34,7 @@ permalink: /feed.xml {{ post.date | date_to_xmlschema }} {% endif %} {{ post_absolute_url }} - + {{ post.author | default: site.social.name }} From 42dea8ee2986ee609ca6f2643a03bd29bd5456a3 Mon Sep 17 00:00:00 2001 From: Supreeth Mysore Venkatesh Date: Sun, 3 Nov 2024 17:45:59 +0100 Subject: [PATCH 067/177] build(deps): update `wdm` gem version for compatibility (#2028) --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 66f9337d..e5415748 100644 --- a/Gemfile +++ b/Gemfile @@ -11,4 +11,4 @@ platforms :mingw, :x64_mingw, :mswin, :jruby do gem "tzinfo-data" end -gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] +gem "wdm", "~> 0.2.0", :platforms => [:mingw, :x64_mingw, :mswin] From 2f844978aac587a8631c16d6907f24a8af6035a3 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:15:31 +0800 Subject: [PATCH 068/177] chore: change stale label to `inactive` --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index bcf425ae..4f6e91cb 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -9,7 +9,7 @@ permissions: pull-requests: write env: - STALE_LABEL: stale + STALE_LABEL: inactive EXEMPT_LABELS: "pending,planning,in progress" MESSAGE: > This conversation has been automatically marked as stale because it has not had recent activity. From d51345e29754ba92a0c2fd6534bbd248ff298331 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:35:18 +0800 Subject: [PATCH 069/177] ci: reduce unnecessary pr-filter runs (#2033) - Checking the repository of the PR is more effective than checking the label to identify bot-initiated PRs - This change also allows more flexible PR body definitions for developers with write access to the repository --- .github/workflows/pr-filter.yml | 1 + .github/workflows/scripts/pr-filter.js | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml index 42e1d640..8e9a18b7 100644 --- a/.github/workflows/pr-filter.yml +++ b/.github/workflows/pr-filter.yml @@ -6,6 +6,7 @@ on: jobs: check-template: + if: github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name runs-on: ubuntu-latest permissions: pull-requests: write diff --git a/.github/workflows/scripts/pr-filter.js b/.github/workflows/scripts/pr-filter.js index 97242016..03f50dc5 100644 --- a/.github/workflows/scripts/pr-filter.js +++ b/.github/workflows/scripts/pr-filter.js @@ -16,8 +16,7 @@ module.exports = async ({ github, context, core }) => { const action = context.payload.action; const isValid = - pr.labels.length > 0 || // PR create by Dependabot would have labels - (markdown !== '' && hasTypes(markdown) && hasDescription(markdown)); + markdown !== '' && hasTypes(markdown) && hasDescription(markdown); if (!isValid) { await github.rest.pulls.update({ From 65f960c31a734b5306a8b919040c3aae9b783efd Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 16 Nov 2024 22:49:55 +0800 Subject: [PATCH 070/177] perf: speed up page rendering and jekyll build process (#2034) - Ensure inline scripts execute after the DOM has fully loaded. - Use Rollup to bundle the theme-mode and Mermaid scripts, reducing the number of Jekyll include snippets. --- _includes/analytics/cloudflare.html | 1 - _includes/analytics/fathom.html | 5 +- _includes/analytics/google.html | 2 +- _includes/analytics/matomo.html | 13 +- _includes/{comments.html => comment.html} | 0 _includes/comments/disqus.html | 65 +++++---- _includes/comments/giscus.html | 44 ++---- _includes/comments/utterances.html | 63 ++++---- _includes/head.html | 25 +++- _includes/js-selector.html | 29 +--- _includes/jsdelivr-combine.html | 8 +- _includes/mermaid.html | 62 -------- _includes/mode-toggle.html | 116 --------------- _includes/search-loader.html | 42 +++--- _javascript/categories.js | 2 +- _javascript/home.js | 2 +- _javascript/misc.js | 2 +- .../modules/{plugins.js => components.js} | 4 + _javascript/modules/components/img-popup.js | 16 +-- _javascript/modules/components/mermaid.js | 60 ++++++++ _javascript/modules/components/mode-toggle.js | 15 ++ .../modules/components/mode-watcher.js | 14 -- _javascript/modules/components/sidebar.js | 22 --- _javascript/modules/layouts/basic.js | 4 +- _javascript/modules/layouts/sidebar.js | 20 ++- _javascript/modules/theme.js | 135 ++++++++++++++++++ _javascript/page.js | 8 +- _javascript/post.js | 6 +- _layouts/default.html | 8 +- _layouts/post.html | 3 +- _sass/layout/post.scss | 1 + package.json | 1 + rollup.config.js | 19 ++- 33 files changed, 410 insertions(+), 407 deletions(-) rename _includes/{comments.html => comment.html} (100%) delete mode 100644 _includes/mermaid.html delete mode 100644 _includes/mode-toggle.html rename _javascript/modules/{plugins.js => components.js} (60%) create mode 100644 _javascript/modules/components/mermaid.js create mode 100644 _javascript/modules/components/mode-toggle.js delete mode 100644 _javascript/modules/components/mode-watcher.js delete mode 100644 _javascript/modules/components/sidebar.js create mode 100644 _javascript/modules/theme.js diff --git a/_includes/analytics/cloudflare.html b/_includes/analytics/cloudflare.html index 1eeb1a92..9faa11ee 100644 --- a/_includes/analytics/cloudflare.html +++ b/_includes/analytics/cloudflare.html @@ -4,4 +4,3 @@ src="https://static.cloudflareinsights.com/beacon.min.js" data-cf-beacon='{"token": "{{ site.analytics.cloudflare.id }}"}' > - diff --git a/_includes/analytics/fathom.html b/_includes/analytics/fathom.html index 4b603d3a..216bb140 100644 --- a/_includes/analytics/fathom.html +++ b/_includes/analytics/fathom.html @@ -2,6 +2,5 @@ - + defer +> diff --git a/_includes/analytics/google.html b/_includes/analytics/google.html index d0aac651..dfe4828c 100644 --- a/_includes/analytics/google.html +++ b/_includes/analytics/google.html @@ -1,7 +1,7 @@ - diff --git a/_includes/comments.html b/_includes/comment.html similarity index 100% rename from _includes/comments.html rename to _includes/comment.html diff --git a/_includes/comments/disqus.html b/_includes/comments/disqus.html index 2b889a4e..fd12a3c7 100644 --- a/_includes/comments/disqus.html +++ b/_includes/comments/disqus.html @@ -1,38 +1,25 @@ - - -
-

Comments powered by Disqus.

-
- - diff --git a/_includes/comments/giscus.html b/_includes/comments/giscus.html index f9becfe9..80584720 100644 --- a/_includes/comments/giscus.html +++ b/_includes/comments/giscus.html @@ -1,21 +1,8 @@ - - - diff --git a/_includes/head.html b/_includes/head.html index af3acdb5..310f52eb 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -97,11 +97,32 @@ {% endif %} - + {% unless site.theme_mode %} - {% include mode-toggle.html %} + {% endunless %} + {% include js-selector.html lang=lang %} + + {% if jekyll.environment == 'production' %} + + {% if site.pwa.enabled %} + + {% endif %} + + + {% for analytics in site.analytics %} + {% capture str %}{{ analytics }}{% endcapture %} + {% assign platform = str | split: '{' | first %} + {% if site.analytics[platform].id and site.analytics[platform].id != empty %} + {% include analytics/{{ platform }}.html %} + {% endif %} + {% endfor %} + {% endif %} + {% include metadata-hook.html %} diff --git a/_includes/js-selector.html b/_includes/js-selector.html index 4d77d06b..fd4acca8 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -62,12 +62,12 @@ {% capture script %}/assets/js/dist/{{ js }}.min.js{% endcapture %} - + {% if page.math %} - - + + {% endif %} @@ -84,26 +84,3 @@ {% endcase %} {% endif %} {% endif %} - -{% if page.mermaid %} - {% include mermaid.html %} -{% endif %} - -{% if jekyll.environment == 'production' %} - - {% if site.pwa.enabled %} - - {% endif %} - - - {% for analytics in site.analytics %} - {% capture str %}{{ analytics }}{% endcapture %} - {% assign type = str | split: '{' | first %} - {% if site.analytics[type].id and site.analytics[type].id != empty %} - {% include analytics/{{ type }}.html %} - {% endif %} - {% endfor %} -{% endif %} diff --git a/_includes/jsdelivr-combine.html b/_includes/jsdelivr-combine.html index cffa6995..0611213b 100644 --- a/_includes/jsdelivr-combine.html +++ b/_includes/jsdelivr-combine.html @@ -1,6 +1,6 @@ {% assign urls = include.urls | split: ',' %} -{% assign combined_urls = nil %} +{% assign combined_urls = null %} {% assign domain = 'https://cdn.jsdelivr.net/' %} @@ -15,12 +15,12 @@ {% endif %} {% elsif url contains '//' %} - + {% else %} - + {% endif %} {% endfor %} {% if combined_urls %} - + {% endif %} diff --git a/_includes/mermaid.html b/_includes/mermaid.html deleted file mode 100644 index a3a83edb..00000000 --- a/_includes/mermaid.html +++ /dev/null @@ -1,62 +0,0 @@ - - diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html deleted file mode 100644 index 113ec375..00000000 --- a/_includes/mode-toggle.html +++ /dev/null @@ -1,116 +0,0 @@ - - - diff --git a/_includes/search-loader.html b/_includes/search-loader.html index 2582580a..7fd065d8 100644 --- a/_includes/search-loader.html +++ b/_includes/search-loader.html @@ -19,29 +19,31 @@

{title}

{% capture not_found %}

{{ site.data.locales[include.lang].search.no_results }}

{% endcapture %} diff --git a/_javascript/categories.js b/_javascript/categories.js index 15d82513..ce87d671 100644 --- a/_javascript/categories.js +++ b/_javascript/categories.js @@ -1,5 +1,5 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; -import { categoryCollapse } from './modules/plugins'; +import { categoryCollapse } from './modules/components'; basic(); initSidebar(); diff --git a/_javascript/home.js b/_javascript/home.js index ef22cb97..7f628a17 100644 --- a/_javascript/home.js +++ b/_javascript/home.js @@ -1,5 +1,5 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; -import { initLocaleDatetime, loadImg } from './modules/plugins'; +import { initLocaleDatetime, loadImg } from './modules/components'; loadImg(); initLocaleDatetime(); diff --git a/_javascript/misc.js b/_javascript/misc.js index 52b40438..37130da1 100644 --- a/_javascript/misc.js +++ b/_javascript/misc.js @@ -1,5 +1,5 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; -import { initLocaleDatetime } from './modules/plugins'; +import { initLocaleDatetime } from './modules/components'; initSidebar(); initTopbar(); diff --git a/_javascript/modules/plugins.js b/_javascript/modules/components.js similarity index 60% rename from _javascript/modules/plugins.js rename to _javascript/modules/components.js index cc95c1bc..95791a69 100644 --- a/_javascript/modules/plugins.js +++ b/_javascript/modules/components.js @@ -4,3 +4,7 @@ export { loadImg } from './components/img-loading'; export { imgPopup } from './components/img-popup'; export { initLocaleDatetime } from './components/locale-datetime'; export { initToc } from './components/toc'; +export { loadMermaid } from './components/mermaid'; +export { modeWatcher } from './components/mode-toggle'; +export { back2top } from './components/back-to-top'; +export { loadTooptip } from './components/tooltip-loader'; diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js index ac120435..420a2265 100644 --- a/_javascript/modules/components/img-popup.js +++ b/_javascript/modules/components/img-popup.js @@ -4,7 +4,6 @@ * Dependencies: https://github.com/biati-digital/glightbox */ -const html = document.documentElement; const lightImages = '.popup:not(.dark)'; const darkImages = '.popup:not(.light)'; let selector = lightImages; @@ -33,26 +32,17 @@ export function imgPopup() { document.querySelector('.popup.dark') === null ); - if ( - (html.hasAttribute('data-mode') && - html.getAttribute('data-mode') === 'dark') || - (!html.hasAttribute('data-mode') && - window.matchMedia('(prefers-color-scheme: dark)').matches) - ) { + if (Theme.visualState === Theme.DARK) { selector = darkImages; } let current = GLightbox({ selector: `${selector}` }); - if (hasDualImages && document.getElementById('mode-toggle')) { + if (hasDualImages && Theme.switchable) { let reverse = null; window.addEventListener('message', (event) => { - if ( - event.source === window && - event.data && - event.data.direction === ModeToggle.ID - ) { + if (event.source === window && event.data && event.data.id === Theme.ID) { updateImages(current, reverse); } }); diff --git a/_javascript/modules/components/mermaid.js b/_javascript/modules/components/mermaid.js new file mode 100644 index 00000000..2b4759f4 --- /dev/null +++ b/_javascript/modules/components/mermaid.js @@ -0,0 +1,60 @@ +/** + * Mermaid-js loader + */ + +const MERMAID = 'mermaid'; +const themeMapper = Theme.getThemeMapper('default', 'dark'); + +function refreshTheme(event) { + if (event.source === window && event.data && event.data.id === Theme.ID) { + // Re-render the SVG › + const mermaidList = document.getElementsByClassName(MERMAID); + + [...mermaidList].forEach((elem) => { + const svgCode = elem.previousSibling.children.item(0).innerHTML; + elem.textContent = svgCode; + elem.removeAttribute('data-processed'); + }); + + const newTheme = themeMapper[Theme.visualState]; + + mermaid.initialize({ theme: newTheme }); + mermaid.init(null, `.${MERMAID}`); + } +} + +function setNode(elem) { + const svgCode = elem.textContent; + const backup = elem.parentElement; + backup.classList.add('d-none'); + // Create mermaid node + const mermaid = document.createElement('pre'); + mermaid.classList.add(MERMAID); + const text = document.createTextNode(svgCode); + mermaid.appendChild(text); + backup.after(mermaid); +} + +export function loadMermaid() { + if ( + typeof mermaid === 'undefined' || + typeof mermaid.initialize !== 'function' + ) { + return; + } + + const initTheme = themeMapper[Theme.visualState]; + + let mermaidConf = { + theme: initTheme + }; + + const basicList = document.getElementsByClassName('language-mermaid'); + [...basicList].forEach(setNode); + + mermaid.initialize(mermaidConf); + + if (Theme.switchable) { + window.addEventListener('message', refreshTheme); + } +} diff --git a/_javascript/modules/components/mode-toggle.js b/_javascript/modules/components/mode-toggle.js new file mode 100644 index 00000000..455ff0a0 --- /dev/null +++ b/_javascript/modules/components/mode-toggle.js @@ -0,0 +1,15 @@ +/** + * Add listener for theme mode toggle + */ + +const $toggle = document.getElementById('mode-toggle'); + +export function modeWatcher() { + if (!$toggle) { + return; + } + + $toggle.addEventListener('click', () => { + Theme.flip(); + }); +} diff --git a/_javascript/modules/components/mode-watcher.js b/_javascript/modules/components/mode-watcher.js deleted file mode 100644 index 9eecd096..00000000 --- a/_javascript/modules/components/mode-watcher.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Add listener for theme mode toggle - */ -const toggle = document.getElementById('mode-toggle'); - -export function modeWatcher() { - if (!toggle) { - return; - } - - toggle.addEventListener('click', () => { - modeToggle.flipMode(); - }); -} diff --git a/_javascript/modules/components/sidebar.js b/_javascript/modules/components/sidebar.js deleted file mode 100644 index aed759ed..00000000 --- a/_javascript/modules/components/sidebar.js +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Expand or close the sidebar in mobile screens. - */ - -const $sidebar = document.getElementById('sidebar'); -const $trigger = document.getElementById('sidebar-trigger'); -const $mask = document.getElementById('mask'); - -class SidebarUtil { - static #isExpanded = false; - - static toggle() { - this.#isExpanded = !this.#isExpanded; - document.body.toggleAttribute('sidebar-display', this.#isExpanded); - $sidebar.classList.toggle('z-2', this.#isExpanded); - $mask.classList.toggle('d-none', !this.#isExpanded); - } -} - -export function sidebarExpand() { - $trigger.onclick = $mask.onclick = () => SidebarUtil.toggle(); -} diff --git a/_javascript/modules/layouts/basic.js b/_javascript/modules/layouts/basic.js index fb36a8b8..b8eddf61 100644 --- a/_javascript/modules/layouts/basic.js +++ b/_javascript/modules/layouts/basic.js @@ -1,7 +1,7 @@ -import { back2top } from '../components/back-to-top'; -import { loadTooptip } from '../components/tooltip-loader'; +import { back2top, loadTooptip, modeWatcher } from '../components'; export function basic() { + modeWatcher(); back2top(); loadTooptip(); } diff --git a/_javascript/modules/layouts/sidebar.js b/_javascript/modules/layouts/sidebar.js index 8795693c..bbf5e7da 100644 --- a/_javascript/modules/layouts/sidebar.js +++ b/_javascript/modules/layouts/sidebar.js @@ -1,7 +1,19 @@ -import { modeWatcher } from '../components/mode-watcher'; -import { sidebarExpand } from '../components/sidebar'; +const ATTR_DISPLAY = 'sidebar-display'; +const $sidebar = document.getElementById('sidebar'); +const $trigger = document.getElementById('sidebar-trigger'); +const $mask = document.getElementById('mask'); + +class SidebarUtil { + static #isExpanded = false; + + static toggle() { + this.#isExpanded = !this.#isExpanded; + document.body.toggleAttribute(ATTR_DISPLAY, this.#isExpanded); + $sidebar.classList.toggle('z-2', this.#isExpanded); + $mask.classList.toggle('d-none', !this.#isExpanded); + } +} export function initSidebar() { - modeWatcher(); - sidebarExpand(); + $trigger.onclick = $mask.onclick = () => SidebarUtil.toggle(); } diff --git a/_javascript/modules/theme.js b/_javascript/modules/theme.js new file mode 100644 index 00000000..f9ebf202 --- /dev/null +++ b/_javascript/modules/theme.js @@ -0,0 +1,135 @@ +/** + * Theme management class + * + * To reduce flickering during page load, this script should be loaded synchronously. + */ +class Theme { + static #modeKey = 'mode'; + static #modeAttr = 'data-mode'; + static #darkMedia = window.matchMedia('(prefers-color-scheme: dark)'); + static switchable = !document.documentElement.hasAttribute(this.#modeAttr); + + static get DARK() { + return 'dark'; + } + + static get LIGHT() { + return 'light'; + } + + /** + * @returns {string} Theme mode identifier + */ + static get ID() { + return 'theme-mode'; + } + + /** + * Gets the current visual state of the theme. + * + * @returns {string} The current visual state, either the mode if it exists, + * or the system dark mode state ('dark' or 'light'). + */ + static get visualState() { + if (this.#hasMode) { + return this.#mode; + } else { + return this.#sysDark ? this.DARK : this.LIGHT; + } + } + + static get #mode() { + return sessionStorage.getItem(this.#modeKey); + } + + static get #isDarkMode() { + return this.#mode === this.DARK; + } + + static get #hasMode() { + return this.#mode !== null; + } + + static get #sysDark() { + return this.#darkMedia.matches; + } + + /** + * Maps theme modes to provided values + * @param {string} light Value for light mode + * @param {string} dark Value for dark mode + * @returns {Object} Mapped values + */ + static getThemeMapper(light, dark) { + return { + [this.LIGHT]: light, + [this.DARK]: dark + }; + } + + /** + * Initializes the theme based on system preferences or stored mode + */ + static init() { + if (!this.switchable) { + return; + } + + this.#darkMedia.addEventListener('change', () => { + const lastMode = this.#mode; + this.#clearMode(); + + if (lastMode !== this.visualState) { + this.#notify(); + } + }); + + if (!this.#hasMode) { + return; + } + + if (this.#isDarkMode) { + this.#setDark(); + } else { + this.#setLight(); + } + } + + /** + * Flips the current theme mode + */ + static flip() { + if (this.#hasMode) { + this.#clearMode(); + } else { + this.#sysDark ? this.#setLight() : this.#setDark(); + } + this.#notify(); + } + + static #setDark() { + document.documentElement.setAttribute(this.#modeAttr, this.DARK); + sessionStorage.setItem(this.#modeKey, this.DARK); + } + + static #setLight() { + document.documentElement.setAttribute(this.#modeAttr, this.LIGHT); + sessionStorage.setItem(this.#modeKey, this.LIGHT); + } + + static #clearMode() { + document.documentElement.removeAttribute(this.#modeAttr); + sessionStorage.removeItem(this.#modeKey); + } + + /** + * Notifies other plugins that the theme mode has changed + */ + static #notify() { + window.postMessage({ id: this.ID }, '*'); + } +} + +Theme.init(); + +export default Theme; diff --git a/_javascript/page.js b/_javascript/page.js index 76e8ce97..4b03b790 100644 --- a/_javascript/page.js +++ b/_javascript/page.js @@ -1,9 +1,15 @@ import { basic, initSidebar, initTopbar } from './modules/layouts'; -import { loadImg, imgPopup, initClipboard } from './modules/plugins'; +import { + loadImg, + imgPopup, + initClipboard, + loadMermaid +} from './modules/components'; loadImg(); imgPopup(); initSidebar(); initTopbar(); initClipboard(); +loadMermaid(); basic(); diff --git a/_javascript/post.js b/_javascript/post.js index 1c616ecd..dc472b42 100644 --- a/_javascript/post.js +++ b/_javascript/post.js @@ -5,8 +5,9 @@ import { imgPopup, initLocaleDatetime, initClipboard, - initToc -} from './modules/plugins'; + initToc, + loadMermaid +} from './modules/components'; loadImg(); initToc(); @@ -15,4 +16,5 @@ initSidebar(); initLocaleDatetime(); initClipboard(); initTopbar(); +loadMermaid(); basic(); diff --git a/_layouts/default.html b/_layouts/default.html index 1590ef62..c83c561c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -74,8 +74,12 @@ {% include_cached notification.html lang=lang %} {% endif %} - - {% include js-selector.html lang=lang %} + + + {% for _include in layout.script_includes %} + {% assign _include_path = _include | append: '.html' %} + {% include {{ _include_path }} %} + {% endfor %} {% include_cached search-loader.html lang=lang %} diff --git a/_layouts/post.html b/_layouts/post.html index 6a2deff7..c8c21ef7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -6,7 +6,8 @@ tail_includes: - related-posts - post-nav - - comments +script_includes: + - comment --- {% include lang.html %} diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index b66e906c..891479e6 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -532,6 +532,7 @@ header { .utterances { max-width: 100%; + min-height: 269px; } %btn-share-hover { diff --git a/package.json b/package.json index f93e76b3..34477845 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "devDependencies": { "@babel/core": "^7.25.2", "@babel/plugin-transform-class-properties": "^7.25.4", + "@babel/plugin-transform-private-methods": "^7.25.7", "@babel/preset-env": "^7.25.4", "@commitlint/cli": "^19.5.0", "@commitlint/config-conventional": "^19.5.0", diff --git a/rollup.config.js b/rollup.config.js index 19ba4da0..3a1ae29a 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -34,24 +34,32 @@ function insertFrontmatter() { }; } -function build(filename, { src = SRC_DEFAULT, jekyll = false } = {}) { +function build( + filename, + { src = SRC_DEFAULT, jekyll = false, outputName = null } = {} +) { + const input = `${src}/${filename}.js`; + return { - input: `${src}/${filename}.js`, + input, output: { file: `${DIST}/${filename}.min.js`, format: 'iife', - name: 'Chirpy', + ...(outputName !== null && { name: outputName }), banner, sourcemap: !isProd && !jekyll }, watch: { - include: `${src}/**` + include: input }, plugins: [ babel({ babelHelpers: 'bundled', presets: ['@babel/env'], - plugins: ['@babel/plugin-transform-class-properties'] + plugins: [ + '@babel/plugin-transform-class-properties', + '@babel/plugin-transform-private-methods' + ] }), nodeResolve(), isProd && terser(), @@ -69,6 +77,7 @@ export default [ build('page'), build('post'), build('misc'), + build('theme', { src: `${SRC_DEFAULT}/modules`, outputName: 'Theme' }), build('app', { src: SRC_PWA, jekyll: true }), build('sw', { src: SRC_PWA, jekyll: true }) ]; From c69914effc1f222d2b31d2ed14d1efda90575c9f Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 24 Nov 2024 02:08:13 +0800 Subject: [PATCH 071/177] ci: avoid repeated runs of stylelint (#2057) --- .github/workflows/style-lint.yml | 25 ----------------------- .stylelintrc.json | 30 +++++++++++++++++++++++++++ package.json | 35 -------------------------------- 3 files changed, 30 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/style-lint.yml create mode 100644 .stylelintrc.json diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml deleted file mode 100644 index 5cb38a7a..00000000 --- a/.github/workflows/style-lint.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Style Lint - -on: - push: - branches: - - master - - "hotfix/*" - paths: ["_sass/**/*.scss"] - pull_request: - paths: ["_sass/**/*.scss"] - -jobs: - stylelint: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: lts/* - - run: npm i - - run: npm test diff --git a/.stylelintrc.json b/.stylelintrc.json new file mode 100644 index 00000000..57dd7d6e --- /dev/null +++ b/.stylelintrc.json @@ -0,0 +1,30 @@ +{ + "extends": "stylelint-config-standard-scss", + "rules": { + "no-descending-specificity": null, + "shorthand-property-no-redundant-values": null, + "at-rule-no-vendor-prefix": null, + "property-no-vendor-prefix": null, + "selector-no-vendor-prefix": null, + "value-no-vendor-prefix": null, + "color-function-notation": "legacy", + "alpha-value-notation": "number", + "selector-not-notation": "simple", + "color-hex-length": "long", + "declaration-block-single-line-max-declarations": 3, + "scss/operator-no-newline-after": null, + "rule-empty-line-before": [ + "always", + { + "ignore": ["after-comment", "first-nested"] + } + ], + "value-keyword-case": [ + "lower", + { + "ignoreProperties": ["/^\\$/"] + } + ], + "media-feature-range-notation": "prefix" + } +} diff --git a/package.json b/package.json index 34477845..d6beea03 100644 --- a/package.json +++ b/package.json @@ -68,41 +68,6 @@ ] } }, - "stylelint": { - "extends": "stylelint-config-standard-scss", - "rules": { - "no-descending-specificity": null, - "shorthand-property-no-redundant-values": null, - "at-rule-no-vendor-prefix": null, - "property-no-vendor-prefix": null, - "selector-no-vendor-prefix": null, - "value-no-vendor-prefix": null, - "color-function-notation": "legacy", - "alpha-value-notation": "number", - "selector-not-notation": "simple", - "color-hex-length": "long", - "declaration-block-single-line-max-declarations": 3, - "scss/operator-no-newline-after": null, - "rule-empty-line-before": [ - "always", - { - "ignore": [ - "after-comment", - "first-nested" - ] - } - ], - "value-keyword-case": [ - "lower", - { - "ignoreProperties": [ - "/^\\$/" - ] - } - ], - "media-feature-range-notation": "prefix" - } - }, "release": { "branches": [ "production" From 35c794cf5896565430389f35c660b88a93cebb17 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 25 Nov 2024 00:05:28 +0800 Subject: [PATCH 072/177] perf: modular sass architecture (#2052) - Modularized the Sass architecture to enhance code maintainability and reduce the output file size - Replaced deprecated `@import` with `@use` / `@forward` --- .gitignore | 2 +- .stylelintrc.json | 1 + _includes/head.html | 2 +- _posts/2019-08-09-getting-started.md | 2 - _sass/abstracts/_breakpoints.scss | 73 + _sass/abstracts/_index.scss | 4 + _sass/abstracts/_mixins.scss | 80 + .../_placeholders.scss} | 83 +- .../_variables.scss} | 4 - _sass/addon/commons.scss | 1526 ----------------- _sass/base/_base.scss | 476 +++++ _sass/base/_index.scss | 4 + _sass/base/_reset.scss | 41 + .../{addon/syntax.scss => base/_syntax.scss} | 131 +- _sass/base/_typography.scss | 266 +++ _sass/colors/syntax-dark.scss | 164 -- _sass/colors/syntax-light.scss | 210 --- _sass/colors/typography-light.scss | 112 -- _sass/components/_buttons.scss | 51 + _sass/components/_index.scss | 2 + _sass/components/_popups.scss | 172 ++ _sass/layout/_footer.scss | 36 + _sass/layout/_index.scss | 4 + _sass/layout/_panel.scss | 66 + _sass/layout/_sidebar.scss | 258 +++ _sass/layout/_topbar.scss | 86 + _sass/main.bundle.scss | 4 +- _sass/main.scss | 17 +- .../archives.scss => pages/_archives.scss} | 23 +- .../_categories.scss} | 11 +- .../_category-tag.scss} | 29 +- _sass/{layout/home.scss => pages/_home.scss} | 119 +- _sass/pages/_index.scss | 7 + _sass/{layout/post.scss => pages/_post.scss} | 219 +-- _sass/pages/_search.scss | 184 ++ _sass/{layout/tags.scss => pages/_tags.scss} | 10 +- .../_dark.scss} | 168 +- _sass/themes/_light.scss | 313 ++++ _sass/variables-hook.scss | 3 - assets/css/jekyll-theme-chirpy.scss | 2 +- package.json | 2 +- purgecss.config.js | 23 - purgecss.js | 30 + tools/init.sh | 3 +- tools/release.sh | 2 +- 45 files changed, 2523 insertions(+), 2502 deletions(-) create mode 100644 _sass/abstracts/_breakpoints.scss create mode 100644 _sass/abstracts/_index.scss create mode 100644 _sass/abstracts/_mixins.scss rename _sass/{addon/module.scss => abstracts/_placeholders.scss} (59%) rename _sass/{addon/variables.scss => abstracts/_variables.scss} (96%) delete mode 100644 _sass/addon/commons.scss create mode 100644 _sass/base/_base.scss create mode 100644 _sass/base/_index.scss create mode 100644 _sass/base/_reset.scss rename _sass/{addon/syntax.scss => base/_syntax.scss} (74%) create mode 100644 _sass/base/_typography.scss delete mode 100644 _sass/colors/syntax-dark.scss delete mode 100644 _sass/colors/syntax-light.scss delete mode 100644 _sass/colors/typography-light.scss create mode 100644 _sass/components/_buttons.scss create mode 100644 _sass/components/_index.scss create mode 100644 _sass/components/_popups.scss create mode 100644 _sass/layout/_footer.scss create mode 100644 _sass/layout/_index.scss create mode 100644 _sass/layout/_panel.scss create mode 100644 _sass/layout/_sidebar.scss create mode 100644 _sass/layout/_topbar.scss rename _sass/{layout/archives.scss => pages/_archives.scss} (95%) rename _sass/{layout/categories.scss => pages/_categories.scss} (87%) rename _sass/{layout/category-tag.scss => pages/_category-tag.scss} (79%) rename _sass/{layout/home.scss => pages/_home.scss} (73%) create mode 100644 _sass/pages/_index.scss rename _sass/{layout/post.scss => pages/_post.scss} (67%) create mode 100644 _sass/pages/_search.scss rename _sass/{layout/tags.scss => pages/_tags.scss} (71%) rename _sass/{colors/typography-dark.scss => themes/_dark.scss} (62%) create mode 100644 _sass/themes/_light.scss delete mode 100644 _sass/variables-hook.scss delete mode 100644 purgecss.config.js create mode 100644 purgecss.js diff --git a/.gitignore b/.gitignore index 0082d900..7dd7cefd 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,5 @@ package-lock.json !.vscode/tasks.json # Misc -_sass/dist +_sass/vendors assets/js/dist diff --git a/.stylelintrc.json b/.stylelintrc.json index 57dd7d6e..b8902909 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -1,4 +1,5 @@ { + "ignoreFiles": ["_sass/vendors/**"], "extends": "stylelint-config-standard-scss", "rules": { "no-descending-specificity": null, diff --git a/_includes/head.html b/_includes/head.html index 310f52eb..011187c9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -70,7 +70,7 @@ {% unless jekyll.environment == 'production' %} - + {% endunless %} diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 3b41a3ca..26811269 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -93,8 +93,6 @@ Social contact options are displayed at the bottom of the sidebar. You can enabl To customize the stylesheet, copy the theme's `assets/css/jekyll-theme-chirpy.scss`{: .filepath} file to the same path in your Jekyll site, and add your custom styles at the end of the file. -Starting with version `6.2.0`, if you want to overwrite the SASS variables defined in `_sass/addon/variables.scss`{: .filepath}, copy the main SASS file `_sass/main.scss`{: .filepath} to the `_sass`{: .filepath} directory in your site's source, then create a new file `_sass/variables-hook.scss`{: .filepath} and assign your new values there. - ### Customizing Static Assets Static assets configuration was introduced in version `5.1.0`. The CDN of the static assets is defined in `_data/origin/cors.yml`{: .filepath }. You can replace some of them based on the network conditions in the region where your website is published. diff --git a/_sass/abstracts/_breakpoints.scss b/_sass/abstracts/_breakpoints.scss new file mode 100644 index 00000000..e40cefee --- /dev/null +++ b/_sass/abstracts/_breakpoints.scss @@ -0,0 +1,73 @@ +@use 'sass:map'; + +$-breakpoints: ( + // 1 column + sm: 576px, + md: 768px, + // 2 columns + lg: 850px, + // 3 columns + xl: 1200px, + xxl: 1400px, + xxxl: 1650px +); + +@function get($breakpoint) { + @return map.get($-breakpoints, $breakpoint); +} + +/* Less than the given width */ +@mixin lt($width) { + @media all and (max-width: calc(#{$width} - 1px)) { + @content; + } +} + +/* Less than or equal to the given width */ +@mixin lte($width) { + @media all and (max-width: $width) { + @content; + } +} + +@mixin sm { + @media all and (min-width: get(sm)) { + @content; + } +} + +@mixin md { + @media all and (min-width: get(md)) { + @content; + } +} + +@mixin lg { + @media all and (min-width: get(lg)) { + @content; + } +} + +@mixin xl { + @media all and (min-width: get(xl)) { + @content; + } +} + +@mixin xxl { + @media all and (min-width: get(xxl)) { + @content; + } +} + +@mixin xxxl { + @media all and (min-width: get(xxxl)) { + @content; + } +} + +@mixin between($min, $max) { + @media all and (min-width: $min) and (max-width: $max) { + @content; + } +} diff --git a/_sass/abstracts/_index.scss b/_sass/abstracts/_index.scss new file mode 100644 index 00000000..6c9e21cf --- /dev/null +++ b/_sass/abstracts/_index.scss @@ -0,0 +1,4 @@ +@forward 'variables'; +@forward 'mixins'; +@forward 'placeholders'; +@forward 'breakpoints'; diff --git a/_sass/abstracts/_mixins.scss b/_sass/abstracts/_mixins.scss new file mode 100644 index 00000000..c5eeee3c --- /dev/null +++ b/_sass/abstracts/_mixins.scss @@ -0,0 +1,80 @@ +@mixin text-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +@mixin mt-mb($value) { + margin-top: $value; + margin-bottom: $value; +} + +@mixin ml-mr($value) { + margin-left: $value; + margin-right: $value; +} + +@mixin pt-pb($val) { + padding-top: $val; + padding-bottom: $val; +} + +@mixin pl-pr($val, $important: false) { + @if $important { + padding-left: $val !important; + padding-right: $val !important; + } @else { + padding-left: $val; + padding-right: $val; + } +} + +@mixin placeholder { + color: var(--text-muted-color) !important; +} + +@mixin placeholder-focus { + opacity: 0.6; +} + +@mixin label($font-size: 1rem, $font-weight: 600, $color: var(--label-color)) { + color: $color; + font-size: $font-size; + font-weight: $font-weight; +} + +@mixin align-center { + position: relative; + left: 50%; + transform: translateX(-50%); +} + +@mixin prompt($type, $fa-content, $fa-style: 'solid', $rotate: 0) { + &.prompt-#{$type} { + background-color: var(--prompt-#{$type}-bg); + + &::before { + content: $fa-content; + color: var(--prompt-#{$type}-icon-color); + font: var(--fa-font-#{$fa-style}); + + @if $rotate != 0 { + transform: rotate(#{$rotate}deg); + } + } + } +} + +@mixin slide($append: null) { + $basic: transform 0.4s ease; + + @if $append { + transition: $basic, $append; + } @else { + transition: $basic; + } +} + +@mixin max-w-100 { + max-width: 100%; +} diff --git a/_sass/addon/module.scss b/_sass/abstracts/_placeholders.scss similarity index 59% rename from _sass/addon/module.scss rename to _sass/abstracts/_placeholders.scss index 1dfb735f..e4c1bb06 100644 --- a/_sass/addon/module.scss +++ b/_sass/abstracts/_placeholders.scss @@ -1,13 +1,10 @@ -/* -* Mainly scss modules, only imported to `assets/css/main.scss` -*/ - -/* ---------- scss placeholder --------- */ +@use 'variables' as v; +@use 'mixins' as mx; %heading { color: var(--heading-color); font-weight: 400; - font-family: $font-family-heading; + font-family: v.$font-family-heading; scroll-margin-top: 3.5rem; } @@ -82,7 +79,7 @@ } %rounded { - border-radius: $radius-lg; + border-radius: v.$radius-lg; } %img-caption { @@ -112,14 +109,8 @@ -webkit-box-orient: vertical; } -@mixin text-ellipsis { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - %text-ellipsis { - @include text-ellipsis; + @include mx.text-ellipsis; } %text-highlight { @@ -151,65 +142,15 @@ } } -/* ---------- scss mixin --------- */ - -@mixin mt-mb($value) { - margin-top: $value; - margin-bottom: $value; +%code-snippet-bg { + background-color: var(--highlight-bg-color); } -@mixin ml-mr($value) { - margin-left: $value; - margin-right: $value; +%code-snippet-padding { + padding-left: 1rem; + padding-right: 1.5rem; } -@mixin pt-pb($val) { - padding-top: $val; - padding-bottom: $val; -} - -@mixin pl-pr($val, $important: false) { - @if $important { - padding-left: $val !important; - padding-right: $val !important; - } @else { - padding-left: $val; - padding-right: $val; - } -} - -@mixin placeholder { - color: var(--text-muted-color) !important; -} - -@mixin placeholder-focus { - opacity: 0.6; -} - -@mixin label($font-size: 1rem, $font-weight: 600, $color: var(--label-color)) { - color: $color; - font-size: $font-size; - font-weight: $font-weight; -} - -@mixin align-center { - position: relative; - left: 50%; - transform: translateX(-50%); -} - -@mixin prompt($type, $fa-content, $fa-style: 'solid', $rotate: 0) { - &.prompt-#{$type} { - background-color: var(--prompt-#{$type}-bg); - - &::before { - content: $fa-content; - color: var(--prompt-#{$type}-icon-color); - font: var(--fa-font-#{$fa-style}); - - @if $rotate != 0 { - transform: rotate(#{$rotate}deg); - } - } - } +%max-w-100 { + max-width: 100%; } diff --git a/_sass/addon/variables.scss b/_sass/abstracts/_variables.scss similarity index 96% rename from _sass/addon/variables.scss rename to _sass/abstracts/_variables.scss index 1d51cb14..0194e40b 100644 --- a/_sass/addon/variables.scss +++ b/_sass/abstracts/_variables.scss @@ -1,7 +1,3 @@ -/* - * The SCSS variables - */ - /* sidebar */ $sidebar-width: 260px !default; /* the basic width */ diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss deleted file mode 100644 index 5e8aceaa..00000000 --- a/_sass/addon/commons.scss +++ /dev/null @@ -1,1526 +0,0 @@ -/* The common styles */ - -html { - font-size: 16px; - - @media (prefers-color-scheme: light) { - &:not([data-mode]), - &[data-mode='light'] { - @include light-scheme; - } - - &[data-mode='dark'] { - @include dark-scheme; - } - } - - @media (prefers-color-scheme: dark) { - &:not([data-mode]), - &[data-mode='dark'] { - @include dark-scheme; - } - - &[data-mode='light'] { - @include light-scheme; - } - } -} - -body { - background: var(--main-bg); - padding: env(safe-area-inset-top) env(safe-area-inset-right) - env(safe-area-inset-bottom) env(safe-area-inset-left); - color: var(--text-color); - -webkit-font-smoothing: antialiased; - font-family: $font-family-base; -} - -/* --- Typography --- */ - -@for $i from 1 through 5 { - h#{$i} { - @extend %heading; - - @if $i > 1 { - @extend %anchor; - } - - @if $i < 5 { - $size-factor: 0.25rem; - - @if $i > 1 { - $size-factor: 0.18rem; - - main & { - @if $i == 2 { - margin: 2.5rem 0 1.25rem; - } @else { - margin: 2rem 0 1rem; - } - } - } - - & { - font-size: 1rem + (5 - $i) * $size-factor; - } - } @else { - font-size: 1.05rem; - } - } -} - -a { - @extend %link-color; - - text-decoration: none; -} - -img { - max-width: 100%; - height: auto; - transition: all 0.35s ease-in-out; - - .blur & { - $blur: 20px; - - -webkit-filter: blur($blur); - filter: blur($blur); - } -} - -blockquote { - border-left: 0.125rem solid var(--blockquote-border-color); - padding-left: 1rem; - color: var(--blockquote-text-color); - margin-top: 0.5rem; - - > p:last-child { - margin-bottom: 0; - } - - &[class^='prompt-'] { - border-left: 0; - position: relative; - padding: 1rem 1rem 1rem 3rem; - color: var(--prompt-text-color); - - @extend %rounded; - - &::before { - text-align: center; - width: 3rem; - position: absolute; - left: 0.25rem; - margin-top: 0.4rem; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - } - } - - @include prompt('tip', '\f0eb', $fa-style: 'regular'); - @include prompt('info', '\f06a', $rotate: 180); - @include prompt('warning', '\f06a'); - @include prompt('danger', '\f071'); -} - -kbd { - font-family: Lato, sans-serif; - display: inline-block; - vertical-align: middle; - line-height: 1.3rem; - min-width: 1.75rem; - text-align: center; - margin: 0 0.3rem; - padding-top: 0.1rem; - color: var(--kbd-text-color); - background-color: var(--kbd-bg-color); - border-radius: $radius-sm; - border: solid 1px var(--kbd-wrap-color); - box-shadow: inset 0 -2px 0 var(--kbd-wrap-color); -} - -hr { - border-color: var(--main-border-color); - opacity: 1; -} - -footer { - background-color: var(--main-bg); - height: $footer-height; - border-top: 1px solid var(--main-border-color); - - @extend %text-xs; - - a { - @extend %text-highlight; - - &:hover { - @extend %link-hover; - } - } - - em { - @extend %text-highlight; - } - - p { - text-align: center; - margin-bottom: 0; - } -} - -/* fontawesome icons */ -i { - &.far, - &.fas { - @extend %no-cursor; - } -} - -/* --- Panels --- */ - -.access { - top: 2rem; - transition: top 0.2s ease-in-out; - margin-top: 3rem; - margin-bottom: 4rem; - - &:only-child { - position: -webkit-sticky; - position: sticky; - } - - > section { - padding-left: 1rem; - border-left: 1px solid var(--main-border-color); - - &:not(:last-child) { - margin-bottom: 4rem; - } - } - - .content { - font-size: 0.9rem; - } -} - -#panel-wrapper { - /* the headings */ - .panel-heading { - font-family: inherit; - line-height: inherit; - - @include label(inherit); - } - - .post-tag { - line-height: 1.05rem; - font-size: 0.85rem; - border-radius: 0.8rem; - padding: 0.3rem 0.5rem; - margin: 0 0.35rem 0.5rem 0; - - &:hover { - transition: all 0.3s ease-in; - } - } -} - -#access-lastmod { - a { - color: inherit; - - &:hover { - @extend %link-hover; - } - - @extend %no-bottom-border; - } -} - -.footnotes > ol { - padding-left: 2rem; - margin-top: 0.5rem; - - > li { - &:not(:last-child) { - margin-bottom: 0.3rem; - } - - @extend %sup-fn-target; - - > p { - margin-left: 0.25em; - - @include mt-mb(0); - } - } -} - -.footnote { - @at-root a#{&} { - @include ml-mr(1px); - @include pl-pr(2px); - - border-bottom-style: none !important; - } -} - -sup { - @extend %sup-fn-target; -} - -.reversefootnote { - @at-root a#{&} { - font-size: 0.6rem; - line-height: 1; - position: relative; - bottom: 0.25em; - margin-left: 0.25em; - border-bottom-style: none !important; - } -} - -/* --- Begin of Markdown table style --- */ - -/* it will be created by Liquid */ -.table-wrapper { - overflow-x: auto; - margin-bottom: 1.5rem; - - > table { - min-width: 100%; - overflow-x: auto; - border-spacing: 0; - - thead { - border-bottom: solid 2px rgba(210, 215, 217, 0.75); - - th { - @extend %table-cell; - } - } - - tbody { - tr { - border-bottom: 1px solid var(--tb-border-color); - - &:nth-child(2n) { - background-color: var(--tb-even-bg); - } - - &:nth-child(2n + 1) { - background-color: var(--tb-odd-bg); - } - - td { - @extend %table-cell; - } - } - } /* tbody */ - } /* table */ -} - -/* --- post --- */ - -.preview-img { - aspect-ratio: 40 / 21; - width: 100%; - height: 100%; - overflow: hidden; - - @extend %rounded; - - &:not(.no-bg) { - background: var(--img-bg); - } - - img { - height: 100%; - -o-object-fit: cover; - object-fit: cover; - - @extend %rounded; - - @at-root #post-list & { - width: 100%; - } - } -} - -.post-preview { - @extend %rounded; - - border: 0; - background: var(--card-bg); - box-shadow: var(--card-shadow); - - &::before { - @extend %rounded; - - content: ''; - width: 100%; - height: 100%; - position: absolute; - background-color: var(--card-hovor-bg); - opacity: 0; - transition: opacity 0.35s ease-in-out; - } - - &:hover { - &::before { - opacity: 0.3; - } - } -} - -main { - line-height: 1.75; - - h1 { - margin-top: 2rem; - } - - p { - > a.popup { - &:not(.normal):not(.left):not(.right) { - @include align-center; - } - } - } - - .categories, - #tags, - #archives { - a:not(:hover) { - @extend %no-bottom-border; - } - } -} - -.post-meta { - @extend %text-sm; - - a { - &:not([class]):hover { - @extend %link-hover; - } - } - - em { - @extend %normal-font-style; - } -} - -.content { - font-size: 1.08rem; - margin-top: 2rem; - overflow-wrap: break-word; - - a { - &.popup { - @extend %no-cursor; - @extend %img-caption; - @include mt-mb(0.5rem); - - cursor: zoom-in; - } - - &:not(.img-link) { - @extend %link-underline; - - &:hover { - @extend %link-hover; - } - } - } - - ol, - ul { - &:not([class]), - &.task-list { - -webkit-padding-start: 1.75rem; - padding-inline-start: 1.75rem; - - li { - margin: 0.25rem 0; - padding-left: 0.25rem; - } - - ol, - ul { - -webkit-padding-start: 1.25rem; - padding-inline-start: 1.25rem; - margin: 0.5rem 0; - } - } - } - - ul.task-list { - -webkit-padding-start: 1.25rem; - padding-inline-start: 1.25rem; - - li { - list-style-type: none; - padding-left: 0; - - /* checkbox icon */ - > i { - width: 2rem; - margin-left: -1.25rem; - color: var(--checkbox-color); - - &.checked { - color: var(--checkbox-checked-color); - } - } - - ul { - -webkit-padding-start: 1.75rem; - padding-inline-start: 1.75rem; - } - } - - input[type='checkbox'] { - margin: 0 0.5rem 0.2rem -1.3rem; - vertical-align: middle; - } - } /* ul */ - - dl > dd { - margin-left: 1rem; - } - - ::marker { - color: var(--text-muted-color); - } -} /* .content */ - -.tag:hover { - @extend %tag-hover; -} - -.post-tag { - display: inline-block; - min-width: 2rem; - text-align: center; - border-radius: 0.5rem; - border: 1px solid var(--btn-border-color); - padding: 0 0.4rem; - color: var(--text-muted-color); - line-height: 1.3rem; - - &:not(:last-child) { - margin-right: 0.2rem; - } -} - -.rounded-10 { - border-radius: 10px !important; -} - -.img-link { - color: transparent; - display: inline-flex; -} - -.shimmer { - overflow: hidden; - position: relative; - background: var(--img-bg); - - &::before { - content: ''; - position: absolute; - background: var(--shimmer-bg); - height: 100%; - width: 100%; - -webkit-animation: shimmer 1.3s infinite; - animation: shimmer 1.3s infinite; - } - - @-webkit-keyframes shimmer { - 0% { - transform: translateX(-100%); - } - - 100% { - transform: translateX(100%); - } - } - - @keyframes shimmer { - 0% { - transform: translateX(-100%); - } - - 100% { - transform: translateX(100%); - } - } -} - -.embed-video { - width: 100%; - height: 100%; - margin-bottom: 1rem; - aspect-ratio: 16 / 9; - - @extend %rounded; - - &.twitch { - aspect-ratio: 310 / 189; - } - - &.file { - display: block; - width: auto; - height: auto; - max-width: 100%; - max-height: 100%; - margin: auto; - margin-bottom: 0; - } - - @extend %img-caption; -} - -.embed-audio { - width: 100%; - display: block; - - @extend %img-caption; -} - -/* --- buttons --- */ -.btn-lang { - border: 1px solid !important; - padding: 1px 3px; - border-radius: 3px; - color: var(--link-color); - - &:focus { - box-shadow: none; - } -} - -/* --- Effects classes --- */ - -.flex-grow-1 { - flex-grow: 1 !important; -} - -.btn-box-shadow { - box-shadow: var(--card-shadow); -} - -/* overwrite bootstrap muted */ -.text-muted { - color: var(--text-muted-color) !important; -} - -/* Overwrite bootstrap tooltip */ -.tooltip-inner { - font-size: 0.7rem; - max-width: 220px; - text-align: left; -} - -/* Overwrite bootstrap outline button */ -.btn.btn-outline-primary { - &:not(.disabled):hover { - border-color: #007bff !important; - } -} - -.disabled { - color: rgb(206, 196, 196); - pointer-events: auto; - cursor: not-allowed; -} - -.hide-border-bottom { - border-bottom: none !important; -} - -.input-focus { - box-shadow: none; - border-color: var(--input-focus-border-color) !important; - background: center !important; - transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out; -} - -.left { - float: left; - margin: 0.75rem 1rem 1rem 0; -} - -.right { - float: right; - margin: 0.75rem 0 1rem 1rem; -} - -/* --- Overriding --- */ - -/* mermaid */ -.mermaid { - text-align: center; -} - -/* MathJax */ -mjx-container { - overflow-y: hidden; - min-width: auto !important; -} - -/* --- sidebar layout --- */ - -$sidebar-display: 'sidebar-display'; -$btn-border-width: 3px; -$btn-mb: 0.5rem; - -#sidebar { - @include pl-pr(0); - - position: fixed; - top: 0; - left: 0; - height: 100%; - overflow-y: auto; - width: $sidebar-width; - background: var(--sidebar-bg); - border-right: 1px solid var(--sidebar-border-color); - - /* Hide scrollbar for IE, Edge and Firefox */ - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - - /* Hide scrollbar for Chrome, Safari and Opera */ - &::-webkit-scrollbar { - display: none; - } - - %sidebar-link-hover { - &:hover { - color: var(--sidebar-active-color); - } - } - - a { - @extend %sidebar-links; - } - - #avatar { - display: block; - width: 7rem; - height: 7rem; - overflow: hidden; - box-shadow: var(--avatar-border-color) 0 0 0 2px; - transform: translateZ(0); /* fixed the zoom in Safari */ - - img { - transition: transform 0.5s; - - &:hover { - transform: scale(1.2); - } - } - } - - .profile-wrapper { - @include mt-mb(2.5rem); - @extend %clickable-transition; - - padding-left: 2.5rem; - padding-right: 1.25rem; - width: 100%; - } - - .site-title { - @extend %clickable-transition; - @extend %sidebar-link-hover; - - font-family: inherit; - font-weight: 900; - font-size: 1.75rem; - line-height: 1.2; - letter-spacing: 0.25px; - margin-top: 1.25rem; - margin-bottom: 0.5rem; - width: fit-content; - color: var(--site-title-color); - } - - .site-subtitle { - font-size: 95%; - color: var(--site-subtitle-color); - margin-top: 0.25rem; - word-spacing: 1px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - } - - ul { - margin-bottom: 2rem; - - li.nav-item { - opacity: 0.9; - width: 100%; - - @include pl-pr(1.5rem); - - a.nav-link { - @include pt-pb(0.6rem); - - display: flex; - align-items: center; - border-radius: 0.75rem; - font-weight: 600; - - &:hover { - background-color: var(--sidebar-hover-bg); - } - - i { - font-size: 95%; - opacity: 0.8; - margin-right: 1.5rem; - } - - span { - font-size: 90%; - letter-spacing: 0.2px; - } - } - - &.active { - .nav-link { - color: var(--sidebar-active-color); - background-color: var(--sidebar-hover-bg); - - span { - opacity: 1; - } - } - } - - &:not(:first-child) { - margin-top: 0.25rem; - } - } - } - - .sidebar-bottom { - padding-left: 2rem; - padding-right: 1rem; - margin-bottom: 1.5rem; - - $btn-size: 1.75rem; - - %button { - width: $btn-size; - height: $btn-size; - margin-bottom: $btn-mb; // multi line gap - border-radius: 50%; - color: var(--sidebar-btn-color); - background-color: var(--sidebar-btn-bg); - text-align: center; - display: flex; - align-items: center; - justify-content: center; - - &:not(:focus-visible) { - box-shadow: var(--sidebar-border-color) 0 0 0 1px; - } - - &:hover { - background-color: var(--sidebar-hover-bg); - } - } - - a { - @extend %button; - @extend %sidebar-link-hover; - @extend %clickable-transition; - - &:not(:last-child) { - margin-right: $sb-btn-gap; - } - } - - i { - line-height: $btn-size; - } - - #mode-toggle { - @extend %button; - @extend %sidebar-links; - @extend %sidebar-link-hover; - } - - .icon-border { - @extend %no-cursor; - @include ml-mr(calc(($sb-btn-gap - $btn-border-width) / 2)); - - background-color: var(--sidebar-btn-color); - content: ''; - width: $btn-border-width; - height: $btn-border-width; - border-radius: 50%; - margin-bottom: $btn-mb; - } - } /* .sidebar-bottom */ -} /* #sidebar */ - -@media (hover: hover) { - #sidebar ul > li:last-child::after { - transition: top 0.5s ease; - } - - .nav-link { - transition: background-color 0.3s ease-in-out; - } - - .post-preview { - transition: background-color 0.35s ease-in-out; - } -} - -#search-result-wrapper { - display: none; - height: 100%; - width: 100%; - overflow: auto; - - .content { - margin-top: 2rem; - } -} - -/* --- top-bar --- */ - -#topbar-wrapper { - height: $topbar-height; - background-color: var(--topbar-bg); -} - -#topbar { - @extend %btn-color; - - #breadcrumb { - font-size: 1rem; - color: var(--text-muted-color); - padding-left: 0.5rem; - - a:hover { - @extend %link-hover; - } - - span { - &:not(:last-child) { - &::after { - content: '›'; - padding: 0 0.3rem; - } - } - } - } -} /* #topbar */ - -::-webkit-input-placeholder { - @include placeholder; -} - -::-moz-placeholder { - @include placeholder; -} - -:-ms-input-placeholder { - @include placeholder; -} - -::-ms-input-placeholder { - @include placeholder; -} - -::placeholder { - @include placeholder; -} - -:focus::-webkit-input-placeholder { - @include placeholder-focus; -} - -:focus::-moz-placeholder { - @include placeholder-focus; -} - -:focus:-ms-input-placeholder { - @include placeholder-focus; -} - -:focus::-ms-input-placeholder { - @include placeholder-focus; -} - -:focus::placeholder { - @include placeholder-focus; -} - -search { - display: flex; - width: 100%; - border-radius: 1rem; - border: 1px solid var(--search-border-color); - background: var(--main-bg); - padding: 0 0.5rem; - - i { - z-index: 2; - font-size: 0.9rem; - color: var(--search-icon-color); - } -} - -#sidebar-trigger, -#search-trigger { - display: none; -} - -/* 'Cancel' link */ -#search-cancel { - color: var(--link-color); - display: none; - white-space: nowrap; - - @extend %cursor-pointer; -} - -#search-input { - background: center; - border: 0; - border-radius: 0; - padding: 0.18rem 0.3rem; - color: var(--text-color); - height: auto; - - &:focus { - box-shadow: none; - } -} - -#search-hints { - padding: 0 1rem; - - h4 { - margin-bottom: 1.5rem; - } - - .post-tag { - display: inline-block; - line-height: 1rem; - font-size: 1rem; - background: var(--search-tag-bg); - border: none; - padding: 0.5rem; - margin: 0 1.25rem 1rem 0; - - &::before { - content: '#'; - color: var(--text-muted-color); - padding-right: 0.2rem; - } - - @extend %link-color; - } -} - -#search-results { - padding-bottom: 3rem; - - a { - font-size: 1.4rem; - line-height: 1.5rem; - - &:hover { - @extend %link-hover; - } - - @extend %link-color; - @extend %no-bottom-border; - @extend %heading; - } - - > article { - width: 100%; - - &:not(:last-child) { - margin-bottom: 1rem; - } - - /* icons */ - i { - color: #818182; - margin-right: 0.15rem; - font-size: 80%; - } - - > p { - @extend %text-ellipsis; - - white-space: break-spaces; - display: -webkit-box; - -webkit-line-clamp: 3; - -webkit-box-orient: vertical; - } - } -} /* #search-results */ - -#topbar-title { - display: none; - font-size: 1.1rem; - font-weight: 600; - font-family: sans-serif; - color: var(--topbar-text-color); - text-align: center; - width: 70%; - word-break: keep-all; -} - -#mask { - inset: 0 0 0 0; -} - -/* --- basic wrappers --- */ - -#main-wrapper { - position: relative; - - @include pl-pr(0); - - > .container { - min-height: 100vh; - } -} - -#topbar-wrapper.row, -#main-wrapper > .container > .row, -#search-result-wrapper > .row { - @include ml-mr(0); -} - -#tail-wrapper { - > :not(script) { - margin-top: 3rem; - } -} - -/* --- button back-to-top --- */ - -#back-to-top { - visibility: hidden; - opacity: 0; - z-index: 1; - cursor: pointer; - position: fixed; - right: 1rem; - bottom: calc($footer-height-large - $back2top-size / 2); - background: var(--button-bg); - color: var(--btn-backtotop-color); - padding: 0; - width: $back2top-size; - height: $back2top-size; - border-radius: 50%; - border: 1px solid var(--btn-backtotop-border-color); - transition: opacity 0.5s ease-in-out, transform 0.2s ease-out; - - &:hover { - transform: translate3d(0, -5px, 0); - -webkit-transform: translate3d(0, -5px, 0); - } - - i { - line-height: $back2top-size; - position: relative; - bottom: 2px; - } - - &.show { - opacity: 1; - visibility: visible; - } -} - -#notification { - @-webkit-keyframes popup { - from { - opacity: 0; - bottom: 0; - } - } - - @keyframes popup { - from { - opacity: 0; - bottom: 0; - } - } - - .toast-header { - background: none; - border-bottom: none; - color: inherit; - } - - .toast-body { - font-family: Lato, sans-serif; - line-height: 1.25rem; - - button { - font-size: 90%; - min-width: 4rem; - } - } - - &.toast { - &.show { - display: block; - min-width: 20rem; - border-radius: 0.5rem; - -webkit-backdrop-filter: blur(10px); - backdrop-filter: blur(10px); - background-color: rgba(255, 255, 255, 0.5); - color: #1b1b1eba; - position: fixed; - left: 50%; - bottom: 20%; - transform: translateX(-50%); - -webkit-animation: popup 0.8s; - animation: popup 0.8s; - } - } -} - -/* - Responsive Design: - - {sidebar, content, panel} >= 1200px screen width - {sidebar, content} >= 850px screen width - {content} <= 849px screen width - -*/ - -@media all and (max-width: 576px) { - main { - .content { - > blockquote[class^='prompt-'] { - @include ml-mr(-1rem); - - border-radius: 0; - max-width: none; - } - } - } - - #avatar { - width: 5rem; - height: 5rem; - } -} - -@media all and (max-width: 768px) { - %full-width { - max-width: 100%; - } - - #topbar { - @extend %full-width; - } - - #main-wrapper > .container { - @extend %full-width; - @include pl-pr(0); - } -} - -/* hide sidebar and panel */ -@media all and (max-width: 849px) { - @mixin slide($append: null) { - $basic: transform 0.4s ease; - - @if $append { - transition: $basic, $append; - } @else { - transition: $basic; - } - } - - footer { - @include slide; - - height: $footer-height-large; - padding: 1.5rem 0; - } - - [#{$sidebar-display}] { - #sidebar { - transform: translateX(0); - } - - #main-wrapper { - transform: translateX($sidebar-width); - } - - #back-to-top { - visibility: hidden; - } - } - - #sidebar { - @include slide; - - transform: translateX(-$sidebar-width); /* hide */ - -webkit-transform: translateX(-$sidebar-width); - } - - #main-wrapper { - @include slide; - } - - #topbar, - #main-wrapper > .container { - max-width: 100%; - } - - #search-result-wrapper { - width: 100%; - } - - #breadcrumb, - search { - display: none; - } - - #topbar-wrapper { - @include slide(top 0.2s ease); - - left: 0; - } - - main, - #panel-wrapper { - margin-top: 0; - } - - #topbar-title, - #sidebar-trigger, - #search-trigger { - display: block; - } - - #search-result-wrapper .content { - letter-spacing: 0; - } - - #tags { - justify-content: center !important; - } - - h1.dynamic-title { - display: none; - - ~ .content { - margin-top: 2.5rem; - } - } -} /* max-width: 849px */ - -/* Sidebar is visible */ -@media all and (min-width: 850px) { - /* Solved jumping scrollbar */ - html { - overflow-y: scroll; - } - - #main-wrapper { - margin-left: $sidebar-width; - } - - #sidebar { - .profile-wrapper { - margin-top: 3rem; - } - } - - #search-hints { - display: none; - } - - search { - max-width: $search-max-width; - } - - #search-result-wrapper { - max-width: $main-content-max-width; - justify-content: start !important; - } - - main { - h1 { - margin-top: 3rem; - } - } - - div.content .table-wrapper > table { - min-width: 70%; - } - - /* button 'back-to-Top' position */ - #back-to-top { - right: 5%; - bottom: calc($footer-height - $back2top-size / 2); - } - - #topbar-title { - text-align: left; - } -} - -/* Pad horizontal */ -@media all and (min-width: 992px) and (max-width: 1199px) { - #main-wrapper > .container .col-lg-11 { - flex: 0 0 96%; - max-width: 96%; - } -} - -/* Compact icons in sidebar & panel hidden */ -@media all and (min-width: 850px) and (max-width: 1199px) { - #search-results > div { - max-width: 700px; - } - - #breadcrumb { - width: 65%; - overflow: hidden; - text-overflow: ellipsis; - word-break: keep-all; - white-space: nowrap; - } -} - -/* panel hidden */ -@media all and (max-width: 1199px) { - #panel-wrapper { - display: none; - } - - #main-wrapper > .container > div.row { - justify-content: center !important; - } -} - -/* --- desktop mode, both sidebar and panel are visible --- */ - -@media all and (min-width: 1200px) { - search { - margin-right: 4rem; - } - - #search-input { - transition: all 0.3s ease-in-out; - } - - #search-results > article { - width: 45%; - - &:nth-child(odd) { - margin-right: 1.5rem; - } - - &:nth-child(even) { - margin-left: 1.5rem; - } - - &:last-child:nth-child(odd) { - position: relative; - right: 24.3%; - } - } - - .content { - font-size: 1.03rem; - } -} - -@media all and (min-width: 1400px) { - #back-to-top { - right: calc((100vw - $sidebar-width - 1140px) / 2 + 3rem); - } -} - -@media all and (min-width: 1650px) { - $icon-gap: 1rem; - - #main-wrapper { - margin-left: $sidebar-width-large; - } - - #topbar-wrapper { - left: $sidebar-width-large; - } - - search { - margin-right: calc( - $main-content-max-width / 4 - $search-max-width - 0.75rem - ); - } - - #main-wrapper > .container { - max-width: $main-content-max-width; - - @include pl-pr(1.75rem, true); - } - - main.col-12, - #tail-wrapper { - padding-right: 4.5rem !important; - } - - #back-to-top { - right: calc( - (100vw - $sidebar-width-large - $main-content-max-width) / 2 + 2rem - ); - } - - #sidebar { - width: $sidebar-width-large; - - .profile-wrapper { - margin-top: 3.5rem; - margin-bottom: 2.5rem; - padding-left: 3.5rem; - } - - ul { - li.nav-item { - @include pl-pr(2.75rem); - } - } - - .sidebar-bottom { - padding-left: 2.75rem; - margin-bottom: 1.75rem; - - a:not(:last-child) { - margin-right: $sb-btn-gap-lg; - } - - .icon-border { - @include ml-mr(calc(($sb-btn-gap-lg - $btn-border-width) / 2)); - } - } - } -} /* min-width: 1650px */ diff --git a/_sass/base/_base.scss b/_sass/base/_base.scss new file mode 100644 index 00000000..19f153bd --- /dev/null +++ b/_sass/base/_base.scss @@ -0,0 +1,476 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; +@use '../themes/light'; +@use '../themes/dark'; + +:root { + font-size: 16px; +} + +html { + @media (prefers-color-scheme: light) { + &:not([data-mode]), + &[data-mode='light'] { + @include light.styles; + } + + &[data-mode='dark'] { + @include dark.styles; + } + } + + @media (prefers-color-scheme: dark) { + &:not([data-mode]), + &[data-mode='dark'] { + @include dark.styles; + } + + &[data-mode='light'] { + @include light.styles; + } + } + + @include bp.lg { + overflow-y: scroll; + } +} + +body { + background: var(--main-bg); + padding: env(safe-area-inset-top) env(safe-area-inset-right) + env(safe-area-inset-bottom) env(safe-area-inset-left); + color: var(--text-color); + -webkit-font-smoothing: antialiased; + font-family: v.$font-family-base; +} + +h1.dynamic-title { + @include bp.lt(bp.get(lg)) { + display: none; + + ~ .content { + margin-top: 2.5rem; + } + } +} + +main { + &.col-12 { + @include bp.xxxl { + padding-right: 4.5rem !important; + } + } +} + +.preview-img { + aspect-ratio: 40 / 21; + width: 100%; + height: 100%; + overflow: hidden; + + @extend %rounded; + + &:not(.no-bg) { + background: var(--img-bg); + } + + img { + height: 100%; + -o-object-fit: cover; + object-fit: cover; + + @extend %rounded; + + @at-root #post-list & { + width: 100%; + } + } +} + +.post-preview { + @extend %rounded; + + border: 0; + background: var(--card-bg); + box-shadow: var(--card-shadow); + + &::before { + @extend %rounded; + + content: ''; + width: 100%; + height: 100%; + position: absolute; + background-color: var(--card-hovor-bg); + opacity: 0; + transition: opacity 0.35s ease-in-out; + } + + &:hover { + &::before { + opacity: 0.3; + } + } +} + +.post-meta { + @extend %text-sm; + + a { + &:not([class]):hover { + @extend %link-hover; + } + } + + em { + @extend %normal-font-style; + } +} + +.content { + font-size: 1.08rem; + margin-top: 2rem; + overflow-wrap: break-word; + + @include bp.xl { + font-size: 1.03rem; + } + + a { + &.popup { + @extend %no-cursor; + @extend %img-caption; + @include mx.mt-mb(0.5rem); + + cursor: zoom-in; + } + + &:not(.img-link) { + @extend %link-underline; + + &:hover { + @extend %link-hover; + } + } + } + + ol, + ul { + &:not([class]), + &.task-list { + -webkit-padding-start: 1.75rem; + padding-inline-start: 1.75rem; + + li { + margin: 0.25rem 0; + padding-left: 0.25rem; + } + + ol, + ul { + -webkit-padding-start: 1.25rem; + padding-inline-start: 1.25rem; + margin: 0.5rem 0; + } + } + } + + ul.task-list { + -webkit-padding-start: 1.25rem; + padding-inline-start: 1.25rem; + + li { + list-style-type: none; + padding-left: 0; + + /* checkbox icon */ + > i { + width: 2rem; + margin-left: -1.25rem; + color: var(--checkbox-color); + + &.checked { + color: var(--checkbox-checked-color); + } + } + + ul { + -webkit-padding-start: 1.75rem; + padding-inline-start: 1.75rem; + } + } + + input[type='checkbox'] { + margin: 0 0.5rem 0.2rem -1.3rem; + vertical-align: middle; + } + } /* ul */ + + dl > dd { + margin-left: 1rem; + } + + ::marker { + color: var(--text-muted-color); + } + + .table-wrapper > table { + @include bp.lg { + min-width: 70%; + } + } +} /* .content */ + +.tag:hover { + @extend %tag-hover; +} + +.post-tag { + display: inline-block; + min-width: 2rem; + text-align: center; + border-radius: 0.5rem; + border: 1px solid var(--btn-border-color); + padding: 0 0.4rem; + color: var(--text-muted-color); + line-height: 1.3rem; + + &:not(:last-child) { + margin-right: 0.2rem; + } +} + +.rounded-10 { + border-radius: 10px !important; +} + +.img-link { + color: transparent; + display: inline-flex; +} + +.shimmer { + overflow: hidden; + position: relative; + background: var(--img-bg); + + &::before { + content: ''; + position: absolute; + background: var(--shimmer-bg); + height: 100%; + width: 100%; + -webkit-animation: shimmer 1.3s infinite; + animation: shimmer 1.3s infinite; + } + + @-webkit-keyframes shimmer { + 0% { + transform: translateX(-100%); + } + + 100% { + transform: translateX(100%); + } + } + + @keyframes shimmer { + 0% { + transform: translateX(-100%); + } + + 100% { + transform: translateX(100%); + } + } +} + +.embed-video { + width: 100%; + height: 100%; + margin-bottom: 1rem; + aspect-ratio: 16 / 9; + + @extend %rounded; + + &.twitch { + aspect-ratio: 310 / 189; + } + + &.file { + display: block; + width: auto; + height: auto; + max-width: 100%; + max-height: 100%; + margin: auto; + margin-bottom: 0; + } + + @extend %img-caption; +} + +.embed-audio { + width: 100%; + display: block; + + @extend %img-caption; +} + +/* --- Effects classes --- */ + +.flex-grow-1 { + flex-grow: 1 !important; +} + +.btn-box-shadow { + box-shadow: var(--card-shadow); +} + +/* overwrite bootstrap muted */ +.text-muted { + color: var(--text-muted-color) !important; +} + +/* Overwrite bootstrap tooltip */ +.tooltip-inner { + font-size: 0.7rem; + max-width: 220px; + text-align: left; +} + +/* Overwrite bootstrap outline button */ +.btn.btn-outline-primary { + &:not(.disabled):hover { + border-color: #007bff !important; + } +} + +.disabled { + color: rgb(206, 196, 196); + pointer-events: auto; + cursor: not-allowed; +} + +.hide-border-bottom { + border-bottom: none !important; +} + +.input-focus { + box-shadow: none; + border-color: var(--input-focus-border-color) !important; + background: center !important; + transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out; +} + +.left { + float: left; + margin: 0.75rem 1rem 1rem 0; +} + +.right { + float: right; + margin: 0.75rem 0 1rem 1rem; +} + +/* --- Overriding --- */ + +/* mermaid */ +.mermaid { + text-align: center; +} + +/* MathJax */ +mjx-container { + overflow-y: hidden; + min-width: auto !important; +} + +@media (hover: hover) { + #sidebar ul > li:last-child::after { + transition: top 0.5s ease; + } + + .nav-link { + transition: background-color 0.3s ease-in-out; + } + + .post-preview { + transition: background-color 0.35s ease-in-out; + } +} + +#mask { + inset: 0 0 0 0; +} + +#main-wrapper { + position: relative; + + @include mx.pl-pr(0); + + @include bp.lt(bp.get(lg)) { + @include mx.slide; + } + + @include bp.lg { + margin-left: v.$sidebar-width; + } + + @include bp.xxxl { + margin-left: v.$sidebar-width-large; + } + + > .container { + min-height: 100vh; + + @include bp.lte(bp.get(md)) { + @include mx.max-w-100; + @include mx.pl-pr(0); + } + + @include bp.lt(bp.get(lg)) { + max-width: 100%; + } + + /* Pad horizontal */ + @include bp.between(992px, calc(#{bp.get(xl)} - 1px)) { + .col-lg-11 { + flex: 0 0 96%; + max-width: 96%; + } + } + + @include bp.lt(bp.get(xl)) { + > .row { + justify-content: center !important; + } + } + + @include bp.xxxl { + max-width: v.$main-content-max-width; + + @include mx.pl-pr(1.75rem, true); + } + } +} + +/* --- basic wrappers --- */ + +#topbar-wrapper.row, +#main-wrapper > .container > .row, +#search-result-wrapper > .row { + @include mx.ml-mr(0); +} + +#tail-wrapper { + @include bp.xxxl { + padding-right: 4.5rem !important; + } + + > :not(script) { + margin-top: 3rem; + } +} diff --git a/_sass/base/_index.scss b/_sass/base/_index.scss new file mode 100644 index 00000000..611d28ff --- /dev/null +++ b/_sass/base/_index.scss @@ -0,0 +1,4 @@ +@forward 'reset'; +@forward 'base'; +@forward 'typography'; +@forward 'syntax'; diff --git a/_sass/base/_reset.scss b/_sass/base/_reset.scss new file mode 100644 index 00000000..1e5a6294 --- /dev/null +++ b/_sass/base/_reset.scss @@ -0,0 +1,41 @@ +@use '../abstracts/mixins' as *; + +::-webkit-input-placeholder { + @include placeholder; +} + +::-moz-placeholder { + @include placeholder; +} + +:-ms-input-placeholder { + @include placeholder; +} + +::-ms-input-placeholder { + @include placeholder; +} + +::placeholder { + @include placeholder; +} + +:focus::-webkit-input-placeholder { + @include placeholder-focus; +} + +:focus::-moz-placeholder { + @include placeholder-focus; +} + +:focus:-ms-input-placeholder { + @include placeholder-focus; +} + +:focus::-ms-input-placeholder { + @include placeholder-focus; +} + +:focus::placeholder { + @include placeholder-focus; +} diff --git a/_sass/addon/syntax.scss b/_sass/base/_syntax.scss similarity index 74% rename from _sass/addon/syntax.scss rename to _sass/base/_syntax.scss index 6bd7b406..69924fc6 100644 --- a/_sass/addon/syntax.scss +++ b/_sass/base/_syntax.scss @@ -1,44 +1,7 @@ -/* -* The syntax highlight. -*/ - -@import 'colors/syntax-light'; -@import 'colors/syntax-dark'; - -html { - @media (prefers-color-scheme: light) { - &:not([data-mode]), - &[data-mode='light'] { - @include light-syntax; - } - - &[data-mode='dark'] { - @include dark-syntax; - } - } - - @media (prefers-color-scheme: dark) { - &:not([data-mode]), - &[data-mode='dark'] { - @include dark-syntax; - } - - &[data-mode='light'] { - @include light-syntax; - } - } -} - -/* -- code snippets -- */ - -%code-snippet-bg { - background-color: var(--highlight-bg-color); -} - -%code-snippet-padding { - padding-left: 1rem; - padding-right: 1.5rem; -} +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; .highlighter-rouge { color: var(--highlighter-rouge-color); @@ -59,7 +22,7 @@ html { pre { margin-bottom: 0; - font-size: $code-font-size; + font-size: v.$code-font-size; line-height: 1.4rem; word-wrap: normal; /* Fixed Safari overflow-x */ } @@ -101,10 +64,10 @@ code { color: var(--code-color); &.highlighter-rouge { - font-size: $code-font-size; + font-size: v.$code-font-size; padding: 3px 5px; word-break: break-word; - border-radius: $radius-sm; + border-radius: v.$radius-sm; background-color: var(--inline-code-bg); } @@ -150,9 +113,42 @@ div[class^='language-'] { box-shadow: var(--language-border-color) 0 0 0 1px; .content > & { - @include ml-mr(-1rem); + @include mx.ml-mr(-1rem); border-radius: 0; + + @include bp.sm { + @include mx.ml-mr(0); + + border-radius: v.$radius-lg; + } + } + + .code-header { + @include bp.sm { + @include mx.ml-mr(0); + + $dot-margin: 1rem; + + &::before { + content: ''; + display: inline-block; + margin-left: $dot-margin; + width: v.$code-dot-size; + height: v.$code-dot-size; + border-radius: 50%; + background-color: var(--code-header-muted-color); + box-shadow: (v.$code-dot-size + v.$code-dot-gap) 0 0 + var(--code-header-muted-color), + (v.$code-dot-size + v.$code-dot-gap) * 2 0 0 + var(--code-header-muted-color); + } + + span { + // center the text of label + margin-left: calc(($dot-margin + v.$code-dot-size) / 2 * -1); + } + } } .highlight { @@ -184,18 +180,18 @@ div { display: flex; justify-content: space-between; align-items: center; - height: $code-header-height; + height: v.$code-header-height; margin-left: 0.75rem; margin-right: 0.25rem; /* the label block */ span { - line-height: $code-header-height; + line-height: v.$code-header-height; /* label icon */ i { font-size: 1rem; - width: $code-icon-width; + width: v.$code-icon-width; color: var(--code-header-icon-color); &.small { @@ -223,8 +219,8 @@ div { @extend %rounded; border: 1px solid transparent; - height: $code-header-height; - width: $code-header-height; + height: v.$code-header-height; + width: v.$code-header-height; padding: 0; background-color: inherit; @@ -255,38 +251,3 @@ div { } } } - -@media all and (min-width: 576px) { - div[class^='language-'] { - .content > & { - @include ml-mr(0); - - border-radius: $radius-lg; - } - - .code-header { - @include ml-mr(0); - - $dot-margin: 1rem; - - &::before { - content: ''; - display: inline-block; - margin-left: $dot-margin; - width: $code-dot-size; - height: $code-dot-size; - border-radius: 50%; - background-color: var(--code-header-muted-color); - box-shadow: ($code-dot-size + $code-dot-gap) 0 0 - var(--code-header-muted-color), - ($code-dot-size + $code-dot-gap) * 2 0 0 - var(--code-header-muted-color); - } - - span { - // center the text of label - margin-left: calc(($dot-margin + $code-dot-size) / 2 * -1); - } - } - } -} diff --git a/_sass/base/_typography.scss b/_sass/base/_typography.scss new file mode 100644 index 00000000..4cf39643 --- /dev/null +++ b/_sass/base/_typography.scss @@ -0,0 +1,266 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; + +@for $i from 1 through 5 { + h#{$i} { + @extend %heading; + + @if $i > 1 { + @extend %anchor; + } + + @if $i < 5 { + $size-factor: 0.25rem; + + @if $i > 1 { + $size-factor: 0.18rem; + + main & { + @if $i == 2 { + margin: 2.5rem 0 1.25rem; + } @else { + margin: 2rem 0 1rem; + } + } + } + + & { + font-size: 1rem + (5 - $i) * $size-factor; + } + } @else { + font-size: 1.05rem; + } + } +} + +a { + @extend %link-color; + + text-decoration: none; +} + +img { + max-width: 100%; + height: auto; + transition: all 0.35s ease-in-out; + + .blur & { + $blur: 20px; + + -webkit-filter: blur($blur); + filter: blur($blur); + } +} + +blockquote { + border-left: 0.125rem solid var(--blockquote-border-color); + padding-left: 1rem; + color: var(--blockquote-text-color); + margin-top: 0.5rem; + + > p:last-child { + margin-bottom: 0; + } + + &[class^='prompt-'] { + border-left: 0; + position: relative; + padding: 1rem 1rem 1rem 3rem; + color: var(--prompt-text-color); + + @extend %rounded; + + &::before { + text-align: center; + width: 3rem; + position: absolute; + left: 0.25rem; + margin-top: 0.4rem; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + } + } + + @include mx.prompt('tip', '\f0eb', $fa-style: 'regular'); + @include mx.prompt('info', '\f06a', $rotate: 180); + @include mx.prompt('warning', '\f06a'); + @include mx.prompt('danger', '\f071'); +} + +kbd { + font-family: Lato, sans-serif; + display: inline-block; + vertical-align: middle; + line-height: 1.3rem; + min-width: 1.75rem; + text-align: center; + margin: 0 0.3rem; + padding-top: 0.1rem; + color: var(--kbd-text-color); + background-color: var(--kbd-bg-color); + border-radius: v.$radius-sm; + border: solid 1px var(--kbd-wrap-color); + box-shadow: inset 0 -2px 0 var(--kbd-wrap-color); +} + +hr { + border-color: var(--main-border-color); + opacity: 1; +} + +footer { + background-color: var(--main-bg); + height: v.$footer-height; + border-top: 1px solid var(--main-border-color); + + @extend %text-xs; + + a { + @extend %text-highlight; + + &:hover { + @extend %link-hover; + } + } + + em { + @extend %text-highlight; + } + + p { + text-align: center; + margin-bottom: 0; + } +} + +/* fontawesome icons */ +i { + &.far, + &.fas { + @extend %no-cursor; + } +} + +sup { + @extend %sup-fn-target; +} + +main { + line-height: 1.75; + + h1 { + margin-top: 2rem; + + @include bp.lg { + margin-top: 3rem; + } + } + + p { + > a.popup { + &:not(.normal):not(.left):not(.right) { + @include mx.align-center; + } + } + } + + .categories, + #tags, + #archives { + a:not(:hover) { + @extend %no-bottom-border; + } + } + + @include bp.lte(bp.get(sm)) { + .content { + > blockquote[class^='prompt-'] { + @include mx.ml-mr(-1rem); + + border-radius: 0; + max-width: none; + } + } + } +} + +.footnotes > ol { + padding-left: 2rem; + margin-top: 0.5rem; + + > li { + &:not(:last-child) { + margin-bottom: 0.3rem; + } + + @extend %sup-fn-target; + + > p { + margin-left: 0.25em; + + @include mx.mt-mb(0); + } + } +} + +.footnote { + @at-root a#{&} { + @include mx.ml-mr(1px); + @include mx.pl-pr(2px); + + border-bottom-style: none !important; + } +} + +.reversefootnote { + @at-root a#{&} { + font-size: 0.6rem; + line-height: 1; + position: relative; + bottom: 0.25em; + margin-left: 0.25em; + border-bottom-style: none !important; + } +} + +/* --- Begin of Markdown table style --- */ + +/* it will be created by Liquid */ +.table-wrapper { + overflow-x: auto; + margin-bottom: 1.5rem; + + > table { + min-width: 100%; + overflow-x: auto; + border-spacing: 0; + + thead { + border-bottom: solid 2px rgba(210, 215, 217, 0.75); + + th { + @extend %table-cell; + } + } + + tbody { + tr { + border-bottom: 1px solid var(--tb-border-color); + + &:nth-child(2n) { + background-color: var(--tb-even-bg); + } + + &:nth-child(2n + 1) { + background-color: var(--tb-odd-bg); + } + + td { + @extend %table-cell; + } + } + } /* tbody */ + } /* table */ +} diff --git a/_sass/colors/syntax-dark.scss b/_sass/colors/syntax-dark.scss deleted file mode 100644 index eb92204d..00000000 --- a/_sass/colors/syntax-dark.scss +++ /dev/null @@ -1,164 +0,0 @@ -/* - * The syntax dark mode styles. - */ - -@mixin dark-syntax { - --language-border-color: #2d2d2d; - --highlight-bg-color: #151515; - --highlighter-rouge-color: #c9def1; - --highlight-lineno-color: #808080; - --inline-code-bg: rgba(255, 255, 255, 0.05); - --code-color: #b0b0b0; - --code-header-text-color: #6a6a6a; - --code-header-muted-color: #353535; - --code-header-icon-color: #565656; - --clipboard-checked-color: #2bcc2b; - --filepath-text-color: #cacaca; - - .highlight .gp { - color: #87939d; - } - - /* --- Syntax highlight theme from `rougify style base16.dark` --- */ - - .highlight table td { - padding: 5px; - } - - .highlight table pre { - margin: 0; - } - - .highlight, - .highlight .w { - color: #d0d0d0; - background-color: #151515; - } - - .highlight .err { - color: #151515; - background-color: #ac4142; - } - - .highlight .c, - .highlight .ch, - .highlight .cd, - .highlight .cm, - .highlight .cpf, - .highlight .c1, - .highlight .cs { - color: #848484; - } - - .highlight .cp { - color: #f4bf75; - } - - .highlight .nt { - color: #f4bf75; - } - - .highlight .o, - .highlight .ow { - color: #d0d0d0; - } - - .highlight .p, - .highlight .pi { - color: #d0d0d0; - } - - .highlight .gi { - color: #90a959; - } - - .highlight .gd { - color: #f08a8b; - background-color: #320000; - } - - .highlight .gh { - color: #6a9fb5; - background-color: #151515; - font-weight: bold; - } - - .highlight .k, - .highlight .kn, - .highlight .kp, - .highlight .kr, - .highlight .kv { - color: #aa759f; - } - - .highlight .kc { - color: #d28445; - } - - .highlight .kt { - color: #d28445; - } - - .highlight .kd { - color: #d28445; - } - - .highlight .s, - .highlight .sb, - .highlight .sc, - .highlight .dl, - .highlight .sd, - .highlight .s2, - .highlight .sh, - .highlight .sx, - .highlight .s1 { - color: #90a959; - } - - .highlight .sa { - color: #aa759f; - } - - .highlight .sr { - color: #75b5aa; - } - - .highlight .si { - color: #b76d45; - } - - .highlight .se { - color: #b76d45; - } - - .highlight .nn { - color: #f4bf75; - } - - .highlight .nc { - color: #f4bf75; - } - - .highlight .no { - color: #f4bf75; - } - - .highlight .na { - color: #6a9fb5; - } - - .highlight .m, - .highlight .mb, - .highlight .mf, - .highlight .mh, - .highlight .mi, - .highlight .il, - .highlight .mo, - .highlight .mx { - color: #90a959; - } - - .highlight .ss { - color: #90a959; - } -} diff --git a/_sass/colors/syntax-light.scss b/_sass/colors/syntax-light.scss deleted file mode 100644 index 76aa6691..00000000 --- a/_sass/colors/syntax-light.scss +++ /dev/null @@ -1,210 +0,0 @@ -/* - * The syntax light mode code snippet colors. - */ - -@mixin light-syntax { - /* --- custom light colors --- */ - --language-border-color: #ececec; - --highlight-bg-color: #f6f8fa; - --highlighter-rouge-color: #3f596f; - --highlight-lineno-color: #9e9e9e; - --inline-code-bg: rgba(25, 25, 28, 0.05); - --code-color: #3a3a3a; - --code-header-text-color: #a3a3a3; - --code-header-muted-color: #e5e5e5; - --code-header-icon-color: #c9c8c8; - --clipboard-checked-color: #43c743; - - /* --- Syntax highlight theme from `rougify style github` --- */ - - .highlight table td { - padding: 5px; - } - - .highlight table pre { - margin: 0; - } - - .highlight, - .highlight .w { - color: #24292f; - background-color: #f6f8fa; - } - - .highlight .k, - .highlight .kd, - .highlight .kn, - .highlight .kp, - .highlight .kr, - .highlight .kt, - .highlight .kv { - color: #cf222e; - } - - .highlight .gr { - color: #f6f8fa; - } - - .highlight .gd { - color: #82071e; - background-color: #ffebe9; - } - - .highlight .nb { - color: #953800; - } - - .highlight .nc { - color: #953800; - } - - .highlight .no { - color: #953800; - } - - .highlight .nn { - color: #953800; - } - - .highlight .sr { - color: #116329; - } - - .highlight .na { - color: #116329; - } - - .highlight .nt { - color: #116329; - } - - .highlight .gi { - color: #116329; - background-color: #dafbe1; - } - - .highlight .kc { - color: #0550ae; - } - - .highlight .l, - .highlight .ld, - .highlight .m, - .highlight .mb, - .highlight .mf, - .highlight .mh, - .highlight .mi, - .highlight .il, - .highlight .mo, - .highlight .mx { - color: #0550ae; - } - - .highlight .sb { - color: #0550ae; - } - - .highlight .bp { - color: #0550ae; - } - - .highlight .ne { - color: #0550ae; - } - - .highlight .nl { - color: #0550ae; - } - - .highlight .py { - color: #0550ae; - } - - .highlight .nv, - .highlight .vc, - .highlight .vg, - .highlight .vi, - .highlight .vm { - color: #0550ae; - } - - .highlight .o, - .highlight .ow { - color: #0550ae; - } - - .highlight .gh { - color: #0550ae; - font-weight: bold; - } - - .highlight .gu { - color: #0550ae; - font-weight: bold; - } - - .highlight .s, - .highlight .sa, - .highlight .sc, - .highlight .dl, - .highlight .sd, - .highlight .s2, - .highlight .se, - .highlight .sh, - .highlight .sx, - .highlight .s1, - .highlight .ss { - color: #0a3069; - } - - .highlight .nd { - color: #8250df; - } - - .highlight .nf, - .highlight .fm { - color: #8250df; - } - - .highlight .err { - color: #f6f8fa; - background-color: #82071e; - } - - .highlight .c, - .highlight .ch, - .highlight .cd, - .highlight .cm, - .highlight .cp, - .highlight .cpf, - .highlight .c1, - .highlight .cs { - color: #68717a; - } - - .highlight .gl { - color: #68717a; - } - - .highlight .gt { - color: #68717a; - } - - .highlight .ni { - color: #24292f; - } - - .highlight .si { - color: #24292f; - } - - .highlight .ge { - color: #24292f; - font-style: italic; - } - - .highlight .gs { - color: #24292f; - font-weight: bold; - } -} /* light-syntax */ diff --git a/_sass/colors/typography-light.scss b/_sass/colors/typography-light.scss deleted file mode 100644 index b6fc5618..00000000 --- a/_sass/colors/typography-light.scss +++ /dev/null @@ -1,112 +0,0 @@ -/* - * The syntax light mode typography colors - */ - -@mixin light-scheme { - /* Framework color */ - --main-bg: white; - --mask-bg: #c1c3c5; - --main-border-color: #f3f3f3; - - /* Common color */ - --text-color: #34343c; - --text-muted-color: #757575; - --text-muted-highlight-color: inherit; - --heading-color: #2a2a2a; - --label-color: #585858; - --blockquote-border-color: #eeeeee; - --blockquote-text-color: #757575; - --link-color: #0056b2; - --link-underline-color: #dee2e6; - --button-bg: #ffffff; - --btn-border-color: #e9ecef; - --btn-backtotop-color: #686868; - --btn-backtotop-border-color: #f1f1f1; - --checkbox-color: #c5c5c5; - --checkbox-checked-color: #07a8f7; - --img-bg: radial-gradient( - circle, - rgb(255, 255, 255) 0%, - rgb(239, 239, 239) 100% - ); - --shimmer-bg: linear-gradient( - 90deg, - rgba(250, 250, 250, 0) 0%, - rgba(232, 230, 230, 1) 50%, - rgba(250, 250, 250, 0) 100% - ); - - /* Sidebar */ - --site-title-color: rgb(113, 113, 113); - --site-subtitle-color: #717171; - --sidebar-bg: #f6f8fa; - --sidebar-border-color: #efefef; - --sidebar-muted-color: #545454; - --sidebar-active-color: #1d1d1d; - --sidebar-hover-bg: rgb(223, 233, 241, 0.64); - --sidebar-btn-bg: white; - --sidebar-btn-color: #8e8e8e; - --avatar-border-color: white; - - /* Topbar */ - --topbar-bg: rgb(255, 255, 255, 0.7); - --topbar-text-color: rgb(78, 78, 78); - --search-border-color: rgb(240, 240, 240); - --search-icon-color: #c2c6cc; - --input-focus-border-color: #b8b8b8; - - /* Home page */ - --post-list-text-color: dimgray; - --btn-patinator-text-color: #555555; - --btn-paginator-hover-color: var(--sidebar-bg); - - /* Posts */ - --toc-highlight: #0550ae; - --toc-popup-border-color: lightgray; - --btn-share-color: gray; - --btn-share-hover-color: #0d6efd; - --card-bg: white; - --card-hovor-bg: #e2e2e2; - --card-shadow: rgb(104, 104, 104, 0.05) 0 2px 6px 0, - rgba(211, 209, 209, 0.15) 0 0 0 1px; - --footnote-target-bg: lightcyan; - --tb-odd-bg: #fbfcfd; - --tb-border-color: #eaeaea; - --dash-color: silver; - --kbd-wrap-color: #bdbdbd; - --kbd-text-color: var(--text-color); - --kbd-bg-color: white; - --prompt-text-color: rgb(46, 46, 46, 0.77); - --prompt-tip-bg: rgb(123, 247, 144, 0.2); - --prompt-tip-icon-color: #03b303; - --prompt-info-bg: #e1f5fe; - --prompt-info-icon-color: #0070cb; - --prompt-warning-bg: rgb(255, 243, 205); - --prompt-warning-icon-color: #ef9c03; - --prompt-danger-bg: rgb(248, 215, 218, 0.56); - --prompt-danger-icon-color: #df3c30; - - /* Tags */ - --tag-border: #dee2e6; - --tag-shadow: var(--btn-border-color); - --tag-hover: rgb(222, 226, 230); - --search-tag-bg: #f8f9fa; - - /* Categories */ - --categories-border: rgba(0, 0, 0, 0.125); - --categories-hover-bg: var(--btn-border-color); - --categories-icon-hover-color: darkslategray; - - /* Archive */ - --timeline-color: rgba(0, 0, 0, 0.075); - --timeline-node-bg: #c2c6cc; - --timeline-year-dot-color: #ffffff; - - [class^='prompt-'] { - --link-underline-color: rgb(219, 216, 216); - } - - .dark { - display: none; - } -} /* light-scheme */ diff --git a/_sass/components/_buttons.scss b/_sass/components/_buttons.scss new file mode 100644 index 00000000..bd7363e5 --- /dev/null +++ b/_sass/components/_buttons.scss @@ -0,0 +1,51 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; + +#back-to-top { + visibility: hidden; + opacity: 0; + z-index: 1; + cursor: pointer; + position: fixed; + right: 1rem; + bottom: calc(v.$footer-height-large - v.$back2top-size / 2); + background: var(--button-bg); + color: var(--btn-backtotop-color); + padding: 0; + width: v.$back2top-size; + height: v.$back2top-size; + border-radius: 50%; + border: 1px solid var(--btn-backtotop-border-color); + transition: opacity 0.5s ease-in-out, transform 0.2s ease-out; + + @include bp.lg { + right: 5%; + bottom: calc(v.$footer-height - v.$back2top-size / 2); + } + + @include bp.xxl { + right: calc((100vw - v.$sidebar-width - 1140px) / 2 + 3rem); + } + + @include bp.xxxl { + right: calc( + (100vw - v.$sidebar-width-large - v.$main-content-max-width) / 2 + 2rem + ); + } + + &:hover { + transform: translate3d(0, -5px, 0); + -webkit-transform: translate3d(0, -5px, 0); + } + + i { + line-height: v.$back2top-size; + position: relative; + bottom: 2px; + } + + &.show { + opacity: 1; + visibility: visible; + } +} diff --git a/_sass/components/_index.scss b/_sass/components/_index.scss new file mode 100644 index 00000000..ffbb9083 --- /dev/null +++ b/_sass/components/_index.scss @@ -0,0 +1,2 @@ +@forward 'buttons'; +@forward 'popups'; diff --git a/_sass/components/_popups.scss b/_sass/components/_popups.scss new file mode 100644 index 00000000..ca3e2fc6 --- /dev/null +++ b/_sass/components/_popups.scss @@ -0,0 +1,172 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/placeholders'; + +/* PWA update popup */ +#notification { + @-webkit-keyframes popup { + from { + opacity: 0; + bottom: 0; + } + } + + @keyframes popup { + from { + opacity: 0; + bottom: 0; + } + } + + .toast-header { + background: none; + border-bottom: none; + color: inherit; + } + + .toast-body { + font-family: Lato, sans-serif; + line-height: 1.25rem; + + button { + font-size: 90%; + min-width: 4rem; + } + } + + &.toast { + &.show { + display: block; + min-width: 20rem; + border-radius: 0.5rem; + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + background-color: rgba(255, 255, 255, 0.5); + color: #1b1b1eba; + position: fixed; + left: 50%; + bottom: 20%; + transform: translateX(-50%); + -webkit-animation: popup 0.8s; + animation: popup 0.8s; + } + } +} + +#toc-popup { + $slide-in: slide-in 0.3s ease-out; + $slide-out: slide-out 0.3s ease-out; + $curtain-height: 2rem; + $backdrop: blur(5px); + + border-color: var(--toc-popup-border-color); + border-width: 1px; + border-radius: v.$radius-lg; + color: var(--text-color); + background: var(--card-bg); + margin-top: v.$topbar-height; + min-width: 20rem; + font-size: 1.05rem; + + @include bp.sm { + max-width: 32rem; + } + + &[open] { + -webkit-animation: $slide-in; + animation: $slide-in; + } + + &[closing] { + -webkit-animation: $slide-out; + animation: $slide-out; + } + + @include bp.lg { + left: v.$sidebar-width; + } + + .header { + @extend %btn-color; + + position: -webkit-sticky; + position: sticky; + top: 0; + background-color: inherit; + border-bottom: 1px solid var(--main-border-color); + + .label { + font-family: v.$font-family-heading; + } + } + + button { + > i { + font-size: 1.25rem; + vertical-align: middle; + } + + &:focus-visible { + box-shadow: none; + } + } + + ul { + list-style-type: none; + padding-left: 0; + + li { + ul, + & + li { + margin-top: 0.25rem; + } + + a { + display: flex; + line-height: 1.5; + padding: 0.375rem 0; + padding-right: 1.125rem; + + &.toc-link::before { + display: none; + } + } + } + } + + @for $i from 2 through 4 { + .node-name--H#{$i} { + padding-left: 1.125rem * ($i - 1); + } + } + + .is-active-link { + color: var(--toc-highlight) !important; + font-weight: 600; + } + + &::-webkit-backdrop { + -webkit-backdrop-filter: $backdrop; + backdrop-filter: $backdrop; + } + + &::backdrop { + -webkit-backdrop-filter: $backdrop; + backdrop-filter: $backdrop; + } + + &::after { + display: flex; + content: ''; + position: relative; + background: linear-gradient(transparent, var(--card-bg) 70%); + height: $curtain-height; + } + + #toc-popup-content { + overflow: auto; + max-height: calc(100vh - 4 * v.$topbar-height); + font-family: v.$font-family-heading; + margin-bottom: -$curtain-height; + } +} diff --git a/_sass/layout/_footer.scss b/_sass/layout/_footer.scss new file mode 100644 index 00000000..fd49ea04 --- /dev/null +++ b/_sass/layout/_footer.scss @@ -0,0 +1,36 @@ +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/variables' as v; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; + +footer { + background-color: var(--main-bg); + height: v.$footer-height; + border-top: 1px solid var(--main-border-color); + + @extend %text-xs; + + @include bp.lt(bp.get(lg)) { + @include mx.slide; + + height: v.$footer-height-large; + padding: 1.5rem 0; + } + + a { + @extend %text-highlight; + + &:hover { + @extend %link-hover; + } + } + + em { + @extend %text-highlight; + } + + p { + text-align: center; + margin-bottom: 0; + } +} diff --git a/_sass/layout/_index.scss b/_sass/layout/_index.scss new file mode 100644 index 00000000..fa75daf9 --- /dev/null +++ b/_sass/layout/_index.scss @@ -0,0 +1,4 @@ +@forward 'sidebar'; +@forward 'topbar'; +@forward 'panel'; +@forward 'footer'; diff --git a/_sass/layout/_panel.scss b/_sass/layout/_panel.scss new file mode 100644 index 00000000..bb5c2bc1 --- /dev/null +++ b/_sass/layout/_panel.scss @@ -0,0 +1,66 @@ +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; + +.access { + top: 2rem; + transition: top 0.2s ease-in-out; + margin-top: 3rem; + margin-bottom: 4rem; + + &:only-child { + position: -webkit-sticky; + position: sticky; + } + + > section { + padding-left: 1rem; + border-left: 1px solid var(--main-border-color); + + &:not(:last-child) { + margin-bottom: 4rem; + } + } + + .content { + font-size: 0.9rem; + } +} + +#panel-wrapper { + /* the headings */ + .panel-heading { + font-family: inherit; + line-height: inherit; + + @include mx.label(inherit); + } + + .post-tag { + line-height: 1.05rem; + font-size: 0.85rem; + border-radius: 0.8rem; + padding: 0.3rem 0.5rem; + margin: 0 0.35rem 0.5rem 0; + + &:hover { + transition: all 0.3s ease-in; + } + } + + @include bp.lt(bp.get(xl)) { + display: none; + } +} + +#access-lastmod { + a { + color: inherit; + + &:hover { + @extend %link-hover; + } + + @extend %no-bottom-border; + } +} diff --git a/_sass/layout/_sidebar.scss b/_sass/layout/_sidebar.scss new file mode 100644 index 00000000..eaad470c --- /dev/null +++ b/_sass/layout/_sidebar.scss @@ -0,0 +1,258 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/mixins' as mx; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/placeholders'; + +$btn-border-width: 3px; +$btn-mb: 0.5rem; +$sidebar-display: 'sidebar-display'; /* the attribute for sidebar display */ + +#sidebar { + @include mx.pl-pr(0); + + position: fixed; + top: 0; + left: 0; + height: 100%; + overflow-y: auto; + width: v.$sidebar-width; + background: var(--sidebar-bg); + border-right: 1px solid var(--sidebar-border-color); + + /* Hide scrollbar for IE, Edge and Firefox */ + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + + /* Hide scrollbar for Chrome, Safari and Opera */ + &::-webkit-scrollbar { + display: none; + } + + @include bp.lt(bp.get(lg)) { + @include mx.slide; + + transform: translateX(-#{v.$sidebar-width}); /* hide */ + -webkit-transform: translateX(-#{v.$sidebar-width}); + + [#{$sidebar-display}] & { + transform: translateX(0); + } + } + + @include bp.xxxl { + width: v.$sidebar-width-large; + } + + %sidebar-link-hover { + &:hover { + color: var(--sidebar-active-color); + } + } + + a { + @extend %sidebar-links; + } + + #avatar { + display: block; + width: 6.5rem; + height: 6.5rem; + overflow: hidden; + box-shadow: var(--avatar-border-color) 0 0 0 2px; + transform: translateZ(0); /* fixed the zoom in Safari */ + + @include bp.sm { + width: 7rem; + height: 7rem; + } + + img { + transition: transform 0.5s; + + &:hover { + transform: scale(1.2); + } + } + } + + .profile-wrapper { + @include mx.mt-mb(2.5rem); + @extend %clickable-transition; + + padding-left: 2.5rem; + padding-right: 1.25rem; + width: 100%; + + @include bp.lg { + margin-top: 3rem; + } + + @include bp.xxxl { + margin-top: 3.5rem; + margin-bottom: 2.5rem; + padding-left: 3.5rem; + } + } + + .site-title { + @extend %clickable-transition; + @extend %sidebar-link-hover; + + font-family: inherit; + font-weight: 900; + font-size: 1.75rem; + line-height: 1.2; + letter-spacing: 0.25px; + margin-top: 1.25rem; + margin-bottom: 0.5rem; + width: fit-content; + color: var(--site-title-color); + } + + .site-subtitle { + font-size: 95%; + color: var(--site-subtitle-color); + margin-top: 0.25rem; + word-spacing: 1px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + } + + ul { + margin-bottom: 2rem; + + li.nav-item { + opacity: 0.9; + width: 100%; + + @include mx.pl-pr(1.5rem); + + @include bp.xxxl { + @include mx.pl-pr(2.75rem); + } + + a.nav-link { + @include mx.pt-pb(0.6rem); + + display: flex; + align-items: center; + border-radius: 0.75rem; + font-weight: 600; + + &:hover { + background-color: var(--sidebar-hover-bg); + } + + i { + font-size: 95%; + opacity: 0.8; + margin-right: 1.5rem; + } + + span { + font-size: 90%; + letter-spacing: 0.2px; + } + } + + &.active { + .nav-link { + color: var(--sidebar-active-color); + background-color: var(--sidebar-hover-bg); + + span { + opacity: 1; + } + } + } + + &:not(:first-child) { + margin-top: 0.25rem; + } + } + } + + .sidebar-bottom { + padding-left: 2rem; + padding-right: 1rem; + margin-bottom: 1.5rem; + + @include bp.xxxl { + padding-left: 2.75rem; + margin-bottom: 1.75rem; + } + + $btn-size: 1.75rem; + + %button { + width: $btn-size; + height: $btn-size; + margin-bottom: $btn-mb; // multi line gap + border-radius: 50%; + color: var(--sidebar-btn-color); + background-color: var(--sidebar-btn-bg); + text-align: center; + display: flex; + align-items: center; + justify-content: center; + + &:not(:focus-visible) { + box-shadow: var(--sidebar-border-color) 0 0 0 1px; + } + + &:hover { + background-color: var(--sidebar-hover-bg); + } + } + + a { + @extend %button; + @extend %sidebar-link-hover; + @extend %clickable-transition; + + &:not(:last-child) { + margin-right: v.$sb-btn-gap; + + @include bp.xxxl { + margin-right: v.$sb-btn-gap-lg; + } + } + } + + i { + line-height: $btn-size; + } + + #mode-toggle { + @extend %button; + @extend %sidebar-links; + @extend %sidebar-link-hover; + } + + .icon-border { + @extend %no-cursor; + @include mx.ml-mr(calc((v.$sb-btn-gap - $btn-border-width) / 2)); + + background-color: var(--sidebar-btn-color); + content: ''; + width: $btn-border-width; + height: $btn-border-width; + border-radius: 50%; + margin-bottom: $btn-mb; + + @include bp.xxxl { + @include mx.ml-mr(calc((v.$sb-btn-gap-lg - $btn-border-width) / 2)); + } + } + } /* .sidebar-bottom */ +} /* #sidebar */ + +[#{$sidebar-display}] { + #main-wrapper { + @include bp.lt(bp.get(lg)) { + transform: translateX(v.$sidebar-width); + } + } +} diff --git a/_sass/layout/_topbar.scss b/_sass/layout/_topbar.scss new file mode 100644 index 00000000..eb0aea9b --- /dev/null +++ b/_sass/layout/_topbar.scss @@ -0,0 +1,86 @@ +@use '../abstracts/variables' as v; +@use '../abstracts/mixins' as mx; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/placeholders'; + +#topbar-wrapper { + height: v.$topbar-height; + background-color: var(--topbar-bg); + + @include bp.lt(bp.get(lg)) { + @include mx.slide(top 0.2s ease); + + left: 0; + } +} + +#topbar { + @extend %btn-color; + + #breadcrumb { + font-size: 1rem; + color: var(--text-muted-color); + padding-left: 0.5rem; + + a:hover { + @extend %link-hover; + } + + span { + &:not(:last-child) { + &::after { + content: '›'; + padding: 0 0.3rem; + } + } + } + + @include bp.lt(bp.get(lg)) { + display: none; + } + + @include bp.between(bp.get(lg), calc(#{bp.get(xl)} - 1px)) { + width: 65%; + overflow: hidden; + text-overflow: ellipsis; + word-break: keep-all; + white-space: nowrap; + } + } + + @include bp.lte(bp.get(md)) { + @include mx.max-w-100; + } + + @include bp.lt(bp.get(lg)) { + max-width: 100%; + } +} + +#topbar-title { + display: none; + font-size: 1.1rem; + font-weight: 600; + font-family: sans-serif; + color: var(--topbar-text-color); + text-align: center; + width: 70%; + word-break: keep-all; + + @include bp.lt(bp.get(lg)) { + display: block; + } + + @include bp.lg { + text-align: left; + } +} + +#sidebar-trigger, +#search-trigger { + display: none; + + @include bp.lt(bp.get(lg)) { + display: block; + } +} diff --git a/_sass/main.bundle.scss b/_sass/main.bundle.scss index 52e893fe..5d84f938 100644 --- a/_sass/main.bundle.scss +++ b/_sass/main.bundle.scss @@ -1,2 +1,2 @@ -@import 'dist/bootstrap'; -@import 'main'; +@use 'vendors/bootstrap'; +@use 'main'; diff --git a/_sass/main.scss b/_sass/main.scss index 1c2311d5..3bbb70d6 100644 --- a/_sass/main.scss +++ b/_sass/main.scss @@ -1,13 +1,4 @@ -@import 'colors/typography-light'; -@import 'colors/typography-dark'; -@import 'addon/variables'; -@import 'variables-hook'; -@import 'addon/module'; -@import 'addon/syntax'; -@import 'addon/commons'; -@import 'layout/home'; -@import 'layout/post'; -@import 'layout/tags'; -@import 'layout/archives'; -@import 'layout/categories'; -@import 'layout/category-tag'; +@forward 'base'; +@forward 'components'; +@forward 'layout'; +@forward 'pages'; diff --git a/_sass/layout/archives.scss b/_sass/pages/_archives.scss similarity index 95% rename from _sass/layout/archives.scss rename to _sass/pages/_archives.scss index fd1979b8..86e77a89 100644 --- a/_sass/layout/archives.scss +++ b/_sass/pages/_archives.scss @@ -1,10 +1,17 @@ -/* - Style for Archives -*/ +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/placeholders'; #archives { letter-spacing: 0.03rem; + @include bp.lt(bp.get(sm)) { + margin-top: -1rem; + + ul { + letter-spacing: 0; + } + } + $timeline-width: 4px; %timeline { @@ -131,13 +138,3 @@ } } } /* #archives */ - -@media all and (max-width: 576px) { - #archives { - margin-top: -1rem; - - ul { - letter-spacing: 0; - } - } -} diff --git a/_sass/layout/categories.scss b/_sass/pages/_categories.scss similarity index 87% rename from _sass/layout/categories.scss rename to _sass/pages/_categories.scss index f12b9633..64a2df50 100644 --- a/_sass/layout/categories.scss +++ b/_sass/pages/_categories.scss @@ -1,8 +1,7 @@ -/* - Style for Tab Categories -*/ +@use '../abstracts/variables' as v; +@use '../abstracts/placeholders'; -%category-icon-color { +%-category-icon-color { color: gray; } @@ -16,7 +15,7 @@ } .card-header { - $radius: calc($radius-lg - 1px); + $radius: calc(v.$radius-lg - 1px); padding: 0.75rem; border-radius: $radius; @@ -29,7 +28,7 @@ } i { - @extend %category-icon-color; + @extend %-category-icon-color; font-size: 86%; /* fontawesome icons */ } diff --git a/_sass/layout/category-tag.scss b/_sass/pages/_category-tag.scss similarity index 79% rename from _sass/layout/category-tag.scss rename to _sass/pages/_category-tag.scss index fe7d99ce..0a827121 100644 --- a/_sass/layout/category-tag.scss +++ b/_sass/pages/_category-tag.scss @@ -1,6 +1,6 @@ -/* - Style for page Category and Tag -*/ +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; .dash { margin: 0 0.5rem 0.6rem 0.5rem; @@ -24,6 +24,10 @@ position: relative; top: 0.6rem; margin-right: 0.5rem; + + @include bp.lt(bp.get(sm)) { + margin: 0 0.5rem; + } } /* post's title */ @@ -31,6 +35,10 @@ @extend %no-bottom-border; font-size: 1.1rem; + + @include bp.lt(bp.get(sm)) { + @include mx.text-ellipsis; + } } } } @@ -53,18 +61,3 @@ margin-bottom: -1px; /* Avoid jumping */ } } - -@media all and (max-width: 576px) { - #page-category, - #page-tag { - ul > li { - &::before { - margin: 0 0.5rem; - } - - > a { - @include text-ellipsis; - } - } - } -} diff --git a/_sass/layout/home.scss b/_sass/pages/_home.scss similarity index 73% rename from _sass/layout/home.scss rename to _sass/pages/_home.scss index 7fff3ba1..7a4bbf9b 100644 --- a/_sass/layout/home.scss +++ b/_sass/pages/_home.scss @@ -1,10 +1,14 @@ -/* - Style for Homepage -*/ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/placeholders'; #post-list { margin-top: 2rem; + @include bp.lg { + margin-top: 2.5rem; + } + .card-wrapper { &:hover { text-decoration: none; @@ -20,7 +24,11 @@ background: none; %img-radius { - border-radius: $radius-lg $radius-lg 0 0; + border-radius: v.$radius-lg v.$radius-lg 0 0; + + @include bp.md { + border-radius: 0 v.$radius-lg v.$radius-lg 0; + } } .preview-img { @@ -35,6 +43,10 @@ height: 100%; padding: 1rem; + @include bp.md { + padding: 1.75rem 1.75rem 1.25rem; + } + .card-title { @extend %text-clip; @@ -46,14 +58,20 @@ color: var(--text-muted-color) !important; } - .card-text.content { - @extend %muted; + .card-text { + @include bp.md { + display: inherit !important; + } - p { - @extend %text-clip; + &.content { + @extend %muted; - line-height: 1.5; - margin: 0; + p { + @extend %text-clip; + + line-height: 1.5; + margin: 0; + } } } @@ -63,6 +81,10 @@ i { &:not(:first-child) { margin-left: 1.5rem; + + @include bp.md { + margin-left: 1.75rem; + } } } @@ -87,11 +109,28 @@ font-family: Lato, sans-serif; justify-content: space-evenly; + @include bp.lg { + font-size: 0.85rem; + justify-content: center; + } + a:hover { text-decoration: none; } .page-item { + @include bp.lt(bp.get(lg)) { + &:not(:first-child):not(:last-child) { + display: none; + } + } + + @include bp.lg { + &:not(:last-child) { + margin-right: 0.7rem; + } + } + .page-link { color: var(--btn-patinator-text-color); padding: 0 0.6rem; @@ -125,64 +164,10 @@ } } } /* .page-item */ -} /* .pagination */ - -/* Tablet */ -@media all and (min-width: 768px) { - %img-radius { - border-radius: 0 $radius-lg $radius-lg 0; - } - - #post-list { - .card { - .card-body { - padding: 1.75rem 1.75rem 1.25rem 1.75rem; - .card-text { - display: inherit !important; - } - - .post-meta { - i { - &:not(:first-child) { - margin-left: 1.75rem; - } - } - } - } - } - } -} - -/* Hide SideBar and TOC */ -@media all and (max-width: 830px) { - .pagination { - .page-item { - &:not(:first-child):not(:last-child) { - display: none; - } - } - } -} - -/* Sidebar is visible */ -@media all and (min-width: 831px) { - #post-list { - margin-top: 2.5rem; - } - - .pagination { - font-size: 0.85rem; - justify-content: center; - - .page-item { - &:not(:last-child) { - margin-right: 0.7rem; - } - } - - .page-index { + .page-index { + @include bp.lg { display: none; } - } /* .pagination */ + } } diff --git a/_sass/pages/_index.scss b/_sass/pages/_index.scss new file mode 100644 index 00000000..74e9ea6e --- /dev/null +++ b/_sass/pages/_index.scss @@ -0,0 +1,7 @@ +@forward 'search'; +@forward 'home'; +@forward 'post'; +@forward 'categories'; +@forward 'tags'; +@forward 'archives'; +@forward 'category-tag'; diff --git a/_sass/layout/post.scss b/_sass/pages/_post.scss similarity index 67% rename from _sass/layout/post.scss rename to _sass/pages/_post.scss index 891479e6..d789050d 100644 --- a/_sass/layout/post.scss +++ b/_sass/pages/_post.scss @@ -1,14 +1,15 @@ -/** - * Post-specific styles - */ +@use '../abstracts/variables' as v; +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/mixins' as mx; +@use '../abstracts/placeholders'; -%btn-post-nav { +%-btn-post-nav { width: 50%; position: relative; border-color: var(--btn-border-color); } -@mixin dot($pl: 0.25rem, $pr: 0.25rem) { +@mixin -dot($pl: 0.25rem, $pr: 0.25rem) { content: '\2022'; padding-left: $pl; padding-right: $pr; @@ -24,7 +25,7 @@ header { .post-meta { span + span::before { - @include dot; + @include -dot; } em, @@ -113,9 +114,20 @@ header { } /* .share-wrapper */ } +.post-tail-bottom { + @include bp.lte(bp.get(sm)) { + flex-wrap: wrap-reverse !important; + + > div:first-child { + width: 100%; + margin-top: 1rem; + } + } +} + .share-mastodon { /* See: https://github.com/justinribeiro/share-to-mastodon#properties */ - --wc-stm-font-family: $font-family-base; + --wc-stm-font-family: v.$font-family-base; --wc-stm-dialog-background-color: var(--card-bg); --wc-stm-form-button-border: 1px solid var(--btn-border-color); --wc-stm-form-submit-background-color: var(--sidebar-btn-bg); @@ -139,8 +151,13 @@ header { } .post-navigation { + @include bp.lt(bp.get(lg)) { + @include mx.pl-pr(0); + @include mx.ml-mr(-0.5rem); + } + .btn { - @extend %btn-post-nav; + @extend %-btn-post-nav; &:not(:hover) { color: var(--link-color); @@ -153,7 +170,7 @@ header { } &.disabled { - @extend %btn-post-nav; + @extend %-btn-post-nav; pointer-events: auto; cursor: not-allowed; @@ -173,12 +190,12 @@ header { } &:first-child { - border-radius: $radius-lg 0 0 $radius-lg; + border-radius: v.$radius-lg 0 0 v.$radius-lg; left: 0.5px; } &:last-child { - border-radius: 0 $radius-lg $radius-lg 0; + border-radius: 0 v.$radius-lg v.$radius-lg 0; right: 0.5px; } } @@ -298,23 +315,27 @@ header { top: 0; z-index: 1; margin: 0 -1rem; - height: $topbar-height; + height: v.$topbar-height; background: var(--main-bg); border-bottom: 1px solid var(--main-border-color); transition: all 0.2s ease-in-out; @extend %btn-color; + @include bp.xl { + display: none !important; + } + .label { @extend %heading; - margin-left: 0.25rem; + margin-left: 0.375rem; padding: 0 0.75rem; color: inherit; } &.invisible { - top: -$topbar-height; + top: -#{v.$topbar-height}; transition: none; } } @@ -322,11 +343,15 @@ header { #toc-solo-trigger { color: var(--text-muted-color); border-color: var(--btn-border-color); - border-radius: $radius-lg; + border-radius: v.$radius-lg; + + @include bp.xl { + display: none !important; + } .label { font-size: 1rem; - font-family: $font-family-heading; + font-family: v.$font-family-heading; } &:hover { @@ -338,7 +363,7 @@ header { @mixin slide-in { from { opacity: 0.7; - transform: translateY(-$topbar-height); + transform: translateY(-#{v.$topbar-height}); } to { @@ -354,7 +379,7 @@ header { } 100% { - transform: translateY(-$topbar-height); + transform: translateY(-#{v.$topbar-height}); opacity: 0; } } @@ -375,129 +400,11 @@ header { @include slide-out; } -#toc-popup { - $slide-in: slide-in 0.3s ease-out; - $slide-out: slide-out 0.3s ease-out; - $curtain-height: 2rem; - $backdrop: blur(5px); - - border-color: var(--toc-popup-border-color); - border-width: 1px; - border-radius: $radius-lg; - color: var(--text-color); - background: var(--card-bg); - margin-top: $topbar-height; - min-width: 20rem; - font-size: 1.05rem; - - @media all and (min-width: 576px) { - max-width: 32rem; - } - - &[open] { - -webkit-animation: $slide-in; - animation: $slide-in; - } - - &[closing] { - -webkit-animation: $slide-out; - animation: $slide-out; - } - - @media all and (min-width: 850px) { - left: $sidebar-width; - } - - .header { - @extend %btn-color; - - position: -webkit-sticky; - position: sticky; - top: 0; - background-color: inherit; - border-bottom: 1px solid var(--main-border-color); - - .label { - font-family: $font-family-heading; - } - } - - button { - > i { - font-size: 1.25rem; - vertical-align: middle; - } - - &:focus-visible { - box-shadow: none; - } - } - - ul { - list-style-type: none; - padding-left: 0; - - li { - ul, - & + li { - margin-top: 0.25rem; - } - - a { - display: flex; - line-height: 1.5; - padding: 0.375rem 0; - padding-right: 1.125rem; - - &.toc-link::before { - display: none; - } - } - } - } - - @for $i from 2 through 4 { - .node-name--H#{$i} { - padding-left: 1.125rem * ($i - 1); - } - } - - .is-active-link { - color: var(--toc-highlight) !important; - font-weight: 600; - } - - &::-webkit-backdrop { - -webkit-backdrop-filter: $backdrop; - backdrop-filter: $backdrop; - } - - &::backdrop { - -webkit-backdrop-filter: $backdrop; - backdrop-filter: $backdrop; - } - - &::after { - display: flex; - content: ''; - position: relative; - background: linear-gradient(transparent, var(--card-bg) 70%); - height: $curtain-height; - } - - #toc-popup-content { - overflow: auto; - max-height: calc(100vh - 4 * $topbar-height); - font-family: $font-family-heading; - margin-bottom: -$curtain-height; - } -} - /* --- Related Posts --- */ #related-posts { > h3 { - @include label(1.1rem, 600); + @include mx.label(1.1rem, 600); } time { @@ -540,47 +447,23 @@ header { } .share-label { - @include label(inherit, 400, inherit); + @include mx.label(inherit, 400, inherit); &::after { content: ':'; } } -@media all and (max-width: 576px) { - .post-tail-bottom { - flex-wrap: wrap-reverse !important; - - > div:first-child { - width: 100%; - margin-top: 1rem; - } - } -} - -@media all and (max-width: 768px) { - .content > p > img { +.content > p > img { + @include bp.lte(bp.get(md)) { max-width: calc(100% + 1rem); } } -/* Hide SideBar and TOC */ -@media all and (max-width: 849px) { - .post-navigation { - @include pl-pr(0); - @include ml-mr(-0.5rem); - } -} - -@media all and (min-width: 1200px) { - h2, - h3, - h4 { +h2, +h3, +h4 { + @include bp.xl { scroll-margin-top: 2rem; } - - #toc-bar, - #toc-solo-trigger { - display: none !important; - } } diff --git a/_sass/pages/_search.scss b/_sass/pages/_search.scss new file mode 100644 index 00000000..dfb044ed --- /dev/null +++ b/_sass/pages/_search.scss @@ -0,0 +1,184 @@ +@use '../abstracts/breakpoints' as bp; +@use '../abstracts/variables' as v; +@use '../abstracts/placeholders'; + +search { + display: flex; + width: 100%; + border-radius: 1rem; + border: 1px solid var(--search-border-color); + background: var(--main-bg); + padding: 0 0.5rem; + + i { + z-index: 2; + font-size: 0.9rem; + color: var(--search-icon-color); + } + + @include bp.lt(bp.get(lg)) { + display: none; + } + + @include bp.lg { + max-width: v.$search-max-width; + } + + @include bp.xl { + margin-right: 4rem; + } + + @include bp.xxxl { + margin-right: calc( + v.$main-content-max-width / 4 - v.$search-max-width - 0.75rem + ); + } +} + +#search-result-wrapper { + display: none; + height: 100%; + width: 100%; + overflow: auto; + + .content { + margin-top: 2rem; + } + + @include bp.lt(bp.get(lg)) { + width: 100%; + + .content { + letter-spacing: 0; + } + } + + @include bp.lg { + max-width: v.$main-content-max-width; + justify-content: start !important; + } +} + +#search-results { + padding-bottom: 3rem; + + @include bp.between(bp.get(lg), calc(#{bp.get(xl)} - 1px)) { + > div { + max-width: 700px; + } + } + + a { + font-size: 1.4rem; + line-height: 1.5rem; + + &:hover { + @extend %link-hover; + } + + @extend %link-color; + @extend %no-bottom-border; + @extend %heading; + } + + > article { + width: 100%; + + &:not(:last-child) { + margin-bottom: 1rem; + } + + @include bp.xl { + width: 45%; + + &:nth-child(odd) { + margin-right: 1.5rem; + } + + &:nth-child(even) { + margin-left: 1.5rem; + } + + &:last-child:nth-child(odd) { + position: relative; + right: 24.3%; + } + } + + h2 { + line-height: 2.5rem; + } + + /* icons */ + i { + color: #818182; + margin-right: 0.15rem; + font-size: 80%; + } + + > p { + @extend %text-ellipsis; + + white-space: break-spaces; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + } + } +} + +/* 'Cancel' link */ +#search-cancel { + color: var(--link-color); + display: none; + white-space: nowrap; + + @extend %cursor-pointer; +} + +#search-input { + background: center; + border: 0; + border-radius: 0; + padding: 0.18rem 0.3rem; + color: var(--text-color); + height: auto; + + &:focus { + box-shadow: none; + } + + @include bp.xl { + transition: all 0.3s ease-in-out; + } +} + +#search-hints { + padding: 0 1rem; + + @include bp.lg { + display: none; + } + + h4 { + margin-bottom: 1.5rem; + } + + .post-tag { + display: inline-block; + line-height: 1rem; + font-size: 1rem; + background: var(--search-tag-bg); + border: none; + padding: 0.5rem; + margin: 0 1.25rem 1rem 0; + + &::before { + content: '#'; + color: var(--text-muted-color); + padding-right: 0.2rem; + } + + @extend %link-color; + } +} diff --git a/_sass/layout/tags.scss b/_sass/pages/_tags.scss similarity index 71% rename from _sass/layout/tags.scss rename to _sass/pages/_tags.scss index 4cf5d3b7..d22f20d6 100644 --- a/_sass/layout/tags.scss +++ b/_sass/pages/_tags.scss @@ -1,6 +1,4 @@ -/* - Styles for Tab Tags -*/ +@use '../abstracts/breakpoints' as bp; .tag { border-radius: 0.7em; @@ -17,3 +15,9 @@ font-family: Oswald, sans-serif; } } + +#tags { + @include bp.lt(bp.get(lg)) { + justify-content: center !important; + } +} diff --git a/_sass/colors/typography-dark.scss b/_sass/themes/_dark.scss similarity index 62% rename from _sass/colors/typography-dark.scss rename to _sass/themes/_dark.scss index 664c9365..8c2f6ea8 100644 --- a/_sass/colors/typography-dark.scss +++ b/_sass/themes/_dark.scss @@ -1,8 +1,6 @@ -/* - * The main dark mode styles - */ +@mixin styles { + color-scheme: dark; -@mixin dark-scheme { /* Framework color */ --main-bg: rgb(27, 27, 30); --mask-bg: rgb(68, 69, 70); @@ -100,7 +98,18 @@ --timeline-color: rgb(63, 65, 68); --timeline-year-dot-color: var(--timeline-color); - color-scheme: dark; + /* Code highlight colors */ + --language-border-color: #2d2d2d; + --highlight-bg-color: #151515; + --highlighter-rouge-color: #c9def1; + --highlight-lineno-color: #808080; + --inline-code-bg: rgba(255, 255, 255, 0.05); + --code-color: #b0b0b0; + --code-header-text-color: #6a6a6a; + --code-header-muted-color: #353535; + --code-header-icon-color: #565656; + --clipboard-checked-color: #2bcc2b; + --filepath-text-color: #cacaca; .light { display: none; @@ -144,4 +153,151 @@ #disqus_thread { color-scheme: none; } -} /* dark-scheme */ + + /* --- Syntax highlight theme from `rougify style base16.dark` --- */ + + .highlight .gp { + color: #87939d; + } + + .highlight table td { + padding: 5px; + } + + .highlight table pre { + margin: 0; + } + + .highlight, + .highlight .w { + color: #d0d0d0; + background-color: #151515; + } + + .highlight .err { + color: #151515; + background-color: #ac4142; + } + + .highlight .c, + .highlight .ch, + .highlight .cd, + .highlight .cm, + .highlight .cpf, + .highlight .c1, + .highlight .cs { + color: #848484; + } + + .highlight .cp { + color: #f4bf75; + } + + .highlight .nt { + color: #f4bf75; + } + + .highlight .o, + .highlight .ow { + color: #d0d0d0; + } + + .highlight .p, + .highlight .pi { + color: #d0d0d0; + } + + .highlight .gi { + color: #90a959; + } + + .highlight .gd { + color: #f08a8b; + background-color: #320000; + } + + .highlight .gh { + color: #6a9fb5; + background-color: #151515; + font-weight: bold; + } + + .highlight .k, + .highlight .kn, + .highlight .kp, + .highlight .kr, + .highlight .kv { + color: #aa759f; + } + + .highlight .kc { + color: #d28445; + } + + .highlight .kt { + color: #d28445; + } + + .highlight .kd { + color: #d28445; + } + + .highlight .s, + .highlight .sb, + .highlight .sc, + .highlight .dl, + .highlight .sd, + .highlight .s2, + .highlight .sh, + .highlight .sx, + .highlight .s1 { + color: #90a959; + } + + .highlight .sa { + color: #aa759f; + } + + .highlight .sr { + color: #75b5aa; + } + + .highlight .si { + color: #b76d45; + } + + .highlight .se { + color: #b76d45; + } + + .highlight .nn { + color: #f4bf75; + } + + .highlight .nc { + color: #f4bf75; + } + + .highlight .no { + color: #f4bf75; + } + + .highlight .na { + color: #6a9fb5; + } + + .highlight .m, + .highlight .mb, + .highlight .mf, + .highlight .mh, + .highlight .mi, + .highlight .il, + .highlight .mo, + .highlight .mx { + color: #90a959; + } + + .highlight .ss { + color: #90a959; + } +} diff --git a/_sass/themes/_light.scss b/_sass/themes/_light.scss new file mode 100644 index 00000000..14c3962b --- /dev/null +++ b/_sass/themes/_light.scss @@ -0,0 +1,313 @@ +@mixin styles { + /* Framework color */ + --main-bg: white; + --mask-bg: #c1c3c5; + --main-border-color: #f3f3f3; + + /* Common color */ + --text-color: #34343c; + --text-muted-color: #757575; + --text-muted-highlight-color: inherit; + --heading-color: #2a2a2a; + --label-color: #585858; + --blockquote-border-color: #eeeeee; + --blockquote-text-color: #757575; + --link-color: #0056b2; + --link-underline-color: #dee2e6; + --button-bg: #ffffff; + --btn-border-color: #e9ecef; + --btn-backtotop-color: #686868; + --btn-backtotop-border-color: #f1f1f1; + --checkbox-color: #c5c5c5; + --checkbox-checked-color: #07a8f7; + --img-bg: radial-gradient( + circle, + rgb(255, 255, 255) 0%, + rgb(239, 239, 239) 100% + ); + --shimmer-bg: linear-gradient( + 90deg, + rgba(250, 250, 250, 0) 0%, + rgba(232, 230, 230, 1) 50%, + rgba(250, 250, 250, 0) 100% + ); + + /* Sidebar */ + --site-title-color: rgb(113, 113, 113); + --site-subtitle-color: #717171; + --sidebar-bg: #f6f8fa; + --sidebar-border-color: #efefef; + --sidebar-muted-color: #545454; + --sidebar-active-color: #1d1d1d; + --sidebar-hover-bg: rgb(223, 233, 241, 0.64); + --sidebar-btn-bg: white; + --sidebar-btn-color: #8e8e8e; + --avatar-border-color: white; + + /* Topbar */ + --topbar-bg: rgb(255, 255, 255, 0.7); + --topbar-text-color: rgb(78, 78, 78); + --search-border-color: rgb(240, 240, 240); + --search-icon-color: #c2c6cc; + --input-focus-border-color: #b8b8b8; + + /* Home page */ + --post-list-text-color: dimgray; + --btn-patinator-text-color: #555555; + --btn-paginator-hover-color: var(--sidebar-bg); + + /* Posts */ + --toc-highlight: #0550ae; + --toc-popup-border-color: lightgray; + --btn-share-color: gray; + --btn-share-hover-color: #0d6efd; + --card-bg: white; + --card-hovor-bg: #e2e2e2; + --card-shadow: rgb(104, 104, 104, 0.05) 0 2px 6px 0, + rgba(211, 209, 209, 0.15) 0 0 0 1px; + --footnote-target-bg: lightcyan; + --tb-odd-bg: #fbfcfd; + --tb-border-color: #eaeaea; + --dash-color: silver; + --kbd-wrap-color: #bdbdbd; + --kbd-text-color: var(--text-color); + --kbd-bg-color: white; + --prompt-text-color: rgb(46, 46, 46, 0.77); + --prompt-tip-bg: rgb(123, 247, 144, 0.2); + --prompt-tip-icon-color: #03b303; + --prompt-info-bg: #e1f5fe; + --prompt-info-icon-color: #0070cb; + --prompt-warning-bg: rgb(255, 243, 205); + --prompt-warning-icon-color: #ef9c03; + --prompt-danger-bg: rgb(248, 215, 218, 0.56); + --prompt-danger-icon-color: #df3c30; + + /* Tags */ + --tag-border: #dee2e6; + --tag-shadow: var(--btn-border-color); + --tag-hover: rgb(222, 226, 230); + --search-tag-bg: #f8f9fa; + + /* Categories */ + --categories-border: rgba(0, 0, 0, 0.125); + --categories-hover-bg: var(--btn-border-color); + --categories-icon-hover-color: darkslategray; + + /* Archive */ + --timeline-color: rgba(0, 0, 0, 0.075); + --timeline-node-bg: #c2c6cc; + --timeline-year-dot-color: #ffffff; + + /* --- Custom code light mode colors --- */ + --language-border-color: #ececec; + --highlight-bg-color: #f6f8fa; + --highlighter-rouge-color: #3f596f; + --highlight-lineno-color: #9e9e9e; + --inline-code-bg: rgba(25, 25, 28, 0.05); + --code-color: #3a3a3a; + --code-header-text-color: #a3a3a3; + --code-header-muted-color: #e5e5e5; + --code-header-icon-color: #c9c8c8; + --clipboard-checked-color: #43c743; + + [class^='prompt-'] { + --link-underline-color: rgb(219, 216, 216); + } + + .dark { + display: none; + } + + /* --- Syntax highlight theme from `rougify style github` --- */ + + .highlight table td { + padding: 5px; + } + + .highlight table pre { + margin: 0; + } + + .highlight, + .highlight .w { + color: #24292f; + background-color: #f6f8fa; + } + + .highlight .k, + .highlight .kd, + .highlight .kn, + .highlight .kp, + .highlight .kr, + .highlight .kt, + .highlight .kv { + color: #cf222e; + } + + .highlight .gr { + color: #f6f8fa; + } + + .highlight .gd { + color: #82071e; + background-color: #ffebe9; + } + + .highlight .nb { + color: #953800; + } + + .highlight .nc { + color: #953800; + } + + .highlight .no { + color: #953800; + } + + .highlight .nn { + color: #953800; + } + + .highlight .sr { + color: #116329; + } + + .highlight .na { + color: #116329; + } + + .highlight .nt { + color: #116329; + } + + .highlight .gi { + color: #116329; + background-color: #dafbe1; + } + + .highlight .kc { + color: #0550ae; + } + + .highlight .l, + .highlight .ld, + .highlight .m, + .highlight .mb, + .highlight .mf, + .highlight .mh, + .highlight .mi, + .highlight .il, + .highlight .mo, + .highlight .mx { + color: #0550ae; + } + + .highlight .sb { + color: #0550ae; + } + + .highlight .bp { + color: #0550ae; + } + + .highlight .ne { + color: #0550ae; + } + + .highlight .nl { + color: #0550ae; + } + + .highlight .py { + color: #0550ae; + } + + .highlight .nv, + .highlight .vc, + .highlight .vg, + .highlight .vi, + .highlight .vm { + color: #0550ae; + } + + .highlight .o, + .highlight .ow { + color: #0550ae; + } + + .highlight .gh { + color: #0550ae; + font-weight: bold; + } + + .highlight .gu { + color: #0550ae; + font-weight: bold; + } + + .highlight .s, + .highlight .sa, + .highlight .sc, + .highlight .dl, + .highlight .sd, + .highlight .s2, + .highlight .se, + .highlight .sh, + .highlight .sx, + .highlight .s1, + .highlight .ss { + color: #0a3069; + } + + .highlight .nd { + color: #8250df; + } + + .highlight .nf, + .highlight .fm { + color: #8250df; + } + + .highlight .err { + color: #f6f8fa; + background-color: #82071e; + } + + .highlight .c, + .highlight .ch, + .highlight .cd, + .highlight .cm, + .highlight .cp, + .highlight .cpf, + .highlight .c1, + .highlight .cs { + color: #68717a; + } + + .highlight .gl { + color: #68717a; + } + + .highlight .gt { + color: #68717a; + } + + .highlight .ni { + color: #24292f; + } + + .highlight .si { + color: #24292f; + } + + .highlight .ge { + color: #24292f; + font-style: italic; + } + + .highlight .gs { + color: #24292f; + font-weight: bold; + } +} diff --git a/_sass/variables-hook.scss b/_sass/variables-hook.scss deleted file mode 100644 index f27e0eb8..00000000 --- a/_sass/variables-hook.scss +++ /dev/null @@ -1,3 +0,0 @@ -/* - Appending custom SCSS variables will override the default ones in `_sass/addon/variables.scsss` -*/ diff --git a/assets/css/jekyll-theme-chirpy.scss b/assets/css/jekyll-theme-chirpy.scss index d20545ba..7ff89bf7 100644 --- a/assets/css/jekyll-theme-chirpy.scss +++ b/assets/css/jekyll-theme-chirpy.scss @@ -1,7 +1,7 @@ --- --- -@import 'main +@use 'main {%- if jekyll.environment == 'production' -%} .bundle {%- endif -%} diff --git a/package.json b/package.json index d6beea03..aa83ee72 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "homepage": "https://github.com/cotes2020/jekyll-theme-chirpy/", "scripts": { "build": "concurrently npm:build:*", - "build:css": "purgecss -c purgecss.config.js", + "build:css": "node purgecss.js", "build:js": "rollup -c --bundleConfigAsCjs --environment BUILD:production", "watch:js": "rollup -c --bundleConfigAsCjs -w", "lint:scss": "stylelint _sass/**/*.scss", diff --git a/purgecss.config.js b/purgecss.config.js deleted file mode 100644 index de370dea..00000000 --- a/purgecss.config.js +++ /dev/null @@ -1,23 +0,0 @@ -const fs = require('fs'); -const DIST_PATH = '_sass/dist'; - -fs.rm(DIST_PATH, { recursive: true, force: true }, (err) => { - if (err) { - throw err; - } - - fs.mkdirSync(DIST_PATH); -}); - -module.exports = { - content: ['_includes/**/*.html', '_layouts/**/*.html', '_javascript/**/*.js'], - css: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], - keyframes: true, - variables: true, - output: `${DIST_PATH}/bootstrap.css`, - // The `safelist` should be changed appropriately for future development - safelist: { - standard: [/^collaps/, /^w-/, 'shadow', 'border', 'kbd'], - greedy: [/^col-/, /tooltip/] - } -}; diff --git a/purgecss.js b/purgecss.js new file mode 100644 index 00000000..ad42db29 --- /dev/null +++ b/purgecss.js @@ -0,0 +1,30 @@ +const fs = require('fs').promises; +const { PurgeCSS } = require('purgecss'); +const DIST_PATH = '_sass/vendors'; +const output = `${DIST_PATH}/_bootstrap.scss`; + +const config = { + content: ['_includes/**/*.html', '_layouts/**/*.html', '_javascript/**/*.js'], + css: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], + keyframes: true, + variables: true, + // The `safelist` should be changed appropriately for future development + safelist: { + standard: [/^collaps/, /^w-/, 'shadow', 'border', 'kbd'], + greedy: [/^col-/, /tooltip/] + } +}; + +function main() { + fs.rm(DIST_PATH, { recursive: true, force: true }) + .then(() => fs.mkdir(DIST_PATH)) + .then(() => new PurgeCSS().purge(config)) + .then((result) => { + return fs.writeFile(output, result[0].css); + }) + .catch((err) => { + console.error('Error during PurgeCSS process:', err); + }); +} + +main(); diff --git a/tools/init.sh b/tools/init.sh index 2ad72ab9..d710182b 100755 --- a/tools/init.sh +++ b/tools/init.sh @@ -92,7 +92,8 @@ init_files() { npm i && npm run build # track the CSS/JS output - _sedi "/.*\/dist$/d" .gitignore + _sedi "/^_sass\/vendors/d" .gitignore + _sedi "/^assets\/js\/dist/d" .gitignore } commit() { diff --git a/tools/release.sh b/tools/release.sh index 522c892c..36ca88af 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -15,7 +15,7 @@ NODE_SPEC="package.json" CHANGELOG="docs/CHANGELOG.md" CONFIG="_config.yml" -CSS_DIST="_sass/dist" +CSS_DIST="_sass/vendors" JS_DIST="assets/js/dist" FILES=( From 5756b8fc2636071de9bf7a137fec1dec811a9043 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 25 Nov 2024 00:18:06 +0800 Subject: [PATCH 073/177] build(deps-dev): upgrade dependencies Close #2058 --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index aa83ee72..36f77e53 100644 --- a/package.json +++ b/package.json @@ -28,25 +28,25 @@ "bootstrap": "^5.3.3" }, "devDependencies": { - "@babel/core": "^7.25.2", - "@babel/plugin-transform-class-properties": "^7.25.4", - "@babel/plugin-transform-private-methods": "^7.25.7", - "@babel/preset-env": "^7.25.4", - "@commitlint/cli": "^19.5.0", - "@commitlint/config-conventional": "^19.5.0", + "@babel/core": "^7.26.0", + "@babel/plugin-transform-class-properties": "^7.25.9", + "@babel/plugin-transform-private-methods": "^7.25.9", + "@babel/preset-env": "^7.26.0", + "@commitlint/cli": "^19.6.0", + "@commitlint/config-conventional": "^19.6.0", "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-node-resolve": "^15.2.3", + "@rollup/plugin-node-resolve": "^15.3.0", "@rollup/plugin-terser": "^0.4.4", "@semantic-release/changelog": "^6.0.3", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", - "concurrently": "^9.0.1", + "concurrently": "^9.1.0", "conventional-changelog-conventionalcommits": "^8.0.0", - "husky": "^9.1.6", - "purgecss": "^6.0.0", - "rollup": "^4.21.3", - "semantic-release": "^24.1.1", - "stylelint": "^16.9.0", + "husky": "^9.1.7", + "purgecss": "^7.0.2", + "rollup": "^4.27.4", + "semantic-release": "^24.2.0", + "stylelint": "^16.10.0", "stylelint-config-standard-scss": "^13.1.0" }, "prettier": { From 11647697bbacb84df6171a0ac7947a0e4fdef5da Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 25 Nov 2024 03:55:11 +0800 Subject: [PATCH 074/177] build(deps): update dependencies version --- _data/origin/cors.yml | 8 ++++---- assets/lib | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index afdb3d9e..e9bb4eb9 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -20,17 +20,17 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour # Libraries toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.29.0/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.js fontawesome: - css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.6.0/css/all.min.css + css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.7.1/css/all.min.css search: js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js mermaid: - js: https://cdn.jsdelivr.net/npm/mermaid@11.0.2/dist/mermaid.min.js + js: https://cdn.jsdelivr.net/npm/mermaid@11.4.0/dist/mermaid.min.js dayjs: js: diff --git a/assets/lib b/assets/lib index a231bc7e..b9e18a15 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit a231bc7e2c67198e604950cb2be9147a0b2020c0 +Subproject commit b9e18a1510e3be5de250ed34205da318b76474e0 From 5265b039741555943f9a6f0451287aefb6810f28 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Thu, 28 Nov 2024 02:58:25 +0800 Subject: [PATCH 075/177] feat: support vertical scrolling for toc in desktop mode (#2064) --- _includes/toc.html | 5 +-- _layouts/default.html | 2 +- _sass/abstracts/_placeholders.scss | 4 +++ _sass/layout/_panel.scss | 12 +++++--- _sass/pages/_post.scss | 49 +++++++++++++++++++++++++++--- 5 files changed, 60 insertions(+), 12 deletions(-) diff --git a/_includes/toc.html b/_includes/toc.html index 49c8f905..883bf135 100644 --- a/_includes/toc.html +++ b/_includes/toc.html @@ -1,8 +1,9 @@ {% include toc-status.html %} {% if enable_toc %} -
-

{{- site.data.locales[include.lang].panel.toc -}}

+
+
+

{{- site.data.locales[include.lang].panel.toc -}}

{% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index c83c561c..a55bfefe 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -33,7 +33,7 @@ -
{% endcapture %} diff --git a/assets/js/data/search.json b/assets/js/data/search.json index 2601ed07..32bcff9b 100644 --- a/assets/js/data/search.json +++ b/assets/js/data/search.json @@ -5,16 +5,16 @@ swcache: true [ {% for post in site.posts %} + {%- capture description -%} + {% include post-description.html %} + {%- endcapture -%} { "title": {{ post.title | jsonify }}, "url": {{ post.url | relative_url | jsonify }}, "categories": {{ post.categories | join: ', ' | jsonify }}, "tags": {{ post.tags | join: ', ' | jsonify }}, "date": "{{ post.date }}", - {% include no-linenos.html content=post.content %} - {% assign _content = content | strip_html | strip_newlines %} - "snippet": {{ _content | truncate: 200 | jsonify }}, - "content": {{ _content | jsonify }} + "content": "{{ description }}" }{% unless forloop.last %},{% endunless %} {% endfor %} ] From 231956d77ad2cd05293e2eb0bcb9f6238aaf840b Mon Sep 17 00:00:00 2001 From: algorithmic-parallels <197329719+algorithmic-parallels@users.noreply.github.com> Date: Thu, 6 Feb 2025 00:27:54 -0500 Subject: [PATCH 097/177] docs: using long form Jekyll subcommand (#2231) --- _posts/2019-08-09-getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 26811269..71383938 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -68,7 +68,7 @@ For Unix-like systems, you can set up the environment natively for optimal perfo To run the site locally, use the following command: ```terminal -$ bundle exec jekyll s +$ bundle exec jekyll serve ``` > If you are using Dev Containers, you must run that command in the **VS Code** Terminal. From 7d4d35cd10109e78d60fbb6b25a9b205f780ad63 Mon Sep 17 00:00:00 2001 From: MasihGhaznavi <48735862+masihgh@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:58:39 +0330 Subject: [PATCH 098/177] feat(i18n): add persian language (#2238) --- _data/locales/fa-IR.yaml | 91 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 _data/locales/fa-IR.yaml diff --git a/_data/locales/fa-IR.yaml b/_data/locales/fa-IR.yaml new file mode 100644 index 00000000..d5c6e0eb --- /dev/null +++ b/_data/locales/fa-IR.yaml @@ -0,0 +1,91 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: پست + category: دسته‌بندی + tag: برچسب + +# The tabs of sidebar +tabs: + # format: : + home: خانه + categories: دسته‌بندی‌ها + tags: برچسب‌ها + archives: آرشیو + about: درباره + +# the text displayed in the search bar & search results +search: + hint: جستجو + cancel: لغو + no_results: متأسفیم! هیچ نتیجه‌ای یافت نشد. + +panel: + lastmod: آخرین به‌روزرسانی + trending_tags: برچسب‌های پرطرفدار + toc: فهرست مطالب + +copyright: + # Shown at the bottom of the post + license: + template: این پست تحت مجوز :LICENSE_NAME توسط نویسنده منتشر شده است. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: برخی حقوق محفوظ است. + verbose: >- + مگر اینکه خلاف آن ذکر شده باشد، پست‌های وبلاگ در این سایت + تحت مجوز Creative Commons Attribution 4.0 International (CC BY 4.0) توسط نویسنده منتشر شده‌اند. + +meta: با استفاده از :PLATFORM قالب :THEME + +not_found: + statement: متأسفیم، لینک زیر معتبر نیست یا به صفحه‌ای که وجود ندارد اشاره می‌کند. + +notification: + update_found: نسخه جدیدی از محتوا موجود است. + update: به‌روزرسانی + +# ----- Posts related labels ----- + +post: + written_by: نوشته شده توسط + posted: منتشر شده + updated: به‌روزرسانی شده + words: کلمات + pageview_measure: بازدیدها + read_time: + unit: دقیقه + prompt: زمان مطالعه + relate_posts: بیشتر بخوانید + share: اشتراک‌گذاری + button: + next: جدیدتر + previous: قدیمی‌تر + copy_code: + succeed: کپی شد! + share_link: + title: کپی لینک + succeed: لینک با موفقیت کپی شد! + +# Date time format. +# See: , +df: + post: + strftime: "%b %e, %Y" + dayjs: "ll" + archives: + strftime: "%b" + dayjs: "MMM" + +# categories page +categories: + category_measure: + singular: دسته‌بندی + plural: دسته‌بندی‌ها + post_measure: + singular: پست + plural: پست‌ها From e3158642c3aa248fc1f655773e903cafa862972e Mon Sep 17 00:00:00 2001 From: Corey Goldberg <1113081+cgoldberg@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:06:37 -0500 Subject: [PATCH 099/177] docs: fix typo in `2019-08-08-write-a-new-post.md` (#2281) Signed-off-by: Corey Goldberg <1113081+cgoldberg@users.noreply.github.com> --- _posts/2019-08-08-write-a-new-post.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 085e7d67..10201655 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -21,7 +21,7 @@ Basically, you need to fill the [Front Matter](https://jekyllrb.com/docs/front-m --- title: TITLE date: YYYY-MM-DD HH:MM:SS +/-TTTT -categories: [TOP_CATEGORIE, SUB_CATEGORIE] +categories: [TOP_CATEGORY, SUB_CATEGORY] tags: [TAG] # TAG names should always be lowercase --- ``` From 54d4d59d22ac543a14bfbd9bb3d6fb6756056041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkalp=20Burak=20KAYRANCIO=C4=9ELU?= Date: Sat, 8 Mar 2025 17:24:47 +0300 Subject: [PATCH 100/177] perf(seo): improve accessibility and aligns with best practices (#2289) --- _includes/topbar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/topbar.html b/_includes/topbar.html index fd68d1fe..09bbc208 100644 --- a/_includes/topbar.html +++ b/_includes/topbar.html @@ -40,7 +40,7 @@ - @@ -55,7 +55,7 @@ {% endif %} - From 571c90f13011eb91d0e1392218f3953060b920c9 Mon Sep 17 00:00:00 2001 From: nakamura <71050561+manabu-nakamura@users.noreply.github.com> Date: Sat, 29 Mar 2025 04:54:54 +0900 Subject: [PATCH 101/177] feat(i18n): add Japanese locale (#2295) --- _data/locales/ja-JP.yml | 84 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 _data/locales/ja-JP.yml diff --git a/_data/locales/ja-JP.yml b/_data/locales/ja-JP.yml new file mode 100644 index 00000000..8e016b99 --- /dev/null +++ b/_data/locales/ja-JP.yml @@ -0,0 +1,84 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: 投稿 + category: カテゴリー + tag: タグ + +# The tabs of sidebar +tabs: + # format: : + home: ホーム + categories: カテゴリー + tags: タグ + archives: アーカイブ + about: このサイトについて + +# the text displayed in the search bar & search results +search: + hint: 検索 + cancel: キャンセル + no_results: 該当なし + +panel: + lastmod: 最近更新された投稿 + trending_tags: トレンドのタグ + toc: コンテンツ + +copyright: + # Shown at the bottom of the post + license: + template: この投稿は投稿者によって :LICENSE_NAME の下でライセンスされています。 + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Some rights reserved. + verbose: >- + Except where otherwise noted, the blog posts on this site are licensed + under the Creative Commons Attribution 4.0 International (CC BY 4.0) License by the author. + +meta: :PLATFORM 用の :THEME を使用しています。 + +not_found: + statement: このURLは存在しないものを指し示しています。 + +notification: + update_found: 新しいバージョンが利用可能です。 + update: 更新 + +# ----- Posts related labels ----- + +post: + written_by: 投稿者 + posted: 投稿日 + updated: 更新日 + words: 語 + pageview_measure: 回閲覧 + read_time: + unit: 分 + prompt: で読めます + relate_posts: さらに読む + share: シェア + button: + next: 次 + previous: 前 + copy_code: + succeed: コピーしました + share_link: + title: リンクをコピー + succeed: リンクをコピーしました + +# Date time format. +# See: , +df: + post: + strftime: "%Y/%m/%d" + dayjs: "YYYY/MM/DD" + +# categories page +categories: + category_measure: カテゴリー + post_measure: 投稿 From db40db6d3df7058a28b04f42ff6ee79954a5de1c Mon Sep 17 00:00:00 2001 From: Alejandro Date: Sat, 5 Apr 2025 01:28:29 +0200 Subject: [PATCH 102/177] chore: add parameter in `search-results.html` (#2330) --- _includes/search-results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/search-results.html b/_includes/search-results.html index 00a31828..04a10305 100644 --- a/_includes/search-results.html +++ b/_includes/search-results.html @@ -3,7 +3,7 @@
- {% include_cached trending-tags.html %} + {% include_cached trending-tags.html lang=include.lang %}
From f7449299e88c71da2104f0007f2db23a8fa798be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Mon, 7 Apr 2025 13:36:32 +0200 Subject: [PATCH 103/177] fix: prevent the search bar from moving when focused (#2336) --- _includes/topbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/topbar.html b/_includes/topbar.html index 09bbc208..735f1d1c 100644 --- a/_includes/topbar.html +++ b/_includes/topbar.html @@ -1,6 +1,6 @@ -
+
Date: Sun, 13 Apr 2025 22:16:47 +0800 Subject: [PATCH 104/177] feat(i18n): add Catalan Spanish locale translation (#2349) --- _data/locales/ca-ES.yml | 84 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 _data/locales/ca-ES.yml diff --git a/_data/locales/ca-ES.yml b/_data/locales/ca-ES.yml new file mode 100644 index 00000000..e3d5b39c --- /dev/null +++ b/_data/locales/ca-ES.yml @@ -0,0 +1,84 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: Entrada + category: Categoria + tag: Etiqueta + +# The tabs of sidebar +tabs: + # format: : + home: Inici + categories: Categories + tags: Etiquetes + archives: Arxiu + about: Sobre + +# the text displayed in the search bar & search results +search: + hint: Cercar + cancel: Cancel·lar + no_results: Ups! No s'han trobat resultats. + +panel: + lastmod: Actualitzat recentment + trending_tags: Etiquetes populars + toc: Taula de continguts + +copyright: + # Shown at the bottom of the post + license: + template: Aquesta entrada està llicenciada sota :LICENSE_NAME per l'autor. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Alguns drets reservats. + verbose: >- + Excepte que s'indiqui explícitament, les entrades d'aquest blog estan llicenciades + sota la llicència Creative Commons Attribution 4.0 International (CC BY 4.0) per l'autor. + +meta: Fet amb :PLATFORM utilitzant el tema :THEME + +not_found: + statement: Ho sentim, hem perdut aquesta URL o apunta a alguna cosa que no existeix. + +notification: + update_found: Hi ha una nova versió de contingut disponible. + update: Actualitzar + +# ----- Posts related labels ----- + +post: + written_by: Per + posted: Publicat + updated: Actualitzat + words: paraules + pageview_measure: visites + read_time: + unit: min + prompt: " de lectura" + relate_posts: Entrades relacionades + share: Compartir + button: + next: Següent + previous: Anterior + copy_code: + succeed: Copiat! + share_link: + title: Copiar enllaç + succeed: Enllaç copiat! + +# Date time format. +# See: , +df: + post: + strftime: "%Y/%m/%d" + dayjs: "YYYY/MM/DD" + +# categories page +categories: + category_measure: categories + post_measure: entrades From 7708adbf30e6dea51a84311b86bc224739f656f6 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Wed, 16 Apr 2025 18:08:43 +0800 Subject: [PATCH 105/177] fix: recognize global theme mode (#2357) --- _javascript/modules/theme.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_javascript/modules/theme.js b/_javascript/modules/theme.js index f9ebf202..49e4e89b 100644 --- a/_javascript/modules/theme.js +++ b/_javascript/modules/theme.js @@ -39,7 +39,10 @@ class Theme { } static get #mode() { - return sessionStorage.getItem(this.#modeKey); + return ( + sessionStorage.getItem(this.#modeKey) || + document.documentElement.getAttribute(this.#modeAttr) + ); } static get #isDarkMode() { From c62644759cb4e0e07f7ee6eb9503ef69be62371b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Thu, 24 Apr 2025 14:23:43 +0200 Subject: [PATCH 106/177] fix(ui): fix incomplete border color on hover for tags (#2359) --- _sass/abstracts/_placeholders.scss | 3 +++ _sass/pages/_post.scss | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_sass/abstracts/_placeholders.scss b/_sass/abstracts/_placeholders.scss index 9a2b8ac8..d8a10604 100644 --- a/_sass/abstracts/_placeholders.scss +++ b/_sass/abstracts/_placeholders.scss @@ -31,7 +31,10 @@ } %tag-hover { + @extend %link-color; + background: var(--tag-hover); + border-color: var(--tag-hover); transition: background 0.35s ease-in-out; } diff --git a/_sass/pages/_post.scss b/_sass/pages/_post.scss index 12a301f5..2cd3eee3 100644 --- a/_sass/pages/_post.scss +++ b/_sass/pages/_post.scss @@ -143,9 +143,7 @@ header { .post-tag { &:hover { - @extend %link-hover; @extend %tag-hover; - @extend %no-bottom-border; } } } From b48ea68bf7b98a093b8d7d513a1cc1f7729effc4 Mon Sep 17 00:00:00 2001 From: iSpeakNerd <96841384+iSpeakNerd@users.noreply.github.com> Date: Thu, 24 Apr 2025 05:25:46 -0700 Subject: [PATCH 107/177] chore: update `linkedin` sharing url (#2307) --- _data/share.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/share.yml b/_data/share.yml index 6f975680..edbc02b2 100644 --- a/_data/share.yml +++ b/_data/share.yml @@ -18,7 +18,7 @@ platforms: # # - type: Linkedin # icon: "fab fa-linkedin" - # link: "https://www.linkedin.com/sharing/share-offsite/?url=URL" + # link: "https://www.linkedin.com/feed/?shareActive=true&shareUrl=URL" # # - type: Weibo # icon: "fab fa-weibo" From 23d953c313b2ece9f2977266b2cce5ede66d12c2 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 3 May 2025 16:14:50 +0800 Subject: [PATCH 108/177] chore(deps): remove plugin `jekyll-redirect-from` Discussed in #2313 --- assets/404.html | 7 +------ jekyll-theme-chirpy.gemspec | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/assets/404.html b/assets/404.html index af89d6d1..cb129c06 100644 --- a/assets/404.html +++ b/assets/404.html @@ -2,13 +2,8 @@ layout: page title: "404: Page not found" permalink: /404.html - -redirect_from: - - /norobots/ - - /assets/ - - /posts/ --- {% include lang.html %} -

{{ site.data.locales[lang].not_found.statement }}

+

{{ site.data.locales[lang].not_found.statement }}

\ No newline at end of file diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index e3ad5d67..969e4d08 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll", "~> 4.3" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" - spec.add_runtime_dependency "jekyll-redirect-from", "~> 0.16" spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.8" spec.add_runtime_dependency "jekyll-archives", "~> 2.2" spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4" From 9f38a2deadc4668ab9452360b70883b6aedeb0f6 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 3 May 2025 16:18:52 +0800 Subject: [PATCH 109/177] refactor: move the path of `theme.js` --- _javascript/{modules => }/theme.js | 0 rollup.config.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename _javascript/{modules => }/theme.js (100%) diff --git a/_javascript/modules/theme.js b/_javascript/theme.js similarity index 100% rename from _javascript/modules/theme.js rename to _javascript/theme.js diff --git a/rollup.config.js b/rollup.config.js index 0e8a6c74..d9322f83 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -80,7 +80,7 @@ export default [ build('page'), build('post'), build('misc'), - build('theme', { src: `${SRC_DEFAULT}/modules`, outputName: 'Theme' }), + build('theme', { outputName: 'Theme' }), build('app', { src: SRC_PWA, jekyll: true }), build('sw', { src: SRC_PWA, jekyll: true }) ]; From 61ae6cced8e9ea412ff6f4c2cc3ba5ec7bc001a5 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 5 May 2025 11:14:07 +0800 Subject: [PATCH 110/177] chore(dev-deps): add eslint config file --- _config.yml | 2 +- eslint.config.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 eslint.config.js diff --git a/_config.yml b/_config.yml index d6f84c57..0a78679d 100644 --- a/_config.yml +++ b/_config.yml @@ -213,7 +213,7 @@ exclude: - README.md - LICENSE - purgecss.js - - rollup.config.js + - "*.config.js" - "package*.json" jekyll-archives: diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 00000000..c8f6d53d --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,5 @@ +export default [ + { + files: ['_javascript/**/*.js'] + } +]; From ada38aad969efdbe311ffcf6e933bf5ef17773f8 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 5 May 2025 11:15:08 +0800 Subject: [PATCH 111/177] chore: avoid auto-formatting liquid and sass mixed code --- assets/css/jekyll-theme-chirpy.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/jekyll-theme-chirpy.scss b/assets/css/jekyll-theme-chirpy.scss index 7ff89bf7..ff1f01c0 100644 --- a/assets/css/jekyll-theme-chirpy.scss +++ b/assets/css/jekyll-theme-chirpy.scss @@ -1,6 +1,7 @@ --- --- +/* prettier-ignore */ @use 'main {%- if jekyll.environment == 'production' -%} .bundle From 401e2af0f8a173d8437e03027c7aff558e8c0bde Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Mon, 5 May 2025 11:55:48 +0800 Subject: [PATCH 112/177] fix: avoid `mathjax` loading failure on page refresh (#2389) --- _includes/js-selector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/js-selector.html b/_includes/js-selector.html index fd4acca8..5a80532f 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -66,7 +66,7 @@ {% if page.math %} - + {% endif %} From d0f8f9553e41536eb84ae2fdd3f3bc9d13f7ef8c Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 11 May 2025 22:19:18 +0800 Subject: [PATCH 113/177] fix: improve accuracy of moving `img` element classes (#2399) --- _includes/refactor-content.html | 44 ++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/_includes/refactor-content.html b/_includes/refactor-content.html index 8d298cde..4586f5c4 100644 --- a/_includes/refactor-content.html +++ b/_includes/refactor-content.html @@ -88,9 +88,41 @@ {% endfor %} + {% assign _wrapper_class = '' %} + {% if _class %} - {% capture _old_class %}class="{{ _class }}"{% endcapture %} - {% assign _left = _left | remove: _old_class %} + {% assign _remain = _class %} + {% assign _class_array = _class | split: ' ' %} + + {% for c in _class_array %} + {% assign _pick = false %} + + {% case c %} + {% when 'preview-img', 'normal', 'left', 'right', 'light', 'dark' %} + {% assign _pick = true %} + {% else %} + {% if c contains '-' %} + {% assign start = c | split: '-' | first %} + {% if start == 'w' %} + {% assign _pick = true %} + {% endif %} + {% endif %} + {% endcase %} + + {% if _pick %} + {% assign _remain = _remain | remove: c | strip %} + {% assign _wrapper_class = _wrapper_class | append: ' ' | append: c %} + {% endif %} + {% endfor %} + + {% unless _wrapper_class == '' %} + {% capture _old_class %}class="{{ _class }}"{% endcapture %} + {% assign _left = _left | remove: _old_class %} + {% unless _remain == '' %} + {% capture _new_class %}class="{{ _remain }}"{% endcapture %} + {% assign _left = _left | append: _new_class %} + {% endunless %} + {% endunless %} {% endif %} {% assign _final_src = null %} @@ -110,7 +142,7 @@ {% if _lqip %} {% assign _lazyload = false %} - {% assign _class = _class | append: ' blur' %} + {% assign _wrapper_class = _wrapper_class | append: ' blur' %} {% unless _lqip contains 'data:' %} {% assign _lqip_alt = 'lqip="' | append: _path_prefix %} @@ -121,7 +153,7 @@ {% assign _left = _left | replace: 'src=', 'data-src=' | replace: ' lqip=', ' data-lqip="true" src=' %} {% else %} - {% assign _class = _class | append: ' shimmer' %} + {% assign _wrapper_class = _wrapper_class | append: ' shimmer' %} {% endif %} @@ -153,8 +185,8 @@ {% assign _wrapper_start = _final_src | default: _src | prepend: '' %} From 519e4f193a1e7163827e2b4b63a65a31c14064f7 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 18 May 2025 21:14:56 +0800 Subject: [PATCH 114/177] chore: upgrade dependencies to the latest version (#2409) --- _includes/head.html | 2 +- assets/lib | 2 +- package.json | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 4514666a..e24384d5 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -70,7 +70,7 @@ {% unless jekyll.environment == 'production' %} - + {% endunless %} diff --git a/assets/lib b/assets/lib index b9e18a15..02f4ada6 160000 --- a/assets/lib +++ b/assets/lib @@ -1 +1 @@ -Subproject commit b9e18a1510e3be5de250ed34205da318b76474e0 +Subproject commit 02f4ada65dc75197654c3265a37a6f5fbc39f17c diff --git a/package.json b/package.json index 3fc089c2..8e2232c0 100644 --- a/package.json +++ b/package.json @@ -25,29 +25,29 @@ }, "dependencies": { "@popperjs/core": "^2.11.8", - "bootstrap": "^5.3.3" + "bootstrap": "^5.3.6" }, "devDependencies": { - "@babel/core": "^7.26.0", - "@babel/plugin-transform-class-properties": "^7.25.9", - "@babel/plugin-transform-private-methods": "^7.25.9", - "@babel/preset-env": "^7.26.0", - "@commitlint/cli": "^19.6.0", - "@commitlint/config-conventional": "^19.6.0", + "@babel/core": "^7.27.1", + "@babel/plugin-transform-class-properties": "^7.27.1", + "@babel/plugin-transform-private-methods": "^7.27.1", + "@babel/preset-env": "^7.27.2", + "@commitlint/cli": "^19.8.1", + "@commitlint/config-conventional": "^19.8.1", "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-node-resolve": "^15.3.0", + "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-terser": "^0.4.4", "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^6.0.3", + "@semantic-release/exec": "^7.1.0", "@semantic-release/git": "^10.0.1", - "concurrently": "^9.1.0", + "concurrently": "^9.1.2", "conventional-changelog-conventionalcommits": "^8.0.0", "husky": "^9.1.7", "purgecss": "^7.0.2", - "rollup": "^4.27.4", - "semantic-release": "^24.2.0", - "stylelint": "^16.10.0", - "stylelint-config-standard-scss": "^13.1.0" + "rollup": "^4.41.0", + "semantic-release": "^24.2.4", + "stylelint": "^16.19.1", + "stylelint-config-standard-scss": "^15.0.1" }, "prettier": { "trailingComma": "none" From 53770e4923be1b0c16ad6c9f7b62def297ecff52 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 18 May 2025 13:17:30 +0000 Subject: [PATCH 115/177] chore(release): 7.3.0 ## [7.3.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.4...v7.3.0) (2025-05-18) ### Features * **i18n:** add Catalan Spanish locale translation ([#2349](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2349)) ([167c98c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/167c98c781d0607c90ede8fc73eb43dffeea6abd)) * **i18n:** add Dutch locale ([#2076](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2076)) ([981ddba](https://github.com/cotes2020/jekyll-theme-chirpy/commit/981ddba30e57934f9056b8d468f0d17db131e1e8)) * **i18n:** add Japanese locale ([#2295](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2295)) ([571c90f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/571c90f13011eb91d0e1392218f3953060b920c9)) * **i18n:** add persian language ([#2238](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2238)) ([7d4d35c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7d4d35cd10109e78d60fbb6b25a9b205f780ad63)) ### Bug Fixes * avoid `mathjax` loading failure on page refresh ([#2389](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2389)) ([401e2af](https://github.com/cotes2020/jekyll-theme-chirpy/commit/401e2af0f8a173d8437e03027c7aff558e8c0bde)) * improve accuracy of moving `img` element classes ([#2399](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2399)) ([d0f8f95](https://github.com/cotes2020/jekyll-theme-chirpy/commit/d0f8f9553e41536eb84ae2fdd3f3bc9d13f7ef8c)) * prevent the search bar from moving when focused ([#2336](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2336)) ([f744929](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f7449299e88c71da2104f0007f2db23a8fa798be)) * recognize global theme mode ([#2357](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2357)) ([7708adb](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7708adbf30e6dea51a84311b86bc224739f656f6)) * **search:** avoid missing spaces between paragraphs in search results ([#2199](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2199)) ([0eb7efa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0eb7efa7f53508bf6b48eb9d773d5c5047c3c525)) * **ui:** fix incomplete border color on hover for tags ([#2359](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2359)) ([c626447](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c62644759cb4e0e07f7ee6eb9503ef69be62371b)) ### Improvements * **seo:** improve accessibility and aligns with best practices ([#2289](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2289)) ([54d4d59](https://github.com/cotes2020/jekyll-theme-chirpy/commit/54d4d59d22ac543a14bfbd9bb3d6fb6756056041)) --- docs/CHANGELOG.md | 22 ++++++++++++++++++++++ jekyll-theme-chirpy.gemspec | 2 +- package.json | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0cfa89bf..24afe667 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [7.3.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.4...v7.3.0) (2025-05-18) + +### Features + +* **i18n:** add Catalan Spanish locale translation ([#2349](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2349)) ([167c98c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/167c98c781d0607c90ede8fc73eb43dffeea6abd)) +* **i18n:** add Dutch locale ([#2076](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2076)) ([981ddba](https://github.com/cotes2020/jekyll-theme-chirpy/commit/981ddba30e57934f9056b8d468f0d17db131e1e8)) +* **i18n:** add Japanese locale ([#2295](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2295)) ([571c90f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/571c90f13011eb91d0e1392218f3953060b920c9)) +* **i18n:** add persian language ([#2238](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2238)) ([7d4d35c](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7d4d35cd10109e78d60fbb6b25a9b205f780ad63)) + +### Bug Fixes + +* avoid `mathjax` loading failure on page refresh ([#2389](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2389)) ([401e2af](https://github.com/cotes2020/jekyll-theme-chirpy/commit/401e2af0f8a173d8437e03027c7aff558e8c0bde)) +* improve accuracy of moving `img` element classes ([#2399](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2399)) ([d0f8f95](https://github.com/cotes2020/jekyll-theme-chirpy/commit/d0f8f9553e41536eb84ae2fdd3f3bc9d13f7ef8c)) +* prevent the search bar from moving when focused ([#2336](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2336)) ([f744929](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f7449299e88c71da2104f0007f2db23a8fa798be)) +* recognize global theme mode ([#2357](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2357)) ([7708adb](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7708adbf30e6dea51a84311b86bc224739f656f6)) +* **search:** avoid missing spaces between paragraphs in search results ([#2199](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2199)) ([0eb7efa](https://github.com/cotes2020/jekyll-theme-chirpy/commit/0eb7efa7f53508bf6b48eb9d773d5c5047c3c525)) +* **ui:** fix incomplete border color on hover for tags ([#2359](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2359)) ([c626447](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c62644759cb4e0e07f7ee6eb9503ef69be62371b)) + +### Improvements + +* **seo:** improve accessibility and aligns with best practices ([#2289](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2289)) ([54d4d59](https://github.com/cotes2020/jekyll-theme-chirpy/commit/54d4d59d22ac543a14bfbd9bb3d6fb6756056041)) + ## [7.2.4](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.3...v7.2.4) (2024-12-21) ### Bug Fixes diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec index 969e4d08..07d64e43 100644 --- a/jekyll-theme-chirpy.gemspec +++ b/jekyll-theme-chirpy.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-chirpy" - spec.version = "7.2.4" + spec.version = "7.3.0" spec.authors = ["Cotes Chung"] spec.email = ["cotes.chung@gmail.com"] diff --git a/package.json b/package.json index 8e2232c0..6f2cfb0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jekyll-theme-chirpy", - "version": "7.2.4", + "version": "7.3.0", "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.", "repository": { "type": "git", From f5802b8a8a4fb94cd51a484e438f6ba2ba8d62c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolai=20Sk=C3=B8dt=20Holmgaard?= <24588044+Nicolai9852@users.noreply.github.com> Date: Wed, 21 May 2025 19:03:29 +0200 Subject: [PATCH 116/177] feat(i18n): add Danish locale (#2410) --- _data/locales/da-DK.yml | 86 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 _data/locales/da-DK.yml diff --git a/_data/locales/da-DK.yml b/_data/locales/da-DK.yml new file mode 100644 index 00000000..4b41fb38 --- /dev/null +++ b/_data/locales/da-DK.yml @@ -0,0 +1,86 @@ +# The layout text of site + +# ----- Commons label ----- + +layout: + post: Opslag + category: Kategori + tag: Tag + +# The tabs of sidebar +tabs: + # format: : + home: Hjem + categories: Kategorier + tags: Tags + archives: Arkiv + about: Om siden + +# the text displayed in the search bar & search results +search: + hint: søg + cancel: Afbryd + no_results: Ups! Ingen resultater fundet. + +panel: + lastmod: Senest opdateret + trending_tags: Populære tags + toc: Indhold + +copyright: + # Shown at the bottom of the post + license: + template: Dette opslag er licenseret under :LICENSE_NAME af forfatteren. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: Nogle rettigheder forbeholdes. + verbose: >- + Medmindre andet er angivet, er opslag på denne side beskyttet + under Creative Commons Attribution 4.0 International (CC BY 4.0) licensen af forfatteren. + +# meta: Using the :THEME theme for :PLATFORM. + +not_found: + statement: Beklager, vi har malpaceret denne URL, eller den peger på et sted, som ikke findes. + +notification: + update_found: En ny version af indholdet er fundet! + update: Opdater + +# ----- Posts related labels ----- + +post: + written_by: Af + posted: Udgivet + updated: Opdateret + words: ord + pageview_measure: visninger + read_time: + unit: min + prompt: læsetid + relate_posts: Læs videre + share: Del + button: + next: Nyere + previous: Ældre + copy_code: + succeed: Kopieret! + share_link: + title: Kopier link + succeed: Link kopieret! + +# Date time format. +# See: , +df: + post: + strftime: "%Y/%m/%d" + dayjs: "YYYY/MM/DD" + +# categories page +categories: + category_measure: + singular: kategori + plural: kategorier + post_measure: opslag From 18c48b4c49f896eeeeb52a8de1dca715add70c6a Mon Sep 17 00:00:00 2001 From: Zakaria Fatahi Date: Wed, 21 May 2025 19:06:12 +0200 Subject: [PATCH 117/177] feat(i18n): add locale files for some rtl languages (#2415) --- "_data/locales/dv\342\200\221MV.yml" | 90 ++++++++++++++++++++++++ _data/locales/{fa-IR.yaml => fa-IR.yml} | 16 ++--- _data/locales/ku-IQ.yml | 91 +++++++++++++++++++++++++ "_data/locales/ps\342\200\221AF.yml" | 90 ++++++++++++++++++++++++ _data/locales/ur-PK.yml | 90 ++++++++++++++++++++++++ 5 files changed, 369 insertions(+), 8 deletions(-) create mode 100644 "_data/locales/dv\342\200\221MV.yml" rename _data/locales/{fa-IR.yaml => fa-IR.yml} (85%) create mode 100644 _data/locales/ku-IQ.yml create mode 100644 "_data/locales/ps\342\200\221AF.yml" create mode 100644 _data/locales/ur-PK.yml diff --git "a/_data/locales/dv\342\200\221MV.yml" "b/_data/locales/dv\342\200\221MV.yml" new file mode 100644 index 00000000..680ca1f8 --- /dev/null +++ "b/_data/locales/dv\342\200\221MV.yml" @@ -0,0 +1,90 @@ +# The layout text of site in Dhivehi (Maldives) + +# ----- Commons label ----- + +layout: + post: ޕޯސްޓް + category: ނަތީޖާ + tag: ޓެގް + +# The tabs of sidebar +tabs: + # format: : + home: ހުންނަ + categories: ނަތީޖާތައް + tags: ޓެގްތައް + archives: އާރޗިވްސް + about: އިންސާން + +# the text displayed in the search bar & search results +search: + hint: ސާރޗް + cancel: ކެންސަލް + no_results: އޮޕްސް! އެއްވެސް ނުފެނުނީ. + +panel: + lastmod: އާދަމާ އޮޕްޑޭޓްކުރި + trending_tags: މަރާހު ޓެގްތައް + toc: ކޮންޓެންސް + +copyright: + # Shown at the bottom of the post + license: + template: މި ޕޯސްޓް :LICENSE_NAME އިން ލައިސަންސްކުރާ ނުވަތަ މުޤައްރާއަށް. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: އެކީ ބާރަށް ހުށަހަޅާ. + verbose: >- + އަދި އެ ރަނގަޅުގައި ނުލާހެވެސް، މި ސައިޓުގެ ޕޯސްޓްތައް + މުޤައްރާއަށް Creative Commons Attribution 4.0 International (CC BY 4.0) ލައިސަންސްކުރަނީ. + +meta: :PLATFORM އަށް :THEME ތީމް ބަލާލާށެވެ. + +not_found: + statement: ސޯރީ، މި ޔޫ.އާރއެލް މަށެވެއްނެ ނުވަތަ އެކަމެއް ނުވެއެވެ. + +notification: + update_found: ޔޫ ވާރޝަން ހުރިހާ. + update: އޮޕްޑޭޓް + +# ----- Posts related labels ----- + +post: + written_by: ލެކްއޯލް + posted: ޕޯސްޓްކުރެވި + updated: އޮޕްޑޭޓްކުރެވި + words: ބަސް + pageview_measure: ބަނޑުކުރާ + read_time: + unit: މިނެޓް + prompt: އިސްކާރު + relate_posts: އެއްޗެހި ފަހުރަށްދަން + share: ސެއާރް + button: + next: އަދާވަނަ + previous: ކޮނޯނި + copy_code: + succeed: ކޮޕީ ކުރެވި! + share_link: + title: ލިންކް ކޮޕީ ކުރު + succeed: ލިންކް ހަދަންކުރެވި! + +# Date time format. +# See: , +df: + post: + strftime: "%b %e, %Y" + dayjs: "ll" + archives: + strftime: "%b" + dayjs: "MMM" + +categories: + category_measure: + singular: ނަތީޖާ + plural: ނަތީޖާތައް + post_measure: + singular: ޕޯސްޓް + plural: ޕޯސްޓްތައް diff --git a/_data/locales/fa-IR.yaml b/_data/locales/fa-IR.yml similarity index 85% rename from _data/locales/fa-IR.yaml rename to _data/locales/fa-IR.yml index d5c6e0eb..7a33deb1 100644 --- a/_data/locales/fa-IR.yaml +++ b/_data/locales/fa-IR.yml @@ -37,10 +37,10 @@ copyright: # Displayed in the footer brief: برخی حقوق محفوظ است. verbose: >- - مگر اینکه خلاف آن ذکر شده باشد، پست‌های وبلاگ در این سایت + به‌جز مواردی که خلاف آن ذکر شده باشد، محتوای پست‌های این وبلاگ تحت مجوز Creative Commons Attribution 4.0 International (CC BY 4.0) توسط نویسنده منتشر شده‌اند. -meta: با استفاده از :PLATFORM قالب :THEME +meta: با استفاده از قالب :THEME برای :PLATFORM not_found: statement: متأسفیم، لینک زیر معتبر نیست یا به صفحه‌ای که وجود ندارد اشاره می‌کند. @@ -55,11 +55,11 @@ post: written_by: نوشته شده توسط posted: منتشر شده updated: به‌روزرسانی شده - words: کلمات - pageview_measure: بازدیدها + words: کلمه + pageview_measure: بازدید read_time: - unit: دقیقه - prompt: زمان مطالعه + unit: "دقیقه " + prompt: " زمان مطالعه" relate_posts: بیشتر بخوانید share: اشتراک‌گذاری button: @@ -85,7 +85,7 @@ df: categories: category_measure: singular: دسته‌بندی - plural: دسته‌بندی‌ها + plural: دسته‌بندی‌ post_measure: singular: پست - plural: پست‌ها + plural: پست‌ diff --git a/_data/locales/ku-IQ.yml b/_data/locales/ku-IQ.yml new file mode 100644 index 00000000..bcc53565 --- /dev/null +++ b/_data/locales/ku-IQ.yml @@ -0,0 +1,91 @@ +# The layout text of site in Kurdish (Sorani) + +# ----- Commons label ----- + +layout: + post: بابەت + category: هاوپۆل + tag: تاگ + +# The tabs of sidebar +tabs: + # format: : + home: سەرەکی + categories: هاوپۆلەکان + tags: تاگەکان + archives: ئەرشیف + about: دەربارە + +# the text displayed in the search bar & search results +search: + hint: گەڕان + cancel: هەڵوەشاندنەوە + no_results: ببوورە! هیچ ئەنجامێک نەدۆزرایەوە. + +panel: + lastmod: دوایین نوێکردنەوەکان + trending_tags: تاگە باوەکان + toc: ناوەڕۆک + +copyright: + # Shown at the bottom of the post + license: + template: ئەم بابەتە لەلایەن نووسەرەوە بە مۆڵەتی :LICENSE_NAME بڵاوکراوەتەوە. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: هەندێک مافی پارێزراوە. + verbose: >- + تەنها لەو شوێنانەی کە بە پێچەوانەوە ئاماژەی پێدراوە، بابەتەکانی بڵۆگ لەم سایتەدا + لەژێر مۆڵەتی Creative Commons Attribution 4.0 International (CC BY 4.0) لەلایەن نووسەرەوە مۆڵەتیان پێدراوە. + +meta: بە بەکارهێنانی :PLATFORM لەگەڵ ڕووکاری :THEME + +not_found: + statement: ببوورە، ئەم بەستەرە نادۆزرێتەوە یان ئاماژە بە شتێک دەکات کە بوونی نییە. + +notification: + update_found: وەشانێکی نوێی ناوەڕۆک بەردەستە. + update: نوێکردنەوە + +# ----- Posts related labels ----- + +post: + written_by: نووسەر + posted: بڵاوکراوەتەوە + updated: نوێکراوەتەوە + words: وشە + pageview_measure: بینین + read_time: + unit: خولەک + prompt: خوێندنەوە + relate_posts: بابەتی پەیوەندیدار + share: بڵاوکردنەوە + button: + next: نوێتر + previous: کۆنتر + copy_code: + succeed: کۆپی کرا! + share_link: + title: کۆپی بەستەر + succeed: بەستەر بە سەرکەوتوویی کۆپی کرا! + +# Date time format. +# See: , +df: + post: + strftime: "%d %b, %Y" + dayjs: "DD MMM, YYYY" + archives: + strftime: "%b" + dayjs: "MMM" + +# categories page +categories: + category_measure: + singular: هاوپۆل + plural: هاوپۆل + post_measure: + singular: بابەت + plural: بابەت diff --git "a/_data/locales/ps\342\200\221AF.yml" "b/_data/locales/ps\342\200\221AF.yml" new file mode 100644 index 00000000..fca68772 --- /dev/null +++ "b/_data/locales/ps\342\200\221AF.yml" @@ -0,0 +1,90 @@ +# The layout text of site in Pashto (Afghanistan) + +# ----- Commons label ----- + +layout: + post: لیکنه + category: وېشنيزه + tag: ټګ + +# The tabs of sidebar +tabs: + # format: : + home: کورپاڼه + categories: وېشنيزې + tags: ټګونه + archives: آرشيف + about: په اړه + +# the text displayed in the search bar & search results +search: + hint: لټون + cancel: لغوه + no_results: ها! هېڅ پایله ونه موندل شوه. + +panel: + lastmod: وروستی تازه + trending_tags: مشهور ټګونه + toc: منځپانګه + +copyright: + # Shown at the bottom of the post + license: + template: دا لیکنه د :LICENSE_NAME جواز لاندې د لیکوال له خوا خپره شوې ده. + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: ځینې حقونه خوندي دي. + verbose: >- + تر هغه ځایه چې بل ډول نه وي یاد شوي، د دې سایټ لیکنې + د لیکوال له خوا د کریټېو کامنز د انتساب 4.0 نړیوال (CC BY 4.0) جواز لاندې خپرېږي. + +meta: د :PLATFORM لپاره د :THEME موضوع کاروي. + +not_found: + statement: بښنه غواړو، دغه URL ناسم دی یا هغه څه ته اشاره کوي چې شتون نه لري. + +notification: + update_found: نوې نسخه شتون لري. + update: تازه + +# ----- Posts related labels ----- + +post: + written_by: لیکوال + posted: خپره شوې + updated: تازه شوې + words: کلمې + pageview_measure: کتنې + read_time: + unit: دقیقې + prompt: لوستل + relate_posts: نوره لوستنه + share: شریکول + button: + next: نوی + previous: زوړ + copy_code: + succeed: کاپي شو! + share_link: + title: لینک کاپي کړئ + succeed: لینک بریالي کاپي شو! + +# Date time format. +# See: , +df: + post: + strftime: "%b %e, %Y" + dayjs: "ll" + archives: + strftime: "%b" + dayjs: "MMM" + +categories: + category_measure: + singular: وېشنيزه + plural: وېشنيزې + post_measure: + singular: لیکنه + plural: لیکنې diff --git a/_data/locales/ur-PK.yml b/_data/locales/ur-PK.yml new file mode 100644 index 00000000..e5184df1 --- /dev/null +++ b/_data/locales/ur-PK.yml @@ -0,0 +1,90 @@ +# The layout text of site in Urdu (Pakistan) + +# ----- Commons label ----- + +layout: + post: تحریر + category: زمرہ + tag: ٹیگ + +# The tabs of sidebar +tabs: + # format: : + home: گھر + categories: زمروں + tags: ٹیگز + archives: محفوظات + about: تعارف + +# the text displayed in the search bar & search results +search: + hint: تلاش + cancel: منسوخ + no_results: اوہ! کوئی نتیجہ نہیں ملا۔ + +panel: + lastmod: حال ہی میں اپ ڈیٹ + trending_tags: مقبول ٹیگز + toc: مواد + +copyright: + # Shown at the bottom of the post + license: + template: یہ تحریر :LICENSE_NAME کے تحت مصنف کی جانب سے لائسنس یافتہ ہے۔ + name: CC BY 4.0 + link: https://creativecommons.org/licenses/by/4.0/ + + # Displayed in the footer + brief: کچھ حقوق محفوظ ہیں۔ + verbose: >- + جب تک کہ دوسری صورت میں ذکر نہ ہو، اس سائٹ کی تحریریں + مصنف کی جانب سے تخلیقی العام انتساب 4.0 بین الاقوامی (CC BY 4.0) لائسنس کے تحت دستیاب ہیں۔ + +meta: :PLATFORM کے لیے :THEME تھیم استعمال کیا جا رہا ہے۔ + +not_found: + statement: معذرت، یہ URL غلط ہے یا جس چیز کی طرف اشارہ کر رہا ہے وہ موجود نہیں۔ + +notification: + update_found: نیا مواد دستیاب ہے۔ + update: اپ ڈیٹ + +# ----- Posts related labels ----- + +post: + written_by: از + posted: شائع شدہ + updated: اپ ڈیٹ شدہ + words: لفظ + pageview_measure: مشاہدات + read_time: + unit: منٹ + prompt: پڑھیں + relate_posts: مزید مطالعہ + share: شیئر + button: + next: نیا + previous: پرانا + copy_code: + succeed: کاپی ہو گیا! + share_link: + title: لنک کاپی کریں + succeed: لنک کامیابی سے کاپی ہو گیا! + +# Date time format. +# See: , +df: + post: + strftime: "%b %e, %Y" + dayjs: "ll" + archives: + strftime: "%b" + dayjs: "MMM" + +categories: + category_measure: + singular: زمرہ + plural: زمروں + post_measure: + singular: تحریر + plural: تحریریں From c706799f9b2e724dee9a3b891dea72dfa587929e Mon Sep 17 00:00:00 2001 From: Alexander Fuks Date: Sun, 1 Jun 2025 00:51:43 +0400 Subject: [PATCH 118/177] fix: correct GoatCounter pageviews extraction (#2420) --- _includes/pageviews/goatcounter.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/pageviews/goatcounter.html b/_includes/pageviews/goatcounter.html index 265b2243..9cd1281e 100644 --- a/_includes/pageviews/goatcounter.html +++ b/_includes/pageviews/goatcounter.html @@ -10,7 +10,7 @@ fetch(url) .then((response) => response.json()) .then((data) => { - const count = data.count.replace(/\s/g, ''); + const count = data.count.replace(/\D/g, ''); pv.innerText = new Intl.NumberFormat().format(count); }) .catch((error) => { From 1bac96a8e1ae23a7a48f2b7d249bfbfd5d9bfe50 Mon Sep 17 00:00:00 2001 From: Josh Wickham Date: Fri, 27 Jun 2025 08:58:10 -0700 Subject: [PATCH 119/177] fix: resolve discrepancy in lqip between post and main page (#2453) --- _layouts/home.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/_layouts/home.html b/_layouts/home.html index 451e391c..66a12012 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -55,16 +55,15 @@ {% if post.image %} {% assign src = post.image.path | default: post.image %} - {% unless src contains '//' %} - {% assign src = post.media_subpath | append: '/' | append: src | replace: '//', '/' %} - {% endunless %} + {% capture src %}{% include media-url.html src=src subpath=post.media_subpath %}{% endcapture %} {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %} {% assign lqip = null %} {% if post.image.lqip %} - {% capture lqip %}lqip="{{ post.image.lqip }}"{% endcapture %} + {% capture lqip_url %}{% include media-url.html src=post.image.lqip subpath=post.media_subpath %}{% endcapture %} + {% assign lqip = 'lqip="' | append: lqip_url | append: '"' %} {% endif %}
From 7615d72e9300a1514ef2fc8ec941ab2974ba7eb4 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 26 Jul 2025 20:22:30 +0800 Subject: [PATCH 120/177] fix: escape special JSON characters in search results (#2481) Also restore full-text search --- _includes/post-description.html | 37 +++++++++++++++++++-------------- assets/js/data/search.json | 7 ++----- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/_includes/post-description.html b/_includes/post-description.html index c00e5165..48bb03b7 100644 --- a/_includes/post-description.html +++ b/_includes/post-description.html @@ -2,24 +2,29 @@ Get post description or generate it from the post content. {%- endcomment -%} -{%- assign max_length = include.max_length | default: 200 -%} - {%- capture description -%} -{%- if post.description -%} - {{- post.description -}} -{%- else -%} - {% comment %} - Remove the line number of the code snippet. - {% endcomment %} - {% assign content = post.content %} + {%- if post.description -%} + {{- post.description -}} + {%- else -%} + {% comment %} + Remove the line number of the code snippet. + {% endcomment %} + {%- assign content = post.content -%} - {% if content contains '
' %}
-    {% assign content = content | replace: '
', '' %}
-  {% endif %}
+    {%- if content contains '
' -%}
+      {%- assign content = content | replace: '
', '' -%}
+    {%- endif -%}
 
-  {{- content | markdownify | strip_html | newline_to_br | replace: '
', ' ' | strip_newlines -}}
-{%- endif -%}
+    {{- content | strip_html | newline_to_br | replace: '
', ' ' | strip_newlines -}}
+  {%- endif -%}
 {%- endcapture -%}
 
-{{- description | strip | truncate: max_length | escape -}}
+{%- if include.json -%}
+  {%- assign description = description | jsonify -%}
+{%- else -%}
+  {%- assign max_length = include.max_length | default: 200 -%}
+  {%- assign description = description | strip | truncate: max_length -%}
+{%- endif -%}
+
+{{- description -}}
diff --git a/assets/js/data/search.json b/assets/js/data/search.json
index 32bcff9b..5003e518 100644
--- a/assets/js/data/search.json
+++ b/assets/js/data/search.json
@@ -5,16 +5,13 @@ swcache: true
 
 [
   {% for post in site.posts %}
-    {%- capture description -%}
-      {% include post-description.html %}
-    {%- endcapture -%}
   {
     "title": {{ post.title | jsonify }},
     "url": {{ post.url | relative_url | jsonify }},
     "categories": {{ post.categories | join: ', ' | jsonify }},
     "tags": {{ post.tags | join: ', ' | jsonify }},
-    "date": "{{ post.date }}",
-    "content": "{{ description }}"
+    "date": {{ post.date | jsonify }},
+    "content": {% include post-description.html json=true %}
   }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 ]

From c0e47562001026319ee2740594e0344ce36c222e Mon Sep 17 00:00:00 2001
From: semantic-release-bot 
Date: Sat, 26 Jul 2025 12:24:47 +0000
Subject: [PATCH 121/177] chore(release): 7.3.1

## [7.3.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.0...v7.3.1) (2025-07-26)

### Bug Fixes

* escape special JSON characters in search results ([#2481](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2481)) ([7615d72](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7615d72e9300a1514ef2fc8ec941ab2974ba7eb4))
---
 docs/CHANGELOG.md           | 6 ++++++
 jekyll-theme-chirpy.gemspec | 2 +-
 package.json                | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 24afe667..b9a41727 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [7.3.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.0...v7.3.1) (2025-07-26)
+
+### Bug Fixes
+
+* escape special JSON characters in search results ([#2481](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2481)) ([7615d72](https://github.com/cotes2020/jekyll-theme-chirpy/commit/7615d72e9300a1514ef2fc8ec941ab2974ba7eb4))
+
 ## [7.3.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.4...v7.3.0) (2025-05-18)
 
 ### Features
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
index 07d64e43..a4d3679b 100644
--- a/jekyll-theme-chirpy.gemspec
+++ b/jekyll-theme-chirpy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "7.3.0"
+  spec.version       = "7.3.1"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["cotes.chung@gmail.com"]
 
diff --git a/package.json b/package.json
index 6f2cfb0c..ceed0287 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",

From 49519d13e53f584186c16cc9ce4ecf870a4344de Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 26 Jul 2025 20:49:56 +0800
Subject: [PATCH 122/177] chore: complete ESLint v9 configuration

---
 eslint.config.js | 36 +++++++++++++++++++++++++++++++++---
 package.json     |  6 +++++-
 purgecss.js      |  5 +++--
 3 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index c8f6d53d..b8073b6d 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,5 +1,35 @@
-export default [
+import { defineConfig, globalIgnores } from 'eslint/config';
+import js from '@eslint/js';
+import globals from 'globals';
+
+export default defineConfig([
+  globalIgnores(['assets/*', 'node_modules/*', '_site/*']),
+  js.configs.recommended,
   {
-    files: ['_javascript/**/*.js']
+    rules: {
+      semi: ['error', 'always'],
+      quotes: ['error', 'single']
+    },
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node
+      }
+    }
+  },
+  {
+    files: ['_javascript/**/*.js'],
+    languageOptions: {
+      globals: {
+        ClipboardJS: 'readonly',
+        GLightbox: 'readonly',
+        Theme: 'readonly',
+        dayjs: 'readonly',
+        mermaid: 'readonly',
+        tocbot: 'readonly',
+        importScripts: 'readonly',
+        swconf: 'readonly'
+      }
+    }
   }
-];
+]);
diff --git a/package.json b/package.json
index ceed0287..bb712a6b 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,16 @@
     "url": "https://github.com/cotes2020/jekyll-theme-chirpy/issues"
   },
   "homepage": "https://github.com/cotes2020/jekyll-theme-chirpy/",
+  "type": "module",
   "scripts": {
     "build": "concurrently npm:build:*",
     "build:css": "node purgecss.js",
     "build:js": "rollup -c --bundleConfigAsCjs --environment BUILD:production",
     "watch:js": "rollup -c --bundleConfigAsCjs -w",
+    "lint:js": "eslint",
     "lint:scss": "stylelint _sass/**/*.scss",
     "lint:fix:scss": "npm run lint:scss -- --fix",
-    "test": "npm run lint:scss",
+    "test": "npm run lint:js && npm run lint:scss",
     "prepare": "husky"
   },
   "dependencies": {
@@ -42,6 +44,8 @@
     "@semantic-release/git": "^10.0.1",
     "concurrently": "^9.1.2",
     "conventional-changelog-conventionalcommits": "^8.0.0",
+    "eslint": "^9.27.0",
+    "globals": "^16.1.0",
     "husky": "^9.1.7",
     "purgecss": "^7.0.2",
     "rollup": "^4.41.0",
diff --git a/purgecss.js b/purgecss.js
index ad42db29..2380f6f7 100644
--- a/purgecss.js
+++ b/purgecss.js
@@ -1,5 +1,6 @@
-const fs = require('fs').promises;
-const { PurgeCSS } = require('purgecss');
+import { promises as fs } from 'fs';
+import { PurgeCSS } from 'purgecss';
+
 const DIST_PATH = '_sass/vendors';
 const output = `${DIST_PATH}/_bootstrap.scss`;
 

From b855e8b6b470e8321b3d82fecd33e8b355bdca73 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sun, 27 Jul 2025 00:55:54 +0800
Subject: [PATCH 123/177] style: unify quote style in rollup config

---
 rollup.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.config.js b/rollup.config.js
index d9322f83..42e205e0 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -11,7 +11,7 @@ const DIST = 'assets/js/dist';
 const banner = `/*!
  * ${pkg.name} v${pkg.version} | © ${pkg.since} ${pkg.author} | ${pkg.license} Licensed | ${pkg.homepage}
  */`;
-const frontmatter = `---\npermalink: /:basename\n---\n`;
+const frontmatter = '---\npermalink: /:basename\n---\n';
 const isProd = process.env.BUILD === 'production';
 
 let hasWatched = false;

From 648398c63cfb6fe1cc139cbfbfc58a726ae00c9c Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sun, 27 Jul 2025 01:11:55 +0800
Subject: [PATCH 124/177] ci: migrate eslint and stylelint from codacy to
 gh-actions

---
 .github/workflows/lint-js.yml   | 30 ++++++++++++++++++++++++++++++
 .github/workflows/lint-scss.yml | 26 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 .github/workflows/lint-js.yml
 create mode 100644 .github/workflows/lint-scss.yml

diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
new file mode 100644
index 00000000..1e192348
--- /dev/null
+++ b/.github/workflows/lint-js.yml
@@ -0,0 +1,30 @@
+name: Lint JS
+
+on:
+  push:
+    paths:
+      - "_javascript/**/*.js"
+      - ".github/workflows/scripts/**/*.js"
+      - "*.js"
+  pull_request:
+    paths:
+      - "_javascript/**/*.js"
+      - ".github/workflows/scripts/*.js"
+      - "*.js"
+
+jobs:
+  lint-js:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Install Dependencies
+        run: npm i
+
+      - name: Lint JS
+        run: npm run lint:js
diff --git a/.github/workflows/lint-scss.yml b/.github/workflows/lint-scss.yml
new file mode 100644
index 00000000..57776dd2
--- /dev/null
+++ b/.github/workflows/lint-scss.yml
@@ -0,0 +1,26 @@
+name: Lint SCSS
+
+on:
+  push:
+    paths:
+      - "_sass/**/*.scss"
+  pull_request:
+    paths:
+      - "_sass/**/*.scss"
+
+jobs:
+  lint-scss:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Install Dependencies
+        run: npm i
+
+      - name: Lint SCSS
+        run: npm run lint:scss

From 29bf95e9c7a7f012f17f508765f76dea77440a66 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sun, 27 Jul 2025 21:39:00 +0800
Subject: [PATCH 125/177] style: change css color functions to use modern
 notation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- `rgba()` → `rgb()`
---
 .stylelintrc.json             |  2 -
 _sass/base/_base.scss         |  4 +-
 _sass/base/_syntax.scss       |  4 +-
 _sass/base/_typography.scss   |  2 +-
 _sass/components/_popups.scss |  2 +-
 _sass/pages/_home.scss        |  2 +-
 _sass/themes/_dark.scss       | 92 +++++++++++++++++------------------
 _sass/themes/_light.scss      | 46 ++++++++----------
 8 files changed, 74 insertions(+), 80 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index b8902909..c0c1b95a 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -8,8 +8,6 @@
     "property-no-vendor-prefix": null,
     "selector-no-vendor-prefix": null,
     "value-no-vendor-prefix": null,
-    "color-function-notation": "legacy",
-    "alpha-value-notation": "number",
     "selector-not-notation": "simple",
     "color-hex-length": "long",
     "declaration-block-single-line-max-declarations": 3,
diff --git a/_sass/base/_base.scss b/_sass/base/_base.scss
index 19f153bd..46e9eb6e 100644
--- a/_sass/base/_base.scss
+++ b/_sass/base/_base.scss
@@ -103,7 +103,7 @@ main {
     width: 100%;
     height: 100%;
     position: absolute;
-    background-color: var(--card-hovor-bg);
+    background-color: var(--card-hover-bg);
     opacity: 0;
     transition: opacity 0.35s ease-in-out;
   }
@@ -349,7 +349,7 @@ main {
 }
 
 .disabled {
-  color: rgb(206, 196, 196);
+  color: rgb(206 196 196);
   pointer-events: auto;
   cursor: not-allowed;
 }
diff --git a/_sass/base/_syntax.scss b/_sass/base/_syntax.scss
index 69924fc6..ae03d0dc 100644
--- a/_sass/base/_syntax.scss
+++ b/_sass/base/_syntax.scss
@@ -66,7 +66,7 @@ code {
   &.highlighter-rouge {
     font-size: v.$code-font-size;
     padding: 3px 5px;
-    word-break: break-word;
+    overflow-wrap: break-word;
     border-radius: v.$radius-sm;
     background-color: var(--inline-code-bg);
   }
@@ -243,7 +243,7 @@ div {
     }
 
     &:not([timeout]):hover {
-      background-color: rgba(128, 128, 128, 0.37);
+      background-color: rgb(128 128 128 / 37%);
 
       i {
         color: white;
diff --git a/_sass/base/_typography.scss b/_sass/base/_typography.scss
index 4cf39643..1e7a6ef3 100644
--- a/_sass/base/_typography.scss
+++ b/_sass/base/_typography.scss
@@ -238,7 +238,7 @@ main {
     border-spacing: 0;
 
     thead {
-      border-bottom: solid 2px rgba(210, 215, 217, 0.75);
+      border-bottom: solid 2px rgb(210 215 217 / 75%);
 
       th {
         @extend %table-cell;
diff --git a/_sass/components/_popups.scss b/_sass/components/_popups.scss
index ca3e2fc6..e94fcde3 100644
--- a/_sass/components/_popups.scss
+++ b/_sass/components/_popups.scss
@@ -41,7 +41,7 @@
       border-radius: 0.5rem;
       -webkit-backdrop-filter: blur(10px);
       backdrop-filter: blur(10px);
-      background-color: rgba(255, 255, 255, 0.5);
+      background-color: rgb(255 255 255 / 50%);
       color: #1b1b1eba;
       position: fixed;
       left: 50%;
diff --git a/_sass/pages/_home.scss b/_sass/pages/_home.scss
index 7a4bbf9b..027cbe6a 100644
--- a/_sass/pages/_home.scss
+++ b/_sass/pages/_home.scss
@@ -160,7 +160,7 @@
       cursor: not-allowed;
 
       .page-link {
-        color: rgba(108, 117, 125, 0.57);
+        color: rgb(108 117 125 / 57%);
       }
     }
   } /* .page-item */
diff --git a/_sass/themes/_dark.scss b/_sass/themes/_dark.scss
index 8c2f6ea8..aae65221 100644
--- a/_sass/themes/_dark.scss
+++ b/_sass/themes/_dark.scss
@@ -2,33 +2,33 @@
   color-scheme: dark;
 
   /* Framework color */
-  --main-bg: rgb(27, 27, 30);
-  --mask-bg: rgb(68, 69, 70);
-  --main-border-color: rgb(44, 45, 45);
+  --main-bg: rgb(27 27 30);
+  --mask-bg: rgb(68 69 70);
+  --main-border-color: rgb(44 45 45);
 
   /* Common color */
-  --text-color: rgb(175, 176, 177);
+  --text-color: rgb(175 176 177);
   --text-muted-color: #868686;
   --text-muted-highlight-color: #aeaeae;
   --heading-color: #cccccc;
   --label-color: #a7a7a7;
-  --blockquote-border-color: rgb(66, 66, 66);
+  --blockquote-border-color: rgb(66 66 66);
   --blockquote-text-color: #868686;
-  --link-color: rgb(138, 180, 248);
-  --link-underline-color: rgb(82, 108, 150);
+  --link-color: rgb(138 180 248);
+  --link-underline-color: rgb(82 108 150);
   --button-bg: #1e1e1e;
   --btn-border-color: #2e2f31;
   --btn-backtotop-color: var(--text-color);
   --btn-backtotop-border-color: #212122;
   --card-header-bg: #292929;
-  --checkbox-color: rgb(118, 120, 121);
+  --checkbox-color: rgb(118 120 121);
   --checkbox-checked-color: var(--link-color);
-  --img-bg: radial-gradient(circle, rgb(22, 22, 24) 0%, rgb(32, 32, 32) 100%);
+  --img-bg: radial-gradient(circle, rgb(22 22 24) 0%, rgb(32 32 32) 100%);
   --shimmer-bg: linear-gradient(
     90deg,
-    rgba(255, 255, 255, 0) 0%,
-    rgba(58, 55, 55, 0.4) 50%,
-    rgba(255, 255, 255, 0) 100%
+    rgb(255 255 255 / 0%) 0%,
+    rgb(58 55 55 / 40%) 50%,
+    rgb(255 255 255 / 0%) 100%
   );
 
   /* Sidebar */
@@ -37,65 +37,65 @@
   --sidebar-bg: #1e1e1e;
   --sidebar-border-color: #292929;
   --sidebar-muted-color: #868686;
-  --sidebar-active-color: rgb(255, 255, 255, 0.95);
+  --sidebar-active-color: rgb(255 255 255 / 95%);
   --sidebar-hover-bg: #262626;
   --sidebar-btn-bg: #232328;
   --sidebar-btn-color: #787878;
-  --avatar-border-color: rgb(206, 206, 206, 0.9);
+  --avatar-border-color: rgb(206 206 206 / 90%);
 
   /* Topbar */
-  --topbar-bg: rgb(27, 27, 30, 0.64);
+  --topbar-bg: rgb(27 27 30 / 64%);
   --topbar-text-color: var(--text-color);
-  --search-border-color: rgb(55, 55, 55);
-  --search-icon-color: rgb(100, 102, 105);
-  --input-focus-border-color: rgb(112, 114, 115);
+  --search-border-color: rgb(55 55 55);
+  --search-icon-color: rgb(100 102 105);
+  --input-focus-border-color: rgb(112 114 115);
 
   /* Home page */
-  --post-list-text-color: rgb(175, 176, 177);
+  --post-list-text-color: rgb(175 176 177);
   --btn-patinator-text-color: var(--text-color);
   --btn-paginator-hover-color: #2e2e2e;
 
   /* Posts */
-  --toc-highlight: rgb(116, 178, 243);
+  --toc-highlight: rgb(116 178 243);
   --toc-popup-border-color: #373737;
-  --tag-hover: rgb(43, 56, 62);
+  --tag-hover: rgb(43 56 62);
   --tb-odd-bg: #252526; /* odd rows of the posts' table */
-  --tb-even-bg: rgb(31, 31, 34); /* even rows of the posts' table */
+  --tb-even-bg: rgb(31 31 34); /* even rows of the posts' table */
   --tb-border-color: var(--tb-odd-bg);
-  --footnote-target-bg: rgb(63, 81, 181);
+  --footnote-target-bg: rgb(63 81 181);
   --btn-share-color: #6c757d;
   --btn-share-hover-color: #bfc1ca;
   --card-bg: #1e1e1e;
-  --card-hovor-bg: #464d51;
-  --card-shadow: rgb(21, 21, 21, 0.72) 0 6px 18px 0,
-    rgb(137, 135, 135, 0.24) 0 0 0 1px;
+  --card-hover-bg: #464d51;
+  --card-shadow: rgb(21 21 21 / 72%) 0 6px 18px 0,
+    rgb(137 135 135 / 24%) 0 0 0 1px;
   --kbd-wrap-color: #6a6a6a;
   --kbd-text-color: #d3d3d3;
   --kbd-bg-color: #242424;
-  --prompt-text-color: rgb(216, 212, 212, 0.75);
-  --prompt-tip-bg: rgb(22, 60, 36, 0.64);
-  --prompt-tip-icon-color: rgb(15, 164, 15, 0.81);
-  --prompt-info-bg: rgb(7, 59, 104, 0.8);
+  --prompt-text-color: rgb(216 212 212 / 75%);
+  --prompt-tip-bg: rgb(22 60 36 / 64%);
+  --prompt-tip-icon-color: rgb(15 164 15 / 81%);
+  --prompt-info-bg: rgb(7 59 104 / 80%);
   --prompt-info-icon-color: #0075d1;
-  --prompt-warning-bg: rgb(90, 69, 3, 0.88);
-  --prompt-warning-icon-color: rgb(255, 165, 0, 0.8);
-  --prompt-danger-bg: rgb(86, 28, 8, 0.8);
+  --prompt-warning-bg: rgb(90 69 3 / 88%);
+  --prompt-warning-icon-color: rgb(255 165 0 / 80%);
+  --prompt-danger-bg: rgb(86 28 8 / 80%);
   --prompt-danger-icon-color: #cd0202;
 
   /* Tags */
-  --tag-border: rgb(59, 79, 88);
-  --tag-shadow: rgb(32, 33, 33);
-  --dash-color: rgb(63, 65, 68);
+  --tag-border: rgb(59 79 88);
+  --tag-shadow: rgb(32 33 33);
+  --dash-color: rgb(63 65 68);
   --search-tag-bg: #292828;
 
   /* Categories */
-  --categories-border: rgb(64, 66, 69, 0.5);
-  --categories-hover-bg: rgb(73, 75, 76);
+  --categories-border: rgb(64 66 69 / 50%);
+  --categories-hover-bg: rgb(73 75 76);
   --categories-icon-hover-color: white;
 
   /* Archive */
-  --timeline-node-bg: rgb(150, 152, 156);
-  --timeline-color: rgb(63, 65, 68);
+  --timeline-node-bg: rgb(150 152 156);
+  --timeline-color: rgb(63 65 68);
   --timeline-year-dot-color: var(--timeline-color);
 
   /* Code highlight colors */
@@ -103,7 +103,7 @@
   --highlight-bg-color: #151515;
   --highlighter-rouge-color: #c9def1;
   --highlight-lineno-color: #808080;
-  --inline-code-bg: rgba(255, 255, 255, 0.05);
+  --inline-code-bg: rgb(255 255 255 / 5%);
   --code-color: #b0b0b0;
   --code-header-text-color: #6a6a6a;
   --code-header-muted-color: #353535;
@@ -141,11 +141,11 @@
   #archives li:nth-child(odd) {
     background-image: linear-gradient(
       to left,
-      rgb(26, 26, 30),
-      rgb(39, 39, 45),
-      rgb(39, 39, 45),
-      rgb(39, 39, 45),
-      rgb(26, 26, 30)
+      rgb(26 26 30),
+      rgb(39 39 45),
+      rgb(39 39 45),
+      rgb(39 39 45),
+      rgb(26 26 30)
     );
   }
 
diff --git a/_sass/themes/_light.scss b/_sass/themes/_light.scss
index 14c3962b..48d47558 100644
--- a/_sass/themes/_light.scss
+++ b/_sass/themes/_light.scss
@@ -20,34 +20,30 @@
   --btn-backtotop-border-color: #f1f1f1;
   --checkbox-color: #c5c5c5;
   --checkbox-checked-color: #07a8f7;
-  --img-bg: radial-gradient(
-    circle,
-    rgb(255, 255, 255) 0%,
-    rgb(239, 239, 239) 100%
-  );
+  --img-bg: radial-gradient(circle, rgb(255 255 255) 0%, rgb(239 239 239) 100%);
   --shimmer-bg: linear-gradient(
     90deg,
-    rgba(250, 250, 250, 0) 0%,
-    rgba(232, 230, 230, 1) 50%,
-    rgba(250, 250, 250, 0) 100%
+    rgb(250 250 250 / 0%) 0%,
+    rgb(232 230 230 / 100%) 50%,
+    rgb(250 250 250 / 0%) 100%
   );
 
   /* Sidebar */
-  --site-title-color: rgb(113, 113, 113);
+  --site-title-color: rgb(113 113 113);
   --site-subtitle-color: #717171;
   --sidebar-bg: #f6f8fa;
   --sidebar-border-color: #efefef;
   --sidebar-muted-color: #545454;
   --sidebar-active-color: #1d1d1d;
-  --sidebar-hover-bg: rgb(223, 233, 241, 0.64);
+  --sidebar-hover-bg: rgb(223 233 241 / 64%);
   --sidebar-btn-bg: white;
   --sidebar-btn-color: #8e8e8e;
   --avatar-border-color: white;
 
   /* Topbar */
-  --topbar-bg: rgb(255, 255, 255, 0.7);
-  --topbar-text-color: rgb(78, 78, 78);
-  --search-border-color: rgb(240, 240, 240);
+  --topbar-bg: rgb(255 255 255 / 70%);
+  --topbar-text-color: rgb(78 78 78);
+  --search-border-color: rgb(240 240 240);
   --search-icon-color: #c2c6cc;
   --input-focus-border-color: #b8b8b8;
 
@@ -62,9 +58,9 @@
   --btn-share-color: gray;
   --btn-share-hover-color: #0d6efd;
   --card-bg: white;
-  --card-hovor-bg: #e2e2e2;
-  --card-shadow: rgb(104, 104, 104, 0.05) 0 2px 6px 0,
-    rgba(211, 209, 209, 0.15) 0 0 0 1px;
+  --card-hover-bg: #e2e2e2;
+  --card-shadow: rgb(104 104 104 / 5%) 0 2px 6px 0,
+    rgb(211 209 209 / 15%) 0 0 0 1px;
   --footnote-target-bg: lightcyan;
   --tb-odd-bg: #fbfcfd;
   --tb-border-color: #eaeaea;
@@ -72,29 +68,29 @@
   --kbd-wrap-color: #bdbdbd;
   --kbd-text-color: var(--text-color);
   --kbd-bg-color: white;
-  --prompt-text-color: rgb(46, 46, 46, 0.77);
-  --prompt-tip-bg: rgb(123, 247, 144, 0.2);
+  --prompt-text-color: rgb(46 46 46 / 77%);
+  --prompt-tip-bg: rgb(123 247 144 / 20%);
   --prompt-tip-icon-color: #03b303;
   --prompt-info-bg: #e1f5fe;
   --prompt-info-icon-color: #0070cb;
-  --prompt-warning-bg: rgb(255, 243, 205);
+  --prompt-warning-bg: rgb(255 243 205);
   --prompt-warning-icon-color: #ef9c03;
-  --prompt-danger-bg: rgb(248, 215, 218, 0.56);
+  --prompt-danger-bg: rgb(248 215 218 / 56%);
   --prompt-danger-icon-color: #df3c30;
 
   /* Tags */
   --tag-border: #dee2e6;
   --tag-shadow: var(--btn-border-color);
-  --tag-hover: rgb(222, 226, 230);
+  --tag-hover: rgb(222 226 230);
   --search-tag-bg: #f8f9fa;
 
   /* Categories */
-  --categories-border: rgba(0, 0, 0, 0.125);
+  --categories-border: rgb(0 0 0 / 12.5%);
   --categories-hover-bg: var(--btn-border-color);
   --categories-icon-hover-color: darkslategray;
 
   /* Archive */
-  --timeline-color: rgba(0, 0, 0, 0.075);
+  --timeline-color: rgb(0 0 0 / 7.5%);
   --timeline-node-bg: #c2c6cc;
   --timeline-year-dot-color: #ffffff;
 
@@ -103,7 +99,7 @@
   --highlight-bg-color: #f6f8fa;
   --highlighter-rouge-color: #3f596f;
   --highlight-lineno-color: #9e9e9e;
-  --inline-code-bg: rgba(25, 25, 28, 0.05);
+  --inline-code-bg: rgb(25 25 28 / 5%);
   --code-color: #3a3a3a;
   --code-header-text-color: #a3a3a3;
   --code-header-muted-color: #e5e5e5;
@@ -111,7 +107,7 @@
   --clipboard-checked-color: #43c743;
 
   [class^='prompt-'] {
-    --link-underline-color: rgb(219, 216, 216);
+    --link-underline-color: rgb(219 216 216);
   }
 
   .dark {

From eaf5e574493776212be4ed14a2ddd2d60f7f4094 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 31 Jul 2025 03:37:32 +0800
Subject: [PATCH 126/177] ci: change filter script to ESM format

Because `"type": "module"` was added to `package.json`
---
 .github/workflows/pr-filter.yml        | 4 ++--
 .github/workflows/scripts/pr-filter.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml
index 8e9a18b7..40ba53b1 100644
--- a/.github/workflows/pr-filter.yml
+++ b/.github/workflows/pr-filter.yml
@@ -21,5 +21,5 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const script = require('.github/workflows/scripts/pr-filter.js');
-            await script({ github, context, core });
+            const { default: filter } = await import('${{ github.workspace }}/.github/workflows/scripts/pr-filter.js');
+            await filter({ github, context, core });
diff --git a/.github/workflows/scripts/pr-filter.js b/.github/workflows/scripts/pr-filter.js
index 03f50dc5..52e8d526 100644
--- a/.github/workflows/scripts/pr-filter.js
+++ b/.github/workflows/scripts/pr-filter.js
@@ -9,7 +9,7 @@ function hasDescription(markdown) {
   );
 }
 
-module.exports = async ({ github, context, core }) => {
+export default async ({ github, context, core }) => {
   const pr = context.payload.pull_request;
   const body = pr.body === null ? '' : pr.body;
   const markdown = body.replace(//g, '');

From 5f8ec7ffd3b23998bad48c110e809576fe5daf80 Mon Sep 17 00:00:00 2001
From: Jason Raveling 
Date: Sun, 31 Aug 2025 08:51:01 -0500
Subject: [PATCH 127/177] fix: avoid unconfigured social options in sidebar
 (#2507)

---
 _includes/sidebar.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 569585f6..1cd0ee8a 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,13 +52,21 @@
     {% endunless %}
 
     {% for entry in site.data.contact %}
+      {%- assign url = null -%}
+
       {% case entry.type %}
         {% when 'github', 'twitter' %}
+          {%- unless site[entry.type].username -%}
+            {%- continue -%}
+          {%- endunless -%}
           {%- capture url -%}
             https://{{ entry.type }}.com/{{ site[entry.type].username }}
           {%- endcapture -%}
         {% when 'email' %}
-          {% assign email = site.social.email | split: '@' %}
+          {%- unless site.social.email -%}
+            {%- continue -%}
+          {%- endunless -%}
+          {%- assign email = site.social.email | split: '@' -%}
           {%- capture url -%}
             javascript:location.href = 'mailto:' + ['{{ email[0] }}','{{ email[1] }}'].join('@')
           {%- endcapture -%}

From cda62e28d1b71ce4018301aacf93532230aa2b3b Mon Sep 17 00:00:00 2001
From: Alexander Fuks 
Date: Mon, 8 Sep 2025 23:45:20 +0400
Subject: [PATCH 128/177] feat: add support for embed spotify (#2515)

---
 _includes/embed/audio.html            |  2 +-
 _includes/embed/spotify.html          | 22 +++++++++++++++++++++
 _posts/2019-08-08-write-a-new-post.md | 28 +++++++++++++++------------
 _sass/base/_base.scss                 |  9 ++++++++-
 4 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 _includes/embed/spotify.html

diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html
index cf928a7f..bb20688e 100644
--- a/_includes/embed/audio.html
+++ b/_includes/embed/audio.html
@@ -9,7 +9,7 @@
 {% endunless %}
 
 

-  
' %}
+      {% assign _wrapper_start = '
' %}
 
       {% assign _img_content = _img_content | append: _wrapper_start %}
       {% assign _right = _right | prepend: '>
Date: Tue, 14 Oct 2025 04:53:51 +0800
Subject: [PATCH 131/177] chore: remove deprecated URL

---
 .github/FUNDING.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index f22921b7..fed8764e 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
 ko_fi: coteschung
-custom: https://sponsor.cotes.page

From a385ffabff61d902db618450d51651afcb00c00a Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Tue, 14 Oct 2025 04:54:48 +0800
Subject: [PATCH 132/177] chore: improve ESLint config

---
 eslint.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint.config.js b/eslint.config.js
index b8073b6d..b6d8f192 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -21,13 +21,13 @@ export default defineConfig([
     files: ['_javascript/**/*.js'],
     languageOptions: {
       globals: {
+        ...globals.serviceworker,
         ClipboardJS: 'readonly',
         GLightbox: 'readonly',
         Theme: 'readonly',
         dayjs: 'readonly',
         mermaid: 'readonly',
         tocbot: 'readonly',
-        importScripts: 'readonly',
         swconf: 'readonly'
       }
     }

From ee6839516e046cb2c0230dad1142ce2d39a7abc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 05:23:24 +0800
Subject: [PATCH 133/177] build(deps): bump the gh-actions group across 1
 directory with 5 updates (#2550)

Bumps the gh-actions group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `4` | `5` |
| [actions/setup-node](https://github.com/actions/setup-node) | `4` | `5` |
| [github/codeql-action](https://github.com/github/codeql-action) | `3` | `4` |
| [actions/github-script](https://github.com/actions/github-script) | `7` | `8` |
| [actions/stale](https://github.com/actions/stale) | `9` | `10` |



Updates `actions/checkout` from 4 to 5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

Updates `actions/setup-node` from 4 to 5
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v4...v5)

Updates `github/codeql-action` from 3 to 4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v3...v4)

Updates `actions/github-script` from 7 to 8
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

Updates `actions/stale` from 9 to 10
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9...v10)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/stale
  dependency-version: '10'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cd.yml         | 4 ++--
 .github/workflows/ci.yml         | 4 ++--
 .github/workflows/codeql.yml     | 8 ++++----
 .github/workflows/commitlint.yml | 2 +-
 .github/workflows/lint-js.yml    | 4 ++--
 .github/workflows/lint-scss.yml  | 4 ++--
 .github/workflows/pr-filter.yml  | 4 ++--
 .github/workflows/stale.yml      | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index c665f755..cd67b6d2 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -14,14 +14,14 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3
           bundler-cache: true
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31b87863..118fc715 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0 # for posts's lastmod
 
@@ -42,7 +42,7 @@ jobs:
           bundler-cache: true
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 06feb7fd..e460e49a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,11 +24,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: "${{ matrix.language }}"
           config-file: .github/codeql/codeql-config.yml
@@ -36,9 +36,9 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
index 58f1a3ff..ef14388b 100644
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -11,5 +11,5 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: wagoid/commitlint-github-action@v6
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index 1e192348..205f4790 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -16,10 +16,10 @@ jobs:
   lint-js:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/lint-scss.yml b/.github/workflows/lint-scss.yml
index 57776dd2..48d8a726 100644
--- a/.github/workflows/lint-scss.yml
+++ b/.github/workflows/lint-scss.yml
@@ -12,10 +12,10 @@ jobs:
   lint-scss:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml
index 40ba53b1..ee3f09db 100644
--- a/.github/workflows/pr-filter.yml
+++ b/.github/workflows/pr-filter.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check PR Content
         id: intercept
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 4f6e91cb..1c9913f5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -20,7 +20,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           # 60 days before marking issues/PRs stale
           days-before-close: -1 # does not close automatically

From b3d7db3cda006a63cdecd718f97d415eab709dc8 Mon Sep 17 00:00:00 2001
From: Cotes <11371340+cotes2020@users.noreply.github.com>
Date: Fri, 17 Oct 2025 00:02:12 +0800
Subject: [PATCH 134/177] =?UTF-8?q?refactor:=20avoid=20converting=20media?=
 =?UTF-8?q?=E2=80=98s=20relative=20paths=20to=20absolute=20paths=20(#2552)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _includes/media-url.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/_includes/media-url.html b/_includes/media-url.html
index ea410750..407d4218 100644
--- a/_includes/media-url.html
+++ b/_includes/media-url.html
@@ -15,7 +15,9 @@
 {%- if url -%}
   {% unless url contains ':' %}
     {%- comment -%} Add media resources subpath prefix {%- endcomment -%}
-    {% assign url = include.subpath | default: '' | append: '/' | append: url %}
+    {% if include.subpath %}
+      {% assign url = include.subpath | append: '/' | append: url %}
+    {% endif %}
 
     {%- comment -%} Prepend CND URL {%- endcomment -%}
     {% if site.cdn %}

From 604528e3ce11ec0278e83f41105ed5949362bb54 Mon Sep 17 00:00:00 2001
From: Cotes <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 20 Oct 2025 02:24:40 +0800
Subject: [PATCH 135/177] fix(search): restore full-text search for posts with
 description (#2557)

---
 _includes/post-description.html | 30 -------------------------
 _includes/post-summary.html     | 39 +++++++++++++++++++++++++++++++++
 _includes/related-posts.html    |  2 +-
 _layouts/home.html              |  2 +-
 assets/feed.xml                 |  2 +-
 assets/js/data/search.json      |  3 ++-
 6 files changed, 44 insertions(+), 34 deletions(-)
 delete mode 100644 _includes/post-description.html
 create mode 100644 _includes/post-summary.html

diff --git a/_includes/post-description.html b/_includes/post-description.html
deleted file mode 100644
index 48bb03b7..00000000
--- a/_includes/post-description.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{%- comment -%}
-  Get post description or generate it from the post content.
-{%- endcomment -%}
-
-{%- capture description -%}
-  {%- if post.description -%}
-    {{- post.description -}}
-  {%- else -%}
-    {% comment %}
-      Remove the line number of the code snippet.
-    {% endcomment %}
-    {%- assign content = post.content -%}
-
-    {%- if content contains '
' -%}
-      {%- assign content = content | replace: '
', '' -%}
-    {%- endif -%}
-
-    {{- content | strip_html | newline_to_br | replace: '
', ' ' | strip_newlines -}}
-  {%- endif -%}
-{%- endcapture -%}
-
-{%- if include.json -%}
-  {%- assign description = description | jsonify -%}
-{%- else -%}
-  {%- assign max_length = include.max_length | default: 200 -%}
-  {%- assign description = description | strip | truncate: max_length -%}
-{%- endif -%}
-
-{{- description -}}
diff --git a/_includes/post-summary.html b/_includes/post-summary.html
new file mode 100644
index 00000000..c9314fc8
--- /dev/null
+++ b/_includes/post-summary.html
@@ -0,0 +1,39 @@
+{%- comment -%}
+  Get the post's description or body content.
+
+  Arguments:
+    full_text: If true, return the full content. Default is false.
+    max_length: The maximum length of the returned content. Default is 200.
+{%- endcomment -%}
+
+{%- if post.description and include.full_text != true -%}
+  {{- post.description -}}
+{%- else -%}
+  {%- comment -%} Remove the line numbers from the code snippet. {%- endcomment -%}
+
+  {%- assign content = post.content -%}
+
+  {%- if content contains '
' -%}
+    {%- assign content = content
+      | replace: '
',
+        '' -%}
+  {%- endif -%}
+
+  {%- assign content = content
+    | markdownify
+    | strip_html
+    | newline_to_br
+    | replace: '
', ' '
+    | strip_newlines
+    | strip
+  -%}
+
+  {%- unless include.full_text -%}
+    {%- assign max_length = include.max_length | default: 200 -%}
+    {%- assign content = content | truncate: max_length -%}
+  {%- endunless -%}
+
+  {{- content -}}
+{%- endif -%}
diff --git a/_includes/related-posts.html b/_includes/related-posts.html
index 37a295bd..4b4f8088 100644
--- a/_includes/related-posts.html
+++ b/_includes/related-posts.html
@@ -82,7 +82,7 @@ 
{{ post.title }}

               

-                
{% include post-description.html %}

+                
{% include post-summary.html %}

               

             

           
diff --git a/_layouts/home.html b/_layouts/home.html
index 66a12012..cb9ab244 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -78,7 +78,7 @@
             
{{ post.title }}

 
             

-              
{% include post-description.html %}

+              
{% include post-summary.html %}

             

 
             

diff --git a/assets/feed.xml b/assets/feed.xml
index d2aad4db..99373377 100644
--- a/assets/feed.xml
+++ b/assets/feed.xml
@@ -45,7 +45,7 @@ permalink: /feed.xml
     {% endfor %}
   {% endif %}
 
-  {% include post-description.html max_length=400 %}
+  {% include post-summary.html max_length=400 %}
 
   
 {% endfor %}
diff --git a/assets/js/data/search.json b/assets/js/data/search.json
index 5003e518..1c35ec18 100644
--- a/assets/js/data/search.json
+++ b/assets/js/data/search.json
@@ -11,7 +11,8 @@ swcache: true
     "categories": {{ post.categories | join: ', ' | jsonify }},
     "tags": {{ post.tags | join: ', ' | jsonify }},
     "date": {{ post.date | jsonify }},
-    "content": {% include post-description.html json=true %}
+    {% capture content -%}{% include post-summary.html full_text=true %}{%- endcapture -%}
+    "content": {{ content | jsonify }}
   }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 ]

From aa832c29de2a5091b7585939357daa82ec2c4db7 Mon Sep 17 00:00:00 2001
From: Cotes <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 20 Oct 2025 02:55:43 +0800
Subject: [PATCH 136/177] refactor: update favicon files and documentation
 (#2558)

---
 _includes/favicons.html                       |  11 +++-------
 _posts/2019-08-11-customize-the-favicon.md    |  19 +++++++++---------
 .../img/favicons/android-chrome-192x192.png   | Bin 19952 -> 0 bytes
 .../img/favicons/android-chrome-512x512.png   | Bin 62557 -> 0 bytes
 assets/img/favicons/apple-touch-icon.png      | Bin 13867 -> 18370 bytes
 assets/img/favicons/browserconfig.xml         |  13 ------------
 assets/img/favicons/favicon-16x16.png         | Bin 1247 -> 0 bytes
 assets/img/favicons/favicon-32x32.png         | Bin 2312 -> 0 bytes
 assets/img/favicons/favicon-96x96.png         | Bin 0 -> 8850 bytes
 assets/img/favicons/favicon.ico               | Bin 15086 -> 15086 bytes
 assets/img/favicons/favicon.svg               |   3 +++
 assets/img/favicons/mstile-150x150.png        | Bin 12172 -> 0 bytes
 assets/img/favicons/site.webmanifest          |  10 +++++----
 .../img/favicons/web-app-manifest-192x192.png | Bin 0 -> 20536 bytes
 .../img/favicons/web-app-manifest-512x512.png | Bin 0 -> 69328 bytes
 15 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 assets/img/favicons/android-chrome-192x192.png
 delete mode 100644 assets/img/favicons/android-chrome-512x512.png
 mode change 100644 => 100755 assets/img/favicons/apple-touch-icon.png
 delete mode 100644 assets/img/favicons/browserconfig.xml
 delete mode 100644 assets/img/favicons/favicon-16x16.png
 delete mode 100644 assets/img/favicons/favicon-32x32.png
 create mode 100755 assets/img/favicons/favicon-96x96.png
 mode change 100644 => 100755 assets/img/favicons/favicon.ico
 create mode 100755 assets/img/favicons/favicon.svg
 delete mode 100644 assets/img/favicons/mstile-150x150.png
 mode change 100644 => 100755 assets/img/favicons/site.webmanifest
 create mode 100755 assets/img/favicons/web-app-manifest-192x192.png
 create mode 100755 assets/img/favicons/web-app-manifest-512x512.png

diff --git a/_includes/favicons.html b/_includes/favicons.html
index 957c933f..2ca276e8 100644
--- a/_includes/favicons.html
+++ b/_includes/favicons.html
@@ -5,15 +5,10 @@
 
 {% capture favicon_path %}{{ '/assets/img/favicons' | relative_url }}{% endcapture %}
 
+
+
+
 
-
-
 {% if site.pwa.enabled %}
   
 {% endif %}
-
-
-
-
-
-
diff --git a/_posts/2019-08-11-customize-the-favicon.md b/_posts/2019-08-11-customize-the-favicon.md
index a3278fa9..66a43e62 100644
--- a/_posts/2019-08-11-customize-the-favicon.md
+++ b/_posts/2019-08-11-customize-the-favicon.md
@@ -10,25 +10,26 @@ The [favicons](https://www.favicon-generator.org/about/) of [**Chirpy**](https:/
 
 ## Generate the favicon
 
-Prepare a square image (PNG, JPG, or SVG) with a size of 512x512 or more, and then go to the online tool [**Real Favicon Generator**](https://realfavicongenerator.net/) and click the button Select your Favicon image to upload your image file.
+Prepare a square image (PNG, JPG, or SVG) with a size of 512x512 or more, and then go to the online tool [**Real Favicon Generator**](https://realfavicongenerator.net/) and click the button Pick your favicon image to upload your image file.
 
-In the next step, the webpage will show all usage scenarios. You can keep the default options, scroll to the bottom of the page, and click the button Generate your Favicons and HTML code to generate the favicon.
+In the next step, the webpage will show all usage scenarios. You can keep the default options, scroll to the bottom of the page, and click the button Next → to generate the favicon.
 
 ## Download & Replace
 
-Download the generated package, unzip and delete the following two from the extracted files:
+Download the generated package, unzip and delete the following file(s) from the extracted files:
 
-- `browserconfig.xml`{: .filepath}
 - `site.webmanifest`{: .filepath}
 
-And then copy the remaining image files (`.PNG`{: .filepath} and `.ICO`{: .filepath}) to cover the original files in the directory `assets/img/favicons/`{: .filepath} of your Jekyll site. If your Jekyll site doesn't have this directory yet, just create one.
+And then copy the remaining image files (`.PNG`{: .filepath}, `.ICO`{: .filepath} and `.SVG`{: .filepath}) to cover the original files in the directory `assets/img/favicons/`{: .filepath} of your Jekyll site. If your Jekyll site doesn't have this directory yet, just create one.
 
 The following table will help you understand the changes to the favicon files:
 
-| File(s)             | From Online Tool                  | From Chirpy |
-|---------------------|:---------------------------------:|:-----------:|
-| `*.PNG`             | ✓                                 | ✗           |
-| `*.ICO`             | ✓                                 | ✗           |
+| File(s) | From Online Tool | From Chirpy |
+| ------- | :--------------: | :---------: |
+| `*.PNG` |        ✓         |      ✗      |
+| `*.ICO` |        ✓         |      ✗      |
+| `*.SVG` |        ✓         |      ✗      |
+
 
 
 >  ✓ means keep, ✗ means delete.
diff --git a/assets/img/favicons/android-chrome-192x192.png b/assets/img/favicons/android-chrome-192x192.png
deleted file mode 100644
index a949d2fe5d15c0764e5570b1ba8477a8961bef9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19952
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
T@_Asq(vYQ$F;StVh{*&_>vrfq=vsX
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
dNkln9|~*Pj3Y002ovPDHLkV1ncSVpaeE

literal 13867
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%0AKd}u#mAizaXi!
zzk%MdI2O%RF3BgCIkeO$bQFeKsaIZOP$KzI{n#yeb1kc#Lp`${wnT?Uo+T`XPoi}YiVeeYX
zrVx@rT>if+!*te~snZTeGlGFEjpPjmfE!-nZz#{-Ey7v=i|2hN80!ac~EBX3-<0#C*63Sc_K{YhdnD|
zi!JJ2_!@C_*{>wYa2P7gMI?EU_W=}J7zO*YgbSGxk#gXe54wt!Af>90AFU*?hQmlT
z<%n<=Bj?tMF&}*2Ythu7Nav#{Z%FG1&$S44*60!s~F{QRyg*I5Gi&ch_sy{D7)XM+dB;bsb
z&d7mxDz3%c6*dBJZ5g~=*KJA6!
zwb5v%9(6kx-N$F1bI10iWPk=D@+TFh$dOnkIE*o2L{jS9Qjgz=#1yhizjI*3MM;qr
zMwR;kL+w$3`4+!AlO=;420fG`F=(DMQ@l}Rl%0aD&E;mUz0Je=!8e8-21k^ioJVa2
zb|{FFW%wIMGE#<6klxk2sf{iwcDm=Y7Cpb%Gwd1MrXT0(HZu%aJLZ$0B9fZQc=1I4
zbxXzI51k#iMbsqJpq3C02oCOJ8F_puu36`AIu5CxzQJDngSRCb*L|0~IxD2_n@mT01V-JOAh~A{&
zQ9dRF4T@@#q=%jN@>JDqvovK2EB-@-6!Y&_KMA&qZ>
zO|kRp@_1=^tvE&-=6@d`!Q>Z}mPHcwLP)Vc$gENjxuh_d8N@!!tFqaBvP*cD$+Upq
z#my(Q;d061WqcB^^jNL-`0dtWa0ccLm6V~8ip!Zcgl=@)5kWCWMgsTnR3gV&K7I5$
zo%CRT^7G?wO|CmXSpPEnJj-A8FJZ+|Nrw
zE^;KFTG}>?-6lc#xi|IW2sop9S&ZpxTzOa=O3EvPEV}Oe(no=-=if@-^J+ab71ZL6
z+;X1(*-X6uK^`&f0-
z$C?zF+yAg-2j4L#M!tG7@N0=wbSDFC;~Tf|bt3|bL{EduCRpXe#7L4GQHo6zKW?Ot
zmTv~-RV5@ZfB${KOih-=?Pk{}QC^2;$}j!G)QkQ6sJdR^jmmt$;u`x&%Kg)(Z;&0pB912ehx+{2nCjTnW$`6^k{0V
z;i$&}c*dzi>hr%pHn#q8$dgv-75}x~f9o;-2*Wl)u|$<5KC77DQLnH%_#>TEO-u&I
zXNqglRT?T)@&c0(spx+g2CO|p`;LviWaM{NZ^{-%1W^m~Hv_4jvfJ?`*yw~ps920K
zp_~y0jAfdn5vnyY(~O(uJfnV|VaiX+EO>AN_h>WMzetA17O`L{bpFPV3ZgtXzStA#
z+d5w~2&&BYb`6`K^ygn0P{?6;NJvOaL&dyYECf`+r?1@OuW*#=n5#5KXXG=r`YJTt
z4C6Spir7C`2*mflPqE#KlOJaA)Bf~fg+9Tn4>FIFl!FzAFkqlZZ=>VWU!aC165oaq
ztx1WpVW5UlnnrI5lbD1{KJ>6<P>vZj!*rizDL9tV)%@ip0^%z=cEJ90%G@CtyV{;~Mk&#y3Z36GYkpIqDU`
zm3nOWk@MOPd=03O&ol4(BJ_WM-RJ+~dqF?%(dvqK*KfJ#d4Q!w>mjA%VPWcFDPZnq
z32q=xc1{i!c5W6e8vHUyK8QIMBKuyR75YO=;Bk!PNdq4N$w?_oRwGTq
F{tp(By7K@4

diff --git a/assets/img/favicons/browserconfig.xml b/assets/img/favicons/browserconfig.xml
deleted file mode 100644
index a02a5c74..00000000
--- a/assets/img/favicons/browserconfig.xml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: compress
----
-
-
-
-  
-    
-      
-      #da532c
-    
-  
-
diff --git a/assets/img/favicons/favicon-16x16.png b/assets/img/favicons/favicon-16x16.png
deleted file mode 100644
index f44237a9a42f93a98c435c3fc958cc9a52c2e38c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>YRSpT$B!RBc<^9PPY+N*S63I%ZFY8c
zWo2cjPoH*ianaDwsIRYYsBf4%ckbcChbK&!z{SfhAi%@M!45PbJUm=bP%x+4yW7Xl
zPhMMDKvcs-cCt&rNsp`;YqOv(2cVgidERRZlk*Ea7&IAX9?iV^e=@%~pQ4tes=kbw
zr{>~|g>z2i0Dao9))(l_$@`P197yrcGRm3k6kBVV+2uCvaN5Lui8GI8fx=;(A5cx}
zrr^4j{%xB>dUwVEg9Rc8Br6tq=1p~}UFnlE$q7gTRo1Ton&}G+cA(3FUenUj0(x!s
z?AceYTmgCw7&89;{+^zmz_{4Fd2?lDWl&I%gM)*Qj}I_pmMvT6dZ*~uuJ9?G;p&rS2#igev$wwjJ=t0k-RjftT|)dbe^xNF
zu{-Qpp(4%B!YEm=d}?d&x`R2zq6)iy{QG@Vjoq$n_QqWsXO~&CXwLGN90NPZ!4!iOb0e
z2?;4v!UIxLLW05)Q<8w(q@*Q&-OKA04+s*Ddbe=9-$ne|{!h`^3(2j*m-BAf<_uqqXH6CwIR<8+V6`
z+u7c}PSIA*j-yA_Rn%0MFIm><&A_U1+1P0FrsAT{pSZcYmozY4I;y(#^E3U39V^!C
zSro+fBL3#8SF>*In)Ivf*s^D0mTU~uW|=--XIj_*^s;J+YeY#(Vo9o1a#1RfVlXl=
zGSoFN(KRv)F*LI>Ft9SQ&^9mvGD6KA{7^LH=BH$)RpQp5lJ(;gP(yfCNJL3cV!1*=
zQGQxxPO3slWkIS!W2I`Q&6e6=(&6r>mdKI;Vst0Gj@<
AT>t<8

diff --git a/assets/img/favicons/favicon-32x32.png b/assets/img/favicons/favicon-32x32.png
deleted file mode 100644
index d5d021d85c808e4ae23408203e5e34223d752de2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2312
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

literal 15086
zcmd5@30#iZ_kY_-+6bu>kt9<{!qBE@Cq`t861`=qs0b~>2xH0CVzPXU%nvEkpz#^a
z*v1(AhB210g#MUeh?z`H%lUuL^}hWISz5+CpU?Nb&vT!9?>Xn*bC>6w^GYNN5+#YX
zwFIe&B&&-=Vk?nIOiX0Y+7ihP>`>T%DgMHGfM=%N1)r
zzw5p47fTd;vJ+Lj_a`iC|v&`|L|p^T|#y_TC$B4<06gpLnEcKsID3z`Gy3_rzZWenH-iT0kD&UqrbdkY9i@
z*+|pSMjX-rv^fy(J1~u!JT~+m^c2v(IS>h&d7yIx>7PIqKn%~U`80ULOma<+B(L3Z
zB2WIVI^7*lt{IW!v^I>~cg!QSQ?nem#cf^(_JdY9VCIv(s6peyvZI~RXtNNg<`?(X
zw7vebkjzKgQ%gM^(&^BS`bLi?^kemVF3Zo3tEJSsixIWZ(Ile*mNaxr6lADfu1336
z7?FxgC&8QLco*=SSeyTSi8LTFfHYcZ
zlb*RTnR?if+t%pXWze4gf#ozleH_)grmI|Hd=xRefr9K25uFV_d8MJf?wX^O*L!e_LbCN`zF<&ktzb`%(
zWk=>NrfEkvlJwXnfvHC~o*w<>vbGK7UtS-5p$R$qpwB}mA6Z){J)T+_0$L3J1IeY3
ztHgAuZDrr+F;y?~5B>QhgbeMvS9xbGC=dR2y{N}^1COLULEDGM=YMi01E+6_`x{~x{
zS~y^cc8t)DKIbD<0JM`98HG}uX+uP7J
zbF#7MJ#OgTk(*;^%As`>a$pNdzuZc}`5VY@+x#-Wtqa0d&<{AF{rj$oImvp{j&0aF
z?d!Cv>FHlmWW;%j3b;kl6K+$)jPn$hnTvHj?djBl_2Chxx4xuz?^7ZbC1p=NQ^TXf
zR?MvkkNtsSM?R#OC{
zIOocYvs-$-Po8VicKdj0thKWjMfu%EKi{Wtub)N#hYUR-`k%)l(&tLaaJxMrUrJd
z*aI@upl~(if8Y1mkNj-|yeqwJHqr!#9GW`hTMBT_BRlhH)K=Gw)YO_4D=8~Df$wGD
zKk$9?`y&0B=eBnD-<5cyTTiFQL#&gonHf4i(P*JdDyqt)s;UD1)s6rQfm8rr>i@3G
zd(}*J=Xn#S=@{tcs;DRzgYQ!GHS;aUW87Z`1_KTLCTvXU!A}Pu8Rwl_Q0q$E3!c^0
z)rld0M#}GQ1ItuYRE!#vhx)b!UhIIAKsBG(52$V1w$!0R2Z2_tT8Vc!SCg_b>yv6#
z%a$#VBi{?p#-ROP&Jzj>3O1mB5q&B6Qc_YPzSq^&B?AKk!E^KG&B?^XM2v%$mKJ$>
zdeX9G%V_iF&6J*={%p~rMK`>?y)#gUO;!KYrO~ckyRm}@4?Y(X5<>Cu@w8yU0va)5
z1hr|?hIDjvgbdu@JTA<)si`S#+qR8LOG}Bbs;Vk_^5hBKxN(EN`Q{snii)~sXlUs6
z4+zlagAYFVG&woB^z`Y|^x(k*s;sOOJe8N1(~%=bXuyC0VjP%vmO)!vn|AEjL606i
zqJswy(&wLlPUp{`r;3USAeZ`MTwE;p
zE-Wmhty{O!+O=!x#EBDh?%X-*-MhDtf%SdNm@#zb%o%cZbtULM@%-Sqv1-*SVws;k
zdq&r;U86&X4$;7Y16PCpCRv}L?=GRCp-(Peyh!)&-xs_eKYm>B%6-kc-@0{cN=izi
z%*;%|E9-w+S{nKL`;(%gV)Y!Cmpy#=uxRJry?b=w!UaP6=fQuQrWgbC*_y1ZEYVl2
z$AA3s2f4Yqy~G#K-z{6V2)S5yc&>Kp)Tx$E@wl)&3l}aF{6BsAl&)O4!m|Gc-YuJe
z|7N{<^*Y4*&HBO@k3;+R?Zw)|{K(f(UWew-pHF^%ex#|X$?J@mzuf0MA9#*WnlwqQ
zu{`hjDk&)uI+>W5*i`&ChfaUZYsH;AcLYtI1FXju78c~<;zFz|ECb83c=2KyKYqNp
zPf1CkapT5`{$?4vbm>B$efF7{=U;vGm1yhFKmVkke)@@mf`Xb#e-tryw`XT(6R#J%
z=9HC{2_7d*m_VtisidKyLEQH&lWZ;$<_vjxdC~XZe^2i2?qWQ6Pc}CRC<#G{NTNf*Bsu9GcqzLJUsk~t*vba=7rUZgqrZ#0{WXN
zl}hhpJ*_-;?3mDZtQ~~$5jrF1yJpHV@ciKYi)F#{-&jLq!RPxpzw!59ckHL@u-=#P
zd5yvACG*F;%GXQ2=Q+zd#PfvbH~24uY%75lP1w(GY#RO90(?e*pCaa~Z{NOr1|T~-
zJF>B{p+0^3(1#y>NKQ^pBIUCv%HDxYv%tIh8wvaa1<>D$;HM|#NNLfc#V^>?%6U(~
zS}4%1TQ}b4s_^bE%B(?IYt(6yHL@Y%%H*&Be@C&0B?F6qB#hAv@Ewo--UGC32#uz$
z3;qTH|9O#5JZl0wfyqtHLw(zq@wmM%9+BS@I0ys)!molv1!xB}t1sR9)B`;Q0OtJX
zwgjZQ0Iw$-fjZX|yz2#g4r~R+0*Sy?;1l2p|oZ>rlE??FccI0i7?C%~tGJMd1vHeQ2JB?$N)SOEMZHbu};0+N9HKpIe|
zzPzcwP*)M)xn1u)_+4XAm?!2L=niPTiN~gV&%8fB4@x9d1rSgO{y2@tL7Y=CAkqR^
zS}IE`x)#pi_w@K-oJgNd6!odt_|<8l*7N)VwdZNPlI&TY%JK`^%JQvhr-ib1<7MR}
z&+CEjIHq4Ak=S!uERh&<3OTfDrr=*Z*Oj8Yyq>(BIIdp`@j0!Mr6i|cAd{y!Q@p3Y
zZaz=(F~jBQ+*5l_D>ExZS{g@jqCLXJ@1Lg}r)2^-0M&6?udonftX{k4Bj!XIaSW{y
z@6i?a0}y-Vh5NCH9|%G^RRH(Hau$sRypTUYl;xPM?1b0qe_gaePYLZeQB<*_sNk;}$eB_2EGl_9Sjs9<>gC$8KjHN0%d=Gi59egxbCP6Js$gx8+954`ro
zzqMZlv^-GnSD-px1+q||$Wf$i)RrtpJJrhP*e8x5LL7)Je&~5U5yyj=mJvBgMUZI-
zhT^R*$ZihWp8-XP2l^W^J0f<+H!DuW(U^Z^UyHuOifPozwGTOeBBc@glIWxTO9=F6
z;#aF^D&lYuk8|szFP8RrE8?<3kXO}ncU))Cj-7UF(>25%luj;4d0@XR_^jmw*FxyR
zdGr&}}t&jjnXUg$y0gH5i_^Sg*Z}`2eHd<_UR;#C{w?+=#{WQyJ=r
zrSL+YIZ$uEChBT|hjz@9rk-wdoJB+78%|VKRLWIWP~43BBqDUup{EtIu7hXZOn|$XtvhTl7&E($vApPEe4
zw7n!v&87*NtIH-ISUG2T<#$a=8{(N;j~cvFx^7>2WZ)$V_qhz8@FkiNbeh~}&o1fa
zX*Z>@`uJ7tsB5W*>bJ9?z#)ezW_XeC=d%Af-1BGZYB+?tIQRaEV|QLvw=wc;L)`qF
zT;^0pc!Q?bMd6Q)@V-J}?mv_av<$!5YxK~iNq-;FYz$hjYGYXXtl^HH;pO3;mnhWz
zG)djQBTw5^)UR8}7Cr4wQL1XHO=>ThelDZO;8|0zI$O{Gy^q=CQkf6;nX-!FO87&i
z&D5GT=~>aBN9WE)y}E8`uCD$-RaLn{=7X)kd5isjQ}9jNWZ(X<=?ukp?>T()R${FY
zc0{&0v+n|VY+LyYw#A)YyLPojUSsNjlD@vaH|(@`0O9vxnrz2}?Lhb@;5(v~D_2rp
zUS3sBPR^s{%a<3x2jB%AYG}Ng_VD4ulVOwloqb7cqh}i`e0##yh5n$PJ$n+{?@ygN
zC2ZAfgJoOt_U+q$b#!!ef0Z7;WuAhwvvUIEsbrrL(}rJ>=FFKxu+Ndby}ht!v7e7^
z>TKs_Ti2R3YlQ!c{T6X?aR))GzB*w7o8$9l)QdjsX*Tf1J!bnj!`IiBf`fyFtStA^rAvkG
z#l*xA`wCbe;d>Q6GPa#_zrlankp9=2IC0{UOP4N*6E)ky!@|PI$HzzbNnj%u{f+rX
z`}gk``p3Q__C2r<4F0WOVQXuM{z>5bb%74uVt+9EhS{#p{^3mc0eSB8nDgA{d6|%q
zApEfV_U)^J&G-atl%5#ShR#0)=(HX5dkgye0sGi_jM;z3b5FMJ2>%k>czF&$7xMA0
zvEv|=p!c58iSroyD%No`Gcy6UY4+&RgYCzq(96$3yI%TMOZn?~K-(r*^P&((@l)r{
zor}Q7ZTK*+Lhkce|NXK4H@O`WW3CRc{gdO|OaOg6$AEtSI@oTsY|voa%qU=5%|`KT
z3@irN-oti37obzkGWESjJ8Z+70Sp5|fN0>QFInX218g_qc(%gdvkmcV%619@I!rA%99E)Zr8Vd{v7xq~jiiHC$y
z3b5&=7-k6pewKkvF9mEaQ4nSxHud}uY~H{-HfwM>Zb!IfZxYcHqD&;X*iONNX#!N+
zDPChWz&EEFzKaJTjdI%-lRkL;j2t}Yd+u70kMHmtr0IB$^4c9Y0N?yCod;3Rgv*b}
zU0mvw8ADb<9{8Wr0&>|DPCbJ?$!FKXs*(Gbl#e^K@(TWEVg|NqU1(DQ_4V=pj#)tk
z>vr~%`mA?K30vH6!T6P~$sv1#k8b#8(${Ok@C_J=Z(;FGR;vNo1HNZfQ|O|aW?L->
zeT$BV4XwIlb#t@r9RA~WgRt*1)bL-0*YrYli&`Et=B5VD+CzciyUT{oni(VMhClVa
z08@4
zKtoBbrTQ2RZSBIA8Z8M&_hOtemLk5w80+b4_bvEI)v+(miI0na#QFb80ZQA_(S%sv;Um;Fq9WDC5Yv?w_?SL$*<#|
z`wlTZj?<@4KhUpVzrXn`fIX=S{dXBMyvvzG8|TBhkRchqz~$Jx9bP5xtMafOnE`g#
zdj?@IQpQ<;?cEN56tI3(otk+l!~P=PORCpX+_T@PFYwa&q10F+DTF71)2cX$q=I4p
Xzm)TfVf8Kqig90xcU%sOkih=~MJbl=

diff --git a/assets/img/favicons/favicon.svg b/assets/img/favicons/favicon.svg
new file mode 100755
index 00000000..7e1e8cb8
--- /dev/null
+++ b/assets/img/favicons/favicon.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/assets/img/favicons/mstile-150x150.png b/assets/img/favicons/mstile-150x150.png
deleted file mode 100644
index c0d045e25de42fc422567313f9e4e6f2717e8040..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12172
zcmc(FXEst@nM`+AHd{rV_~m+6N#Ih(twMK?elFBK`MEh!0%(
zP^56x5{+NS6Vrd}I
z6PK(;Z3*B5{C8?f3ZVOcKY1<1Nx&5XcNGmqf^}S4au8o~WTznr#LcCmAglXfZg%IRO0jf`?;W+&9kSRY6g^Ylp}eO-*6v|x^`xN`et0gNq9`kd@*kE5EV>>
zWvOsm@{J=8r}r`LFUneS>};7{#j@fN+wlJD@n^Y}kbjY;l8a^J@rq>cTt^gM>(
zDPmrd*Ep)r3zK#JcmJH)r@Je?&ySa7F!dRp4ARrldH28{{Aa7std%9QM(9BnQ5MNV
zoYVG})_vy}Cza0&ub$dFb{YDn*VN7$a%Kkx*LWt>cpB%&YcZHC$T0=YN#|^46Ww5c
z`+Hc0^$JIO`1pV!Db23jl8~7##vl98^MqEzf=&{vB?!d3g)d2lAP%>(+-?c})iP#aPk=MG5yycA%+jw&ig+{{=U+(;sQnlC)3uq?r|tZ~wIr>9IS~=-I?7#_AM{FR0ize0)*1e;vrZ
zR-;Go3I|2eW4MF;Xf3eC>#8+(q0?ry{j$9+VL1OM_B2TNvNhK`6;TSl5IN98TQW~w
z>J$9P_8WSqbt*6)M0VYJ?}x=xs`EXj#xuI+ta3<-seEd#Vbu2I)4hR#y;kMa-K1gW
zo_c9H{~~93jg4Z#D0FHr_pLo#@+uEl@t;%NKc?p7%s2~m$)@IjkCeojCI+YG&Y8aZ
zD-~#?41Iwm*W0`spPIWatAUr*tT)js71o@+u-{d+-$e{L2D~dTe|{pUqq-|=GlZEO
zinu1S-~Hs(IIPUNYG5zzT)sHguzWf-=lqwJ*He^q+EDzLp>JZ1XL5~x6As5DV2QLv
zx#RXrM&kg&v-3ViS&X9nu5Ve5p-s_*%)9cqxAynN$FgP=G2IAng6jDfqz8`w`9*xNk1YMxlxY(6&m#?q@}PH|~{LH5=@
zhV&g%F18ftYcSJwYg_#Ydm*Vb3B3}<^0_}6>qt_)7(}3JTsbv`W%g8hYE24F_ECym
zkJ_-*|HPYOMy}QV>RL=ZhUBTVvGf!MzPl#w^f;zF
zHWK_y+6+a1BtJ(mei`}{61j$IrK!GtBdgG8w!D6ek2Xa+LymOWlHPNjG<@$=!$E
_nQW8n*?}ESWU%R`ze^O_AZ*R}?Sv8@5
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
Q14DpR6g3r)a^@lb2jOPeO2aXL0@bz0dc*n3;>Y
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

literal 0
HcmV?d00001

diff --git a/assets/img/favicons/web-app-manifest-512x512.png b/assets/img/favicons/web-app-manifest-512x512.png
new file mode 100755
index 0000000000000000000000000000000000000000..fd0ce60ae4abfd58e029b18dc1a26f0d03299a70
GIT binary patch
literal 69328
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
993B&C(!B
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
Date: Mon, 20 Oct 2025 03:11:12 +0800
Subject: [PATCH 137/177] build(dev-deps): upgrade dependencies

---
 package.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index bb712a6b..26def130 100644
--- a/package.json
+++ b/package.json
@@ -30,28 +30,28 @@
     "bootstrap": "^5.3.6"
   },
   "devDependencies": {
-    "@babel/core": "^7.27.1",
+    "@babel/core": "^7.28.4",
     "@babel/plugin-transform-class-properties": "^7.27.1",
     "@babel/plugin-transform-private-methods": "^7.27.1",
-    "@babel/preset-env": "^7.27.2",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@babel/preset-env": "^7.28.3",
+    "@commitlint/cli": "^20.1.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
-    "concurrently": "^9.1.2",
-    "conventional-changelog-conventionalcommits": "^8.0.0",
-    "eslint": "^9.27.0",
-    "globals": "^16.1.0",
+    "concurrently": "^9.2.1",
+    "conventional-changelog-conventionalcommits": "^9.1.0",
+    "eslint": "^9.38.0",
+    "globals": "^16.4.0",
     "husky": "^9.1.7",
     "purgecss": "^7.0.2",
-    "rollup": "^4.41.0",
-    "semantic-release": "^24.2.4",
-    "stylelint": "^16.19.1",
-    "stylelint-config-standard-scss": "^15.0.1"
+    "rollup": "^4.52.5",
+    "semantic-release": "^25.0.1",
+    "stylelint": "^16.25.0",
+    "stylelint-config-standard-scss": "^16.0.0"
   },
   "prettier": {
     "trailingComma": "none"

From 3578111ecdd1242851fb8a2cbc5eea92c6b9d519 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 20 Oct 2025 05:21:46 +0800
Subject: [PATCH 138/177] refactor: resolve various StyleLint warnings

---
 _sass/base/_syntax.scss     | 1 -
 _sass/base/_typography.scss | 4 +---
 _sass/pages/_home.scss      | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/_sass/base/_syntax.scss b/_sass/base/_syntax.scss
index ae03d0dc..34ddbe60 100644
--- a/_sass/base/_syntax.scss
+++ b/_sass/base/_syntax.scss
@@ -24,7 +24,6 @@
     margin-bottom: 0;
     font-size: v.$code-font-size;
     line-height: 1.4rem;
-    word-wrap: normal; /* Fixed Safari overflow-x */
   }
 
   table {
diff --git a/_sass/base/_typography.scss b/_sass/base/_typography.scss
index 1e7a6ef3..8b679726 100644
--- a/_sass/base/_typography.scss
+++ b/_sass/base/_typography.scss
@@ -26,9 +26,7 @@
         }
       }
 
-      & {
-        font-size: 1rem + (5 - $i) * $size-factor;
-      }
+      font-size: 1rem + (5 - $i) * $size-factor;
     } @else {
       font-size: 1.05rem;
     }
diff --git a/_sass/pages/_home.scss b/_sass/pages/_home.scss
index 027cbe6a..84f4b4aa 100644
--- a/_sass/pages/_home.scss
+++ b/_sass/pages/_home.scss
@@ -134,9 +134,6 @@
     .page-link {
       color: var(--btn-patinator-text-color);
       padding: 0 0.6rem;
-      display: -webkit-box;
-      -webkit-box-pack: center;
-      -webkit-box-align: center;
       border-radius: 0.5rem;
       border: 0;
       background-color: inherit;

From 45cb428b0182fdb941812f2090692d0fffbcfd9a Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 20 Oct 2025 07:11:29 +0800
Subject: [PATCH 139/177] build(deps): upgrade dependencies

---
 _data/origin/cors.yml | 16 ++++++++--------
 _includes/head.html   |  2 +-
 assets/lib            |  2 +-
 package.json          |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml
index e9bb4eb9..ce99f814 100644
--- a/_data/origin/cors.yml
+++ b/_data/origin/cors.yml
@@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
 # Libraries
 
 toc:
-  css: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.css
-  js: https://cdn.jsdelivr.net/npm/tocbot@4.32.2/dist/tocbot.min.js
+  css: https://cdn.jsdelivr.net/npm/tocbot@4.36.4/dist/tocbot.min.css
+  js: https://cdn.jsdelivr.net/npm/tocbot@4.36.4/dist/tocbot.min.js
 
 fontawesome:
-  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.7.1/css/all.min.css
+  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.1.0/css/all.min.css
 
 search:
   js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js
 
 mermaid:
-  js: https://cdn.jsdelivr.net/npm/mermaid@11.4.0/dist/mermaid.min.js
+  js: https://cdn.jsdelivr.net/npm/mermaid@11.12.0/dist/mermaid.min.js
 
 dayjs:
   js:
-    common: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/dayjs.min.js
-    locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/locale/:LOCALE.js
-    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/plugin/relativeTime.js
-    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.13/plugin/localizedFormat.js
+    common: https://cdn.jsdelivr.net/npm/dayjs@1.11.18/dayjs.min.js
+    locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.18/locale/:LOCALE.js
+    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.18/plugin/relativeTime.js
+    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.18/plugin/localizedFormat.js
 
 glightbox:
   css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css
diff --git a/_includes/head.html b/_includes/head.html
index e24384d5..d0fcfd9b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -70,7 +70,7 @@
 
   
   {% unless jekyll.environment == 'production' %}
-    
+    
   {% endunless %}
 
   
diff --git a/assets/lib b/assets/lib
index 02f4ada6..93e03454 160000
--- a/assets/lib
+++ b/assets/lib
@@ -1 +1 @@
-Subproject commit 02f4ada65dc75197654c3265a37a6f5fbc39f17c
+Subproject commit 93e03454edf879bdf8abe34b9715b9fea4da0ee8
diff --git a/package.json b/package.json
index 26def130..3fb11af7 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.6"
+    "bootstrap": "^5.3.8"
   },
   "devDependencies": {
     "@babel/core": "^7.28.4",

From 18ab8fcfdf45ce3af9488829ed141e8e642bd48c Mon Sep 17 00:00:00 2001
From: semantic-release-bot 
Date: Sun, 19 Oct 2025 23:15:40 +0000
Subject: [PATCH 140/177] chore(release): 7.4.0

## [7.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.1...v7.4.0) (2025-10-19)

### Features

* add support for embed spotify ([#2515](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2515)) ([cda62e2](https://github.com/cotes2020/jekyll-theme-chirpy/commit/cda62e28d1b71ce4018301aacf93532230aa2b3b))
* **i18n:** add Danish locale ([#2410](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2410)) ([f5802b8](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f5802b8a8a4fb94cd51a484e438f6ba2ba8d62c9))
* **i18n:** add locale files for some rtl languages ([#2415](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2415)) ([18c48b4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/18c48b4c49f896eeeeb52a8de1dca715add70c6a))

### Bug Fixes

* avoid unconfigured social options in sidebar ([#2507](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2507)) ([5f8ec7f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5f8ec7ffd3b23998bad48c110e809576fe5daf80))
* correct GoatCounter pageviews extraction ([#2420](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2420)) ([c706799](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c706799f9b2e724dee9a3b891dea72dfa587929e))
* resolve discrepancy in lqip between post and main page ([#2453](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2453)) ([1bac96a](https://github.com/cotes2020/jekyll-theme-chirpy/commit/1bac96a8e1ae23a7a48f2b7d249bfbfd5d9bfe50))
* restore blurry animation for homepage LQIP ([#2551](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2551)) ([221ca9f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/221ca9f52b55b103900832f3c03ad2ecc4415bcc))
* **search:** restore full-text search for posts with description ([#2557](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2557)) ([604528e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/604528e3ce11ec0278e83f41105ed5949362bb54))
---
 docs/CHANGELOG.md           | 16 ++++++++++++++++
 jekyll-theme-chirpy.gemspec |  2 +-
 package.json                |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b9a41727..d22d8c2a 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [7.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.1...v7.4.0) (2025-10-19)
+
+### Features
+
+* add support for embed spotify ([#2515](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2515)) ([cda62e2](https://github.com/cotes2020/jekyll-theme-chirpy/commit/cda62e28d1b71ce4018301aacf93532230aa2b3b))
+* **i18n:** add Danish locale ([#2410](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2410)) ([f5802b8](https://github.com/cotes2020/jekyll-theme-chirpy/commit/f5802b8a8a4fb94cd51a484e438f6ba2ba8d62c9))
+* **i18n:** add locale files for some rtl languages ([#2415](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2415)) ([18c48b4](https://github.com/cotes2020/jekyll-theme-chirpy/commit/18c48b4c49f896eeeeb52a8de1dca715add70c6a))
+
+### Bug Fixes
+
+* avoid unconfigured social options in sidebar ([#2507](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2507)) ([5f8ec7f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/5f8ec7ffd3b23998bad48c110e809576fe5daf80))
+* correct GoatCounter pageviews extraction ([#2420](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2420)) ([c706799](https://github.com/cotes2020/jekyll-theme-chirpy/commit/c706799f9b2e724dee9a3b891dea72dfa587929e))
+* resolve discrepancy in lqip between post and main page ([#2453](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2453)) ([1bac96a](https://github.com/cotes2020/jekyll-theme-chirpy/commit/1bac96a8e1ae23a7a48f2b7d249bfbfd5d9bfe50))
+* restore blurry animation for homepage LQIP ([#2551](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2551)) ([221ca9f](https://github.com/cotes2020/jekyll-theme-chirpy/commit/221ca9f52b55b103900832f3c03ad2ecc4415bcc))
+* **search:** restore full-text search for posts with description ([#2557](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2557)) ([604528e](https://github.com/cotes2020/jekyll-theme-chirpy/commit/604528e3ce11ec0278e83f41105ed5949362bb54))
+
 ## [7.3.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.0...v7.3.1) (2025-07-26)
 
 ### Bug Fixes
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
index a4d3679b..9475db13 100644
--- a/jekyll-theme-chirpy.gemspec
+++ b/jekyll-theme-chirpy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "7.3.1"
+  spec.version       = "7.4.0"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["cotes.chung@gmail.com"]
 
diff --git a/package.json b/package.json
index 3fb11af7..ddc79d4b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "7.3.1",
+  "version": "7.4.0",
   "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",

From 37377a43e0ae6e316b0001a6955e0a93c10a7936 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 27 Oct 2025 05:16:47 +0800
Subject: [PATCH 141/177] =?UTF-8?q?Revert=20"refactor:=20avoid=20convertin?=
 =?UTF-8?q?g=20media=E2=80=98s=20relative=20paths=20to=20absolute=20paths?=
 =?UTF-8?q?=20(#2552)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b3d7db3cda006a63cdecd718f97d415eab709dc8.
---
 _includes/media-url.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/_includes/media-url.html b/_includes/media-url.html
index 407d4218..ea410750 100644
--- a/_includes/media-url.html
+++ b/_includes/media-url.html
@@ -15,9 +15,7 @@
 {%- if url -%}
   {% unless url contains ':' %}
     {%- comment -%} Add media resources subpath prefix {%- endcomment -%}
-    {% if include.subpath %}
-      {% assign url = include.subpath | append: '/' | append: url %}
-    {% endif %}
+    {% assign url = include.subpath | default: '' | append: '/' | append: url %}
 
     {%- comment -%} Prepend CND URL {%- endcomment -%}
     {% if site.cdn %}

From 66bf232951fbe752821b623dc1e7e4e2824c15bf Mon Sep 17 00:00:00 2001
From: Cotes <11371340+cotes2020@users.noreply.github.com>
Date: Mon, 27 Oct 2025 05:39:39 +0800
Subject: [PATCH 142/177] fix: avoid duplicate base URL for homepage preview
 images (#2568)

---
 _layouts/default.html |  2 +-
 _layouts/home.html    | 35 +++++++++++++++++++++++++++--------
 _layouts/post.html    |  1 -
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/_layouts/default.html b/_layouts/default.html
index a55bfefe..f36c6057 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -25,7 +25,7 @@
 
         
 
   

-    
-    {% if page.categories.size > 0 %}
-      

-        
-        {% for category in page.categories %}
-          {{ category }}
-          {%- unless forloop.last -%},{%- endunless -%}
-        {% endfor %}
-      

-    {% endif %}
+    

+      
+      {% if page.categories.size > 0 %}
+        

+          
+          {% for category in page.categories %}
+            {{ category }}
+            {%- unless forloop.last -%},{%- endunless -%}
+          {% endfor %}
+        

+      {% endif %}
+
+      
+      {% include post-edit.html lang=lang %}
+    

 
     
     {% if page.tags.size > 0 %}
diff --git a/_sass/pages/_post.scss b/_sass/pages/_post.scss
index 5ba78d97..31f7a8e2 100644
--- a/_sass/pages/_post.scss
+++ b/_sass/pages/_post.scss
@@ -148,6 +148,16 @@ header {
   }
 }
 
+.post-edit {
+  line-height: 1.2rem;
+
+  > a {
+    &:hover {
+      @extend %link-hover;
+    }
+  }
+}
+
 .post-navigation {
   @include bp.lt(bp.get(lg)) {
     @include mx.pl-pr(0);

From 2cfb4bba8801d46bcc86cf7f21ab1d4d3c1a47c1 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Fri, 15 May 2026 15:01:34 +0800
Subject: [PATCH 162/177] chore: update github issue template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7b513fb5..6d64e468 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -53,7 +53,7 @@ body:
       value: |
         - Ruby: 
         - Jekyll: 
-        - Chirpy: 
+        - Chirpy: 
     validations:
       required: true
 

From 1344e9024621a7ed9f1282d23b3d19502bc4041a Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Fri, 15 May 2026 15:17:06 +0800
Subject: [PATCH 163/177] docs: update readme

---
 README.md | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index f17f5225..b5ef1a7d 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@
 
   A minimal, responsive, and feature-rich Jekyll theme for technical writing.
 
-  [![CI](https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github)][ci] 
-  [![Codacy Badge](https://img.shields.io/codacy/grade/4e556876a3c54d5e8f2d2857c4f43894?logo=codacy)][codacy] 
-  [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy?color=goldenrod)][license] 
-  [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=orange)][gem] 
-  [![Open in Dev Containers](https://img.shields.io/badge/Dev_Containers-Open-deepskyblue?logo=linuxcontainers)][open-container]
+  [![CI][badge-ci]][ci] 
+  [![Codacy Badge][badge-codacy]][codacy] 
+  [![GitHub license][badge-license]][license] 
+  [![Gem Version][badge-gem]][gem] 
+  [![Open in Dev Containers][badge-open-container]][open-container]
 
   [**Live Demo** →][demo]
 
@@ -45,28 +45,23 @@ For details, please refer to our [Contributing Guidelines][contribute-guide].
 
 ## Credits
 
-### Contributors
+This project is built on the [Jekyll][jekyllrb] ecosystem and integrates a
+collection of [excellent libraries][lib]. Its avatar and favicon are sourced
+from [ClipartMAX][clipartmax].
 
-Thanks to [all the contributors][contributors] involved in the development of
-the project!
+Furthermore, thanks to everyone who contributed to the development of this project!
 
-[![all-contributors](https://contrib.rocks/image?repo=cotes2020/jekyll-theme-chirpy&columns=16&max=112)][contributors]
- — Made with [contrib.rocks](https://contrib.rocks)
-
-### Third-Party Assets
-
-This project is built on the [Jekyll][jekyllrb] ecosystem and integrates several
-[great libraries][lib]. It is developed using [VS Code][vscode] and tools
-provided by [JetBrains][jetbrains] under a non-commercial open-source software
-license.
-
-The avatar and favicon for the project's website are sourced from
-[ClipartMAX][clipartmax].
+[![all-contributors][contributors-avatar]][contributors]
 
 ## License
 
-This project is published under the [MIT License][license].
+This project is licensed under the [MIT License][license].
 
+[badge-ci]: https://img.shields.io/github/actions/workflow/status/cotes2020/jekyll-theme-chirpy/ci.yml?logo=github
+[badge-codacy]: https://img.shields.io/codacy/grade/4e556876a3c54d5e8f2d2857c4f43894?logo=codacy
+[badge-license]: https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy?color=goldenrod
+[badge-gem]: https://img.shields.io/gem/v/jekyll-theme-chirpy?&logo=RubyGems&logoColor=ghostwhite&label=gem&color=orange
+[badge-open-container]: https://img.shields.io/badge/Dev_Containers-Open-deepskyblue?logo=linuxcontainers
 [gem]: https://rubygems.org/gems/jekyll-theme-chirpy
 [ci]: https://github.com/cotes2020/jekyll-theme-chirpy/actions/workflows/ci.yml?query=event%3Apush+branch%3Amaster
 [codacy]: https://app.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade
@@ -78,6 +73,5 @@ This project is published under the [MIT License][license].
 [wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki
 [contribute-guide]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md
 [contributors]: https://github.com/cotes2020/jekyll-theme-chirpy/graphs/contributors
+[contributors-avatar]: https://contrib.rocks/image?repo=cotes2020/jekyll-theme-chirpy&columns=16&max=112
 [lib]: https://github.com/cotes2020/chirpy-static-assets
-[vscode]: https://code.visualstudio.com/
-[jetbrains]: https://www.jetbrains.com/?from=jekyll-theme-chirpy

From 97a537e692e5c61b0ccbb0da66433399c4521110 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Fri, 15 May 2026 15:22:19 +0800
Subject: [PATCH 164/177] chore(deps): bump mathjax from 3.2.2 to 4.x

---
 _data/origin/cors.yml      | 2 +-
 _includes/js-selector.html | 1 -
 _sass/base/_base.scss      | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml
index 8e0c0ba8..0f1cf18b 100644
--- a/_data/origin/cors.yml
+++ b/_data/origin/cors.yml
@@ -51,4 +51,4 @@ clipboard:
   js: https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js
 
 mathjax:
-  js: https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/tex-chtml.js
+  js: https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js
diff --git a/_includes/js-selector.html b/_includes/js-selector.html
index 5a80532f..cdd60e7d 100644
--- a/_includes/js-selector.html
+++ b/_includes/js-selector.html
@@ -67,7 +67,6 @@
 {% if page.math %}
   
   
-  
   
 {% endif %}
 
diff --git a/_sass/base/_base.scss b/_sass/base/_base.scss
index b512a484..80c84827 100644
--- a/_sass/base/_base.scss
+++ b/_sass/base/_base.scss
@@ -391,8 +391,9 @@ main {
 
 /* MathJax */
 mjx-container {
-  overflow-y: hidden;
-  min-width: auto !important;
+  a {
+    display: inline-block;
+  }
 }
 
 @media (hover: hover) {

From 832b24729d17da0dbe26bf237993df633594c0c6 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Fri, 15 May 2026 15:38:08 +0800
Subject: [PATCH 165/177] refactor(deps): update CDN URLs to follow production
 best practices (#2740)

---
 _data/origin/cors.yml | 28 ++++++++++++++--------------
 _includes/head.html   |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml
index 0f1cf18b..e40cc357 100644
--- a/_data/origin/cors.yml
+++ b/_data/origin/cors.yml
@@ -20,35 +20,35 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
 # Libraries
 
 toc:
-  css: https://cdn.jsdelivr.net/npm/tocbot@4.36.4/dist/tocbot.min.css
-  js: https://cdn.jsdelivr.net/npm/tocbot@4.36.4/dist/tocbot.min.js
+  css: https://cdn.jsdelivr.net/npm/tocbot@4/dist/tocbot.min.css
+  js: https://cdn.jsdelivr.net/npm/tocbot@4/dist/tocbot.min.js
 
 fontawesome:
-  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.2.0/css/all.min.css
+  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7/css/all.min.css
 
 search:
-  js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js
+  js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1/dest/simple-jekyll-search.min.js
 
 mermaid:
-  js: https://cdn.jsdelivr.net/npm/mermaid@11.13.0/dist/mermaid.min.js
+  js: https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.min.js
 
 dayjs:
   js:
-    common: https://cdn.jsdelivr.net/npm/dayjs@1.11.20/dayjs.min.js
-    locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.20/locale/:LOCALE.js
-    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.20/plugin/relativeTime.js
-    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.20/plugin/localizedFormat.js
+    common: https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js
+    locale: https://cdn.jsdelivr.net/npm/dayjs@1/locale/:LOCALE.js
+    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1/plugin/relativeTime.js
+    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1/plugin/localizedFormat.js
 
 glightbox:
-  css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css
-  js: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/js/glightbox.min.js
+  css: https://cdn.jsdelivr.net/npm/glightbox@3/dist/css/glightbox.min.css
+  js: https://cdn.jsdelivr.net/npm/glightbox@3/dist/js/glightbox.min.js
 
 lazy-polyfill:
-  css: https://cdn.jsdelivr.net/npm/loading-attribute-polyfill@2.1.1/dist/loading-attribute-polyfill.min.css
-  js: https://cdn.jsdelivr.net/npm/loading-attribute-polyfill@2.1.1/dist/loading-attribute-polyfill.umd.min.js
+  css: https://cdn.jsdelivr.net/npm/loading-attribute-polyfill@2/dist/loading-attribute-polyfill.min.css
+  js: https://cdn.jsdelivr.net/npm/loading-attribute-polyfill@2/dist/loading-attribute-polyfill.umd.min.js
 
 clipboard:
-  js: https://cdn.jsdelivr.net/npm/clipboard@2.0.11/dist/clipboard.min.js
+  js: https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js
 
 mathjax:
   js: https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js
diff --git a/_includes/head.html b/_includes/head.html
index 3ad52fd9..82f10152 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -83,7 +83,7 @@
 
   
   {% unless jekyll.environment == 'production' %}
-    
+    
   {% endunless %}
 
   

From fb3aa94c1f2b2ed99e863e9b7440dcbf8a15614d Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 16 May 2026 14:37:04 +0800
Subject: [PATCH 166/177] chore: remove funding

---
 .github/FUNDING.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index fed8764e..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-ko_fi: coteschung

From 38232120b729de653bfb42909a8dad047559438d Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 16 May 2026 14:39:58 +0800
Subject: [PATCH 167/177] fix(pwa): avoid iOS status bar overlapping PWA
 content (#2173)

Fixes #2173
---
 _includes/head.html                  | 2 --
 assets/img/favicons/site.webmanifest | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index 82f10152..048904c4 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -2,8 +2,6 @@
   
   
   
-  
-  
   
Date: Sat, 23 May 2026 23:00:48 +0800
Subject: [PATCH 168/177] fix(giscus): synchronize theme state during lazy
 loading (#2742)

Previously, theme switch events were lost if triggered before the
Giscus iframe was fully loaded (e.g., when deferred by lazy loading
or before the client script executed). This resulted in Giscus
rendering with the outdated initial theme once it finally appeared
in the viewport.

This commit handles these edge cases by:
1. Updating the `data-theme` attribute on the Giscus script node
   if the iframe hasn't been created yet.
2. Modifying the `theme` query parameter in the iframe's `src` URL
   if it is currently in a pending/lazy-loading state.
---
 _includes/comments/giscus.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/_includes/comments/giscus.html b/_includes/comments/giscus.html
index 80584720..2d5f7e7b 100644
--- a/_includes/comments/giscus.html
+++ b/_includes/comments/giscus.html
@@ -39,16 +39,25 @@
     addEventListener('message', (event) => {
       if (event.source === window && event.data && event.data.id === Theme.ID) {
         const newTheme = themeMapper[Theme.visualState];
-
         const message = {
           setConfig: {
             theme: newTheme
           }
         };
 
-        const giscus =
-          document.getElementsByClassName('giscus-frame')[0].contentWindow;
-        giscus.postMessage({ giscus: message }, 'https://giscus.app');
+        const iframe = document.querySelector('.giscus-frame');
+
+        if (!iframe) {
+          return;
+        }
+
+        if (iframe.classList.contains('giscus-frame--loading')) {
+          let url = new URL(iframe.src);
+          url.searchParams.set('theme', newTheme);
+          iframe.src = url.toString();
+        }
+
+        iframe.contentWindow.postMessage({ giscus: message }, 'https://giscus.app');
       }
     });
   })();

From 7496dd41fa053c4636a82027fe3fb3e38357e385 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Wed, 17 Jun 2026 23:20:12 +0800
Subject: [PATCH 169/177] feat(theme): persist user theme preferences (#2756)

- Migrate theme persistence from `sessionStorage` to `localStorage`
- Rename theme HTML attribute to `data-bs-theme` for Bootstrap compatibility
- Trim and compile CSS according to the chosen theme mode
---
 _data/locales/ar.yml                          |   5 +
 _data/locales/bg-BG.yml                       |   5 +
 _data/locales/ca-ES.yml                       |   5 +
 _data/locales/cs-CZ.yml                       |   5 +
 _data/locales/da-DK.yml                       |   5 +
 _data/locales/de-DE.yml                       |   5 +
 "_data/locales/dv\342\200\221MV.yml"          |   5 +
 _data/locales/el-GR.yml                       |   5 +
 _data/locales/en.yml                          |   5 +
 _data/locales/es-ES.yml                       |   5 +
 _data/locales/fa-IR.yml                       |   5 +
 _data/locales/fi-FI.yml                       |   5 +
 _data/locales/fr-FR.yml                       |   5 +
 _data/locales/hu-HU.yml                       |   5 +
 _data/locales/id-ID.yml                       |   5 +
 _data/locales/it-IT.yml                       |   5 +
 _data/locales/ja-JP.yml                       |   5 +
 _data/locales/ko-KR.yml                       |   5 +
 _data/locales/ku-IQ.yml                       |   5 +
 _data/locales/my-MM.yml                       |   5 +
 _data/locales/nl-NL.yml                       |   5 +
 "_data/locales/ps\342\200\221AF.yml"          |   5 +
 _data/locales/pt-BR.yml                       |   5 +
 _data/locales/ru-RU.yml                       |   5 +
 _data/locales/sl-SI.yml                       |   5 +
 _data/locales/sv-SE.yml                       |   5 +
 _data/locales/th.yml                          |   5 +
 _data/locales/tr-TR.yml                       |   5 +
 _data/locales/uk-UA.yml                       |   5 +
 _data/locales/ur-PK.yml                       |   5 +
 _data/locales/vi-VN.yml                       |   5 +
 _data/locales/zh-CN.yml                       |   5 +
 _data/locales/zh-TW.yml                       |   5 +
 _data/origin/cors.yml                         |   3 +
 _includes/comments/disqus.html                |   4 +-
 _includes/comments/giscus.html                |   9 +-
 _includes/comments/utterances.html            |   8 +-
 _includes/head.html                           |   2 +-
 _includes/sidebar.html                        |  52 ++++-
 _javascript/modules/components/img-popup.js   |  10 +-
 _javascript/modules/components/mermaid.js     |  14 +-
 _javascript/modules/components/mode-toggle.js |  41 +++-
 _javascript/theme.js                          | 192 ++++++++++--------
 _layouts/default.html                         |  11 +-
 _sass/abstracts/_mixins.scss                  |   6 +
 _sass/abstracts/_variables.scss               |   6 +
 _sass/base/_base.scss                         |  43 ++--
 _sass/layout/_sidebar.scss                    | 102 +++++++++-
 _sass/themes/_dark.scss                       |   9 +-
 _sass/themes/_light.scss                      |   9 +-
 assets/css/jekyll-theme-chirpy.scss           |   4 +
 51 files changed, 539 insertions(+), 151 deletions(-)

diff --git a/_data/locales/ar.yml b/_data/locales/ar.yml
index 78e6f942..7a10aa15 100644
--- a/_data/locales/ar.yml
+++ b/_data/locales/ar.yml
@@ -49,6 +49,11 @@ notification:
   update_found: يتوفر اصدار جديد للمحتوى.
   update: تحديث
 
+theme:
+  light: فاتح
+  dark: داكن
+  system: النظام
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/bg-BG.yml b/_data/locales/bg-BG.yml
index 5b50a3ee..1c8ab32e 100644
--- a/_data/locales/bg-BG.yml
+++ b/_data/locales/bg-BG.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Налична е нова версия на съдържанието.
   update: Обнови
 
+theme:
+  light: Светла
+  dark: Тъмна
+  system: Системна
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ca-ES.yml b/_data/locales/ca-ES.yml
index 7e68f451..ea0ea130 100644
--- a/_data/locales/ca-ES.yml
+++ b/_data/locales/ca-ES.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Hi ha una nova versió de contingut disponible.
   update: Actualitzar
 
+theme:
+  light: Clar
+  dark: Fosc
+  system: Sistema
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/cs-CZ.yml b/_data/locales/cs-CZ.yml
index 41b31d61..a2689efd 100644
--- a/_data/locales/cs-CZ.yml
+++ b/_data/locales/cs-CZ.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Je k dispozici nová verze obsahu.
   update: Aktualizace
 
+theme:
+  light: Světlý
+  dark: Tmavý
+  system: Systém
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/da-DK.yml b/_data/locales/da-DK.yml
index 3b841750..73c35034 100644
--- a/_data/locales/da-DK.yml
+++ b/_data/locales/da-DK.yml
@@ -49,6 +49,11 @@ notification:
   update_found: En ny version af indholdet er fundet!
   update: Opdater
 
+theme:
+  light: Lys
+  dark: Mørk
+  system: System
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/de-DE.yml b/_data/locales/de-DE.yml
index 8e26b617..fe5940b0 100644
--- a/_data/locales/de-DE.yml
+++ b/_data/locales/de-DE.yml
@@ -48,6 +48,11 @@ notification:
   update_found: Eine neue Version ist verfügbar.
   update: Neue Version
 
+theme:
+  light: Hell
+  dark: Dunkel
+  system: System
+
 # ----- Posts related labels -----
 
 post:
diff --git "a/_data/locales/dv\342\200\221MV.yml" "b/_data/locales/dv\342\200\221MV.yml"
index a808fd61..a0158c85 100644
--- "a/_data/locales/dv\342\200\221MV.yml"
+++ "b/_data/locales/dv\342\200\221MV.yml"
@@ -49,6 +49,11 @@ notification:
   update_found: ޔޫ ވާރޝަން ހުރިހާ.
   update: އޮޕްޑޭޓް
 
+theme:
+  light: އަލި
+  dark: އަނދިރި
+  system: ސިސްޓަމް
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/el-GR.yml b/_data/locales/el-GR.yml
index 48d25f74..5df549e9 100644
--- a/_data/locales/el-GR.yml
+++ b/_data/locales/el-GR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Υπάρχει διαθέσιμη μια νέα έκδοση του περιεχομένου.
   update: Ενημέρωση
 
+theme:
+  light: Φωτεινό
+  dark: Σκοτεινό
+  system: Σύστημα
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/en.yml b/_data/locales/en.yml
index d35362e0..e453b121 100644
--- a/_data/locales/en.yml
+++ b/_data/locales/en.yml
@@ -49,6 +49,11 @@ notification:
   update_found: A new version of content is available.
   update: Update
 
+theme:
+  light: Light
+  dark: Dark
+  system: System
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/es-ES.yml b/_data/locales/es-ES.yml
index d989b5b5..a8390c37 100644
--- a/_data/locales/es-ES.yml
+++ b/_data/locales/es-ES.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Hay una nueva versión de contenido disponible.
   update: Actualizar
 
+theme:
+  light: Claro
+  dark: Oscuro
+  system: Sistema
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/fa-IR.yml b/_data/locales/fa-IR.yml
index 0d990a8e..6cc27cd0 100644
--- a/_data/locales/fa-IR.yml
+++ b/_data/locales/fa-IR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: نسخه جدیدی از محتوا موجود است.
   update: به‌روزرسانی
 
+theme:
+  light: روشن
+  dark: تیره
+  system: سیستم
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/fi-FI.yml b/_data/locales/fi-FI.yml
index b8b1c196..889ac721 100644
--- a/_data/locales/fi-FI.yml
+++ b/_data/locales/fi-FI.yml
@@ -48,6 +48,11 @@ notification:
   update_found: Uusi versio sisällöstä on saatavilla.
   update: Päivitä
 
+theme:
+  light: Vaalea
+  dark: Tumma
+  system: Järjestelmä
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/fr-FR.yml b/_data/locales/fr-FR.yml
index c4884c3c..2925a741 100644
--- a/_data/locales/fr-FR.yml
+++ b/_data/locales/fr-FR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Une nouvelle version du contenu est disponible.
   update: Mise à jour
 
+theme:
+  light: Clair
+  dark: Sombre
+  system: Système
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/hu-HU.yml b/_data/locales/hu-HU.yml
index 3c379f65..a14756b7 100644
--- a/_data/locales/hu-HU.yml
+++ b/_data/locales/hu-HU.yml
@@ -50,6 +50,11 @@ notification:
   update_found: Elérhető a tartalom új verziója.
   update: Frissítés
 
+theme:
+  light: Világos
+  dark: Sötét
+  system: Rendszer
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/id-ID.yml b/_data/locales/id-ID.yml
index 337e4c00..0f1bb2f9 100644
--- a/_data/locales/id-ID.yml
+++ b/_data/locales/id-ID.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Versi konten baru tersedia.
   update: Perbarui
 
+theme:
+  light: Terang
+  dark: Gelap
+  system: Sistem
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/it-IT.yml b/_data/locales/it-IT.yml
index e1137a99..671ff1ca 100644
--- a/_data/locales/it-IT.yml
+++ b/_data/locales/it-IT.yml
@@ -48,6 +48,11 @@ notification:
   update_found: Nuova versione del contenuto disponibile.
   update: Aggiornamento
 
+theme:
+  light: Chiaro
+  dark: Scuro
+  system: Sistema
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ja-JP.yml b/_data/locales/ja-JP.yml
index 68891dcb..c271e332 100644
--- a/_data/locales/ja-JP.yml
+++ b/_data/locales/ja-JP.yml
@@ -49,6 +49,11 @@ notification:
   update_found: 新しいバージョンが利用可能です。
   update: 更新
 
+theme:
+  light: ライト
+  dark: ダーク
+  system: システム
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ko-KR.yml b/_data/locales/ko-KR.yml
index ed45a75c..48af8bc2 100644
--- a/_data/locales/ko-KR.yml
+++ b/_data/locales/ko-KR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: 새 버전의 콘텐츠를 사용할 수 있습니다.
   update: 업데이트
 
+theme:
+  light: 라이트
+  dark: 다크
+  system: 시스템
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ku-IQ.yml b/_data/locales/ku-IQ.yml
index 61cd3cd2..1d809b81 100644
--- a/_data/locales/ku-IQ.yml
+++ b/_data/locales/ku-IQ.yml
@@ -49,6 +49,11 @@ notification:
   update_found: وەشانێکی نوێی ناوەڕۆک بەردەستە.
   update: نوێکردنەوە
 
+theme:
+  light: ڕووناک
+  dark: تاریک
+  system: سیستەم
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/my-MM.yml b/_data/locales/my-MM.yml
index 5559aea0..e497636b 100644
--- a/_data/locales/my-MM.yml
+++ b/_data/locales/my-MM.yml
@@ -49,6 +49,11 @@ notification:
   update_found: အကြောင်းအရာဗားရှင်းအသစ်ကို ရနိုင်ပါပြီ။
   update: အပ်ဒိတ်
 
+theme:
+  light: အလင်း
+  dark: အမှောင်
+  system: စနစ်
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/nl-NL.yml b/_data/locales/nl-NL.yml
index 691fb75c..e39281b4 100644
--- a/_data/locales/nl-NL.yml
+++ b/_data/locales/nl-NL.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Nieuwe versie van inhoud beschikbaar.
   update: Update
 
+theme:
+  light: Licht
+  dark: Donker
+  system: Systeem
+
 # ----- Posts related labels -----
 post:
   written_by: Door
diff --git "a/_data/locales/ps\342\200\221AF.yml" "b/_data/locales/ps\342\200\221AF.yml"
index fa2c1924..0ea9ac23 100644
--- "a/_data/locales/ps\342\200\221AF.yml"
+++ "b/_data/locales/ps\342\200\221AF.yml"
@@ -49,6 +49,11 @@ notification:
   update_found: نوې نسخه شتون لري.
   update: تازه
 
+theme:
+  light: روښانه
+  dark: تیاره
+  system: سیستم
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/pt-BR.yml b/_data/locales/pt-BR.yml
index 22de99ae..ec7fb35b 100644
--- a/_data/locales/pt-BR.yml
+++ b/_data/locales/pt-BR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Uma nova versão do conteúdo está disponível.
   update: atualização
 
+theme:
+  light: Claro
+  dark: Escuro
+  system: Sistema
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ru-RU.yml b/_data/locales/ru-RU.yml
index de9e0165..8842bb81 100644
--- a/_data/locales/ru-RU.yml
+++ b/_data/locales/ru-RU.yml
@@ -48,6 +48,11 @@ notification:
   update_found: Доступна новая версия контента.
   update: Обновить
 
+theme:
+  light: Светлая
+  dark: Темная
+  system: Системная
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/sl-SI.yml b/_data/locales/sl-SI.yml
index 9b3ea469..61a93289 100644
--- a/_data/locales/sl-SI.yml
+++ b/_data/locales/sl-SI.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Novejša različica vsebine je na voljo. #A new version of content is available.
   update: Posodobi #Update
 
+theme:
+  light: Svetla
+  dark: Temna
+  system: Sistemska
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/sv-SE.yml b/_data/locales/sv-SE.yml
index 77e6fe6b..5882a8b4 100644
--- a/_data/locales/sv-SE.yml
+++ b/_data/locales/sv-SE.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Det finns en ny version av innehållet.
   update: Uppdatera sidan
 
+theme:
+  light: Ljust
+  dark: Mörkt
+  system: System
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/th.yml b/_data/locales/th.yml
index c9560fc8..6b54739a 100644
--- a/_data/locales/th.yml
+++ b/_data/locales/th.yml
@@ -49,6 +49,11 @@ notification:
   update_found: มีเวอร์ชันใหม่ของเนื้อหา
   update: อัปเดต
 
+theme:
+  light: สว่าง
+  dark: มืด
+  system: ระบบ
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/tr-TR.yml b/_data/locales/tr-TR.yml
index 4a08722e..bb9ac994 100644
--- a/_data/locales/tr-TR.yml
+++ b/_data/locales/tr-TR.yml
@@ -49,6 +49,11 @@ notification:
   update_found: İçeriğin yeni bir sürümü mevcut.
   update: Güncelle
 
+theme:
+  light: Açık
+  dark: Koyu
+  system: Sistem
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/uk-UA.yml b/_data/locales/uk-UA.yml
index f337187d..e2cbbff4 100644
--- a/_data/locales/uk-UA.yml
+++ b/_data/locales/uk-UA.yml
@@ -49,6 +49,11 @@ notification:
   update_found: Доступна нова версія вмісту.
   update: Оновлення
 
+theme:
+  light: Світла
+  dark: Темна
+  system: Системна
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/ur-PK.yml b/_data/locales/ur-PK.yml
index 081bc208..e2552207 100644
--- a/_data/locales/ur-PK.yml
+++ b/_data/locales/ur-PK.yml
@@ -49,6 +49,11 @@ notification:
   update_found: نیا مواد دستیاب ہے۔
   update: اپ ڈیٹ
 
+theme:
+  light: روشن
+  dark: تاریک
+  system: سسٹم
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/vi-VN.yml b/_data/locales/vi-VN.yml
index 48b767e8..b82ec50f 100644
--- a/_data/locales/vi-VN.yml
+++ b/_data/locales/vi-VN.yml
@@ -48,6 +48,11 @@ notification:
   update_found: Đã có phiên bản mới của nội dung.
   update: Cập nhật
 
+theme:
+  light: Sáng
+  dark: Tối
+  system: Hệ thống
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/zh-CN.yml b/_data/locales/zh-CN.yml
index 9a3b2fb6..8cbfe1fa 100644
--- a/_data/locales/zh-CN.yml
+++ b/_data/locales/zh-CN.yml
@@ -48,6 +48,11 @@ notification:
   update_found: 发现新版本的内容。
   update: 更新
 
+theme:
+  light: 浅色
+  dark: 深色
+  system: 跟随系统
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/locales/zh-TW.yml b/_data/locales/zh-TW.yml
index ad4ea689..7afeb420 100644
--- a/_data/locales/zh-TW.yml
+++ b/_data/locales/zh-TW.yml
@@ -48,6 +48,11 @@ notification:
   update_found: 發現新版本更新。
   update: 更新
 
+theme:
+  light: 淺色
+  dark: 深色
+  system: 跟隨系統
+
 # ----- Posts related labels -----
 
 post:
diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml
index e40cc357..719d8fbe 100644
--- a/_data/origin/cors.yml
+++ b/_data/origin/cors.yml
@@ -19,6 +19,9 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
 
 # Libraries
 
+bootstrap:
+  css: https://cdn.jsdelivr.net/npm/bootstrap@5/dist/css/bootstrap.min.css
+
 toc:
   css: https://cdn.jsdelivr.net/npm/tocbot@4/dist/tocbot.min.css
   js: https://cdn.jsdelivr.net/npm/tocbot@4/dist/tocbot.min.js
diff --git a/_includes/comments/disqus.html b/_includes/comments/disqus.html
index fd12a3c7..0fb67660 100644
--- a/_includes/comments/disqus.html
+++ b/_includes/comments/disqus.html
@@ -19,7 +19,7 @@
 
   {%- comment -%} Auto switch theme {%- endcomment -%}
   function reloadDisqus(event) {
-    if (event.source === window && event.data && event.data.id === Theme.ID) {
+    if (event.source === window && event.data && event.data.id === Theme.eventId) {
       {%- comment -%} Disqus hasn't been loaded {%- endcomment -%}
       if (typeof DISQUS === 'undefined') {
         return;
@@ -33,7 +33,7 @@
 
   addDisqus();
 
-  if (Theme.switchable) {
+  if (Theme.isToggleable) {
     addEventListener('message', reloadDisqus);
   }
 
diff --git a/_includes/comments/giscus.html b/_includes/comments/giscus.html
index 2d5f7e7b..ddaf6470 100644
--- a/_includes/comments/giscus.html
+++ b/_includes/comments/giscus.html
@@ -1,8 +1,8 @@
 
 

           

-            {% if layout.refactor or layout.layout == 'default' %}
+            {% if layout.layout == 'default' %}
               {% include refactor-content.html content=content lang=lang %}
             {% else %}
               {{ content }}
diff --git a/_layouts/home.html b/_layouts/home.html
index cb9ab244..0161ad8f 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -1,6 +1,5 @@
 ---
 layout: default
-refactor: true
 ---
 
 {% include lang.html %}
@@ -55,19 +54,39 @@
 
         {% if post.image %}
           {% assign src = post.image.path | default: post.image %}
-          {% capture src %}{% include media-url.html src=src subpath=post.media_subpath %}{% endcapture %}
 
-          {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %}
-
-          {% assign lqip = null %}
+          {% if post.media_subpath %}
+            {% unless src contains '://' %}
+              {% assign src = post.media_subpath
+                | append: '/'
+                | append: src
+                | replace: '///', '/'
+                | replace: '//', '/'
+              %}
+            {% endunless %}
+          {% endif %}
 
           {% if post.image.lqip %}
-            {% capture lqip_url %}{% include media-url.html src=post.image.lqip subpath=post.media_subpath %}{% endcapture %}
-            {% assign lqip = 'lqip="' | append: lqip_url | append: '"' %}
+            {% assign lqip = post.image.lqip %}
+
+            {% if post.media_subpath %}
+              {% unless lqip contains 'data:' %}
+                {% assign lqip = post.media_subpath
+                  | append: '/'
+                  | append: lqip
+                  | replace: '///', '/'
+                  | replace: '//', '/'
+                %}
+              {% endunless %}
+            {% endif %}
+
+            {% assign lqip_attr = 'lqip="' | append: lqip | append: '"' %}
           {% endif %}
 
+          {% assign alt = post.image.alt | xml_escape | default: 'Preview Image' %}
+
           

-            {{ alt }}
+            {{ alt }}
           

 
           {% assign card_body_col = '7' %}
diff --git a/_layouts/post.html b/_layouts/post.html
index c8c21ef7..698c86cf 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -1,6 +1,5 @@
 ---
 layout: default
-refactor: true
 panel_includes:
   - toc
 tail_includes:

From 525c2888c5d80dbd5f0978e630768ade65d39c05 Mon Sep 17 00:00:00 2001
From: semantic-release-bot 
Date: Sun, 26 Oct 2025 21:49:12 +0000
Subject: [PATCH 143/177] chore(release): 7.4.1

## [7.4.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.4.0...v7.4.1) (2025-10-26)

### Bug Fixes

* avoid duplicate base URL for homepage preview images ([#2568](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2568)) ([66bf232](https://github.com/cotes2020/jekyll-theme-chirpy/commit/66bf232951fbe752821b623dc1e7e4e2824c15bf))
---
 docs/CHANGELOG.md           | 6 ++++++
 jekyll-theme-chirpy.gemspec | 2 +-
 package.json                | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index d22d8c2a..50e43ac9 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [7.4.1](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.4.0...v7.4.1) (2025-10-26)
+
+### Bug Fixes
+
+* avoid duplicate base URL for homepage preview images ([#2568](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2568)) ([66bf232](https://github.com/cotes2020/jekyll-theme-chirpy/commit/66bf232951fbe752821b623dc1e7e4e2824c15bf))
+
 ## [7.4.0](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.3.1...v7.4.0) (2025-10-19)
 
 ### Features
diff --git a/jekyll-theme-chirpy.gemspec b/jekyll-theme-chirpy.gemspec
index 9475db13..4694d7d5 100644
--- a/jekyll-theme-chirpy.gemspec
+++ b/jekyll-theme-chirpy.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-chirpy"
-  spec.version       = "7.4.0"
+  spec.version       = "7.4.1"
   spec.authors       = ["Cotes Chung"]
   spec.email         = ["cotes.chung@gmail.com"]
 
diff --git a/package.json b/package.json
index ddc79d4b..61e4a425 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jekyll-theme-chirpy",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
   "repository": {
     "type": "git",

From d2db439c169c45ac683fa1c8157c6ea7e0b54b85 Mon Sep 17 00:00:00 2001
From: Jason Raveling 
Date: Mon, 17 Nov 2025 00:19:16 -0600
Subject: [PATCH 144/177] feat: add support for `fediverse:creator` meta tag
 (#2593)

---
 _config.yml         | 1 +
 _includes/head.html | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/_config.yml b/_config.yml
index d727796f..9b9e2b27 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,6 +36,7 @@ social:
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
   name: your_full_name
   email: example@domain.com # change to your email address
+  fediverse_handle: "@you@domain.com" # change to your fediverse handle or leave empty
   links:
     # The first element serves as the copyright owner's link
     - https://twitter.com/username # change to your Twitter homepage
diff --git a/_includes/head.html b/_includes/head.html
index d0fcfd9b..a453323b 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -50,6 +50,11 @@
 
   {{ seo_tags }}
 
+  {%- if site.social.fediverse_handle %}
+    
+    
+  {% endif %}
+
   
     {%- unless page.layout == 'home' -%}
       {{ page.title | append: ' | ' }}

From 52d160f8574e8d0cddcaa46af114eb382fea1644 Mon Sep 17 00:00:00 2001
From: nakamura <71050561+manabu-nakamura@users.noreply.github.com>
Date: Thu, 18 Dec 2025 02:51:53 +0900
Subject: [PATCH 145/177] fix(i18n): localize the title (#2610)

---
 _includes/head.html   | 12 ++++++++++--
 _layouts/default.html |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/_includes/head.html b/_includes/head.html
index a453323b..3ad52fd9 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -57,9 +57,17 @@
 
   <title>
     {%- unless page.layout == 'home' -%}
-      {{ page.title | append: ' | ' }}
+      {%- capture title -%}
+        {%- if page.collection == 'tabs' -%}
+          {%- assign tab_key = page.title | downcase -%}
+          {{- site.data.locales[include.lang].tabs[tab_key] -}}
+        {%- else -%}
+          {{- page.title -}}
+        {%- endif -%}
+      {%- endcapture -%}
+      {{- title | append: ' | ' -}}
     {%- endunless -%}
-    {{ site.title }}
+    {{- site.title -}}
   
 
   {% include_cached favicons.html %}
diff --git a/_layouts/default.html b/_layouts/default.html
index f36c6057..72db34c1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -14,7 +14,7 @@
 
 
 
-  {% include head.html %}
+  {% include head.html lang=lang %}
 
   
     {% include sidebar.html lang=lang %}

From 92e0ff63ec03c2f829696d3f604cbba54203e1b4 Mon Sep 17 00:00:00 2001
From: Corey Goldberg <1113081+cgoldberg@users.noreply.github.com>
Date: Thu, 18 Dec 2025 13:55:28 -0500
Subject: [PATCH 146/177] build(deps): update platforms in Gemfile for Windows
 (#2628)

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index e5415748..62a840ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ gemspec
 
 gem "html-proofer", "~> 5.0", group: :test
 
-platforms :mingw, :x64_mingw, :mswin, :jruby do
+platforms :windows, :jruby do
   gem "tzinfo", ">= 1", "< 3"
   gem "tzinfo-data"
 end
 
-gem "wdm", "~> 0.2.0", :platforms => [:mingw, :x64_mingw, :mswin]
+gem "wdm", "~> 0.2.0", :platforms => [:windows]

From 0fbaa5359b3e1939b10c16f76cf3ce8ded83e864 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 3 Jan 2026 07:35:44 +0800
Subject: [PATCH 147/177] chore: reduce optional config defaults

---
 _config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index 9b9e2b27..09eb8f5a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -36,7 +36,7 @@ social:
   # It will be displayed as the default author of the posts and the copyright owner in the Footer
   name: your_full_name
   email: example@domain.com # change to your email address
-  fediverse_handle: "@you@domain.com" # change to your fediverse handle or leave empty
+  fediverse_handle: # fill in your fediverse handle. E.g. "@username@domain.com"
   links:
     # The first element serves as the copyright owner's link
     - https://twitter.com/username # change to your Twitter homepage

From 96da25abbdd1abbf1894d02aca3f2550673de3d4 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:36:07 +0800
Subject: [PATCH 148/177] build(dev-deps): upgrade node packages

---
 package.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 61e4a425..f928ec45 100644
--- a/package.json
+++ b/package.json
@@ -30,28 +30,28 @@
     "bootstrap": "^5.3.8"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.4",
-    "@babel/plugin-transform-class-properties": "^7.27.1",
-    "@babel/plugin-transform-private-methods": "^7.27.1",
-    "@babel/preset-env": "^7.28.3",
-    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^20.0.0",
-    "@rollup/plugin-babel": "^6.1.0",
+    "@babel/core": "^7.29.0",
+    "@babel/plugin-transform-class-properties": "^7.28.6",
+    "@babel/plugin-transform-private-methods": "^7.28.6",
+    "@babel/preset-env": "^7.29.0",
+    "@commitlint/cli": "^20.4.4",
+    "@commitlint/config-conventional": "^20.4.4",
+    "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-terser": "^1.0.0",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "concurrently": "^9.2.1",
-    "conventional-changelog-conventionalcommits": "^9.1.0",
-    "eslint": "^9.38.0",
-    "globals": "^16.4.0",
+    "conventional-changelog-conventionalcommits": "^9.3.0",
+    "eslint": "^10.0.3",
+    "globals": "^17.4.0",
     "husky": "^9.1.7",
-    "purgecss": "^7.0.2",
-    "rollup": "^4.52.5",
-    "semantic-release": "^25.0.1",
-    "stylelint": "^16.25.0",
-    "stylelint-config-standard-scss": "^16.0.0"
+    "purgecss": "^8.0.0",
+    "rollup": "^4.59.0",
+    "semantic-release": "^25.0.3",
+    "stylelint": "^17.4.0",
+    "stylelint-config-standard-scss": "^17.0.0"
   },
   "prettier": {
     "trailingComma": "none"

From 477394b7445340b5a5ff1fbfc422fc2044f366f8 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 12 Mar 2026 20:45:20 +0800
Subject: [PATCH 149/177] style: interpolate sass variable in CSS custom
 property

---
 _sass/pages/_post.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_sass/pages/_post.scss b/_sass/pages/_post.scss
index 2cd3eee3..5ba78d97 100644
--- a/_sass/pages/_post.scss
+++ b/_sass/pages/_post.scss
@@ -127,7 +127,7 @@ header {
 
 .share-mastodon {
   /* See: https://github.com/justinribeiro/share-to-mastodon#properties */
-  --wc-stm-font-family: v.$font-family-base;
+  --wc-stm-font-family: #{v.$font-family-base};
   --wc-stm-dialog-background-color: var(--card-bg);
   --wc-stm-form-button-border: 1px solid var(--btn-border-color);
   --wc-stm-form-submit-background-color: var(--sidebar-btn-bg);

From ce14e1a08784129d7a7b7e234486f2a25fb6ede3 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:02:46 +0800
Subject: [PATCH 150/177] chore: update ESLint dependencies and improve js
 style

---
 _javascript/modules/components/img-popup.js | 6 +++---
 package.json                                | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js
index 420a2265..c9fc0402 100644
--- a/_javascript/modules/components/img-popup.js
+++ b/_javascript/modules/components/img-popup.js
@@ -8,7 +8,7 @@ const lightImages = '.popup:not(.dark)';
 const darkImages = '.popup:not(.light)';
 let selector = lightImages;
 
-function updateImages(current, reverse) {
+function swapImages(current, reverse) {
   if (selector === lightImages) {
     selector = darkImages;
   } else {
@@ -19,7 +19,7 @@ function updateImages(current, reverse) {
     reverse = GLightbox({ selector: `${selector}` });
   }
 
-  [current, reverse] = [reverse, current];
+  return [reverse, current];
 }
 
 export function imgPopup() {
@@ -43,7 +43,7 @@ export function imgPopup() {
 
     window.addEventListener('message', (event) => {
       if (event.source === window && event.data && event.data.id === Theme.ID) {
-        updateImages(current, reverse);
+        [current, reverse] = swapImages(current, reverse);
       }
     });
   }
diff --git a/package.json b/package.json
index f928ec45..a0bb912e 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "@babel/preset-env": "^7.29.0",
     "@commitlint/cli": "^20.4.4",
     "@commitlint/config-conventional": "^20.4.4",
+    "@eslint/js": "^10.0.0",
     "@rollup/plugin-babel": "^7.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",

From cc1d44ee3e8f1c467aae293c9348fd8908d89380 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:37:15 +0800
Subject: [PATCH 151/177] build(gh-actions): enable `dependabot` to scan the
 starter workflow

---
 .github/dependabot.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a51f37eb..c294dc64 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,7 +15,8 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/.github/workflows/**"
     groups:
       gh-actions:
         update-types:

From fe968a770141846a12cd9e235bfd547fe088f4cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Mar 2026 21:42:58 +0800
Subject: [PATCH 152/177] build(deps): bump the gh-actions group across 2
 directories with 4 updates (#2678)

Bumps the gh-actions group with 2 updates in the /.github/workflows directory: [actions/checkout](https://github.com/actions/checkout) and [actions/setup-node](https://github.com/actions/setup-node).
Bumps the gh-actions group with 3 updates in the /.github/workflows/starter directory: [actions/checkout](https://github.com/actions/checkout), [actions/configure-pages](https://github.com/actions/configure-pages) and [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact).


Updates `actions/checkout` from 5 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

Updates `actions/setup-node` from 5 to 6
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v5...v6)

Updates `actions/checkout` from 4 to 6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

Updates `actions/configure-pages` from 4 to 5
- [Release notes](https://github.com/actions/configure-pages/releases)
- [Commits](https://github.com/actions/configure-pages/compare/v4...v5)

Updates `actions/upload-pages-artifact` from 3 to 4
- [Release notes](https://github.com/actions/upload-pages-artifact/releases)
- [Commits](https://github.com/actions/upload-pages-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/setup-node
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/configure-pages
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
- dependency-name: actions/upload-pages-artifact
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: gh-actions
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/cd.yml                   | 4 ++--
 .github/workflows/ci.yml                   | 4 ++--
 .github/workflows/codeql.yml               | 2 +-
 .github/workflows/commitlint.yml           | 2 +-
 .github/workflows/lint-js.yml              | 4 ++--
 .github/workflows/lint-scss.yml            | 4 ++--
 .github/workflows/pr-filter.yml            | 2 +-
 .github/workflows/starter/pages-deploy.yml | 6 +++---
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index cd67b6d2..9fce934d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -14,14 +14,14 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.3
           bundler-cache: true
 
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 118fc715..d5d2b8bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # for posts's lastmod
 
@@ -42,7 +42,7 @@ jobs:
           bundler-cache: true
 
       - name: Setup Node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e460e49a..f3f5bd32 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
index ef14388b..a357ba12 100644
--- a/.github/workflows/commitlint.yml
+++ b/.github/workflows/commitlint.yml
@@ -11,5 +11,5 @@ jobs:
   commitlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: wagoid/commitlint-github-action@v6
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
index 205f4790..fd6d08f6 100644
--- a/.github/workflows/lint-js.yml
+++ b/.github/workflows/lint-js.yml
@@ -16,10 +16,10 @@ jobs:
   lint-js:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/lint-scss.yml b/.github/workflows/lint-scss.yml
index 48d8a726..bf02eea5 100644
--- a/.github/workflows/lint-scss.yml
+++ b/.github/workflows/lint-scss.yml
@@ -12,10 +12,10 @@ jobs:
   lint-scss:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
 
diff --git a/.github/workflows/pr-filter.yml b/.github/workflows/pr-filter.yml
index ee3f09db..117b20a7 100644
--- a/.github/workflows/pr-filter.yml
+++ b/.github/workflows/pr-filter.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Check PR Content
         id: intercept
diff --git a/.github/workflows/starter/pages-deploy.yml b/.github/workflows/starter/pages-deploy.yml
index cc28f99f..9ee4a240 100644
--- a/.github/workflows/starter/pages-deploy.yml
+++ b/.github/workflows/starter/pages-deploy.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           # submodules: true
@@ -37,7 +37,7 @@ jobs:
 
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -57,7 +57,7 @@ jobs:
             \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/"
 
       - name: Upload site artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: "_site${{ steps.pages.outputs.base_path }}"
 

From 8fd56560a4b990fad6ab7eb63347c23b8352455d Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 14 Mar 2026 18:57:52 +0800
Subject: [PATCH 153/177] docs: fix typos in tutorial

---
 _posts/2019-08-08-text-and-typography.md |  5 +++--
 _posts/2019-08-08-write-a-new-post.md    | 10 +++++-----
 _posts/2019-08-09-getting-started.md     |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/_posts/2019-08-08-text-and-typography.md b/_posts/2019-08-08-text-and-typography.md
index a8db26a0..e6e50060 100644
--- a/_posts/2019-08-08-text-and-typography.md
+++ b/_posts/2019-08-08-text-and-typography.md
@@ -99,7 +99,7 @@ Moon
 
 ## Footnote
 
-Click the hook will locate the footnote[^footnote], and here is another footnote[^fn-nth-2].
+Clicking the hook will locate the footnote[^footnote], and here is another footnote[^fn-nth-2].
 
 ## Inline code
 
@@ -113,7 +113,8 @@ Here is the `/path/to/the/file.extend`{: .filepath}.
 
 ### Common
 
-```text
+
+```
 This is a common code snippet, without syntax highlight and line number.
 ```
 
diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md
index f048f013..138b56b8 100644
--- a/_posts/2019-08-08-write-a-new-post.md
+++ b/_posts/2019-08-08-write-a-new-post.md
@@ -7,7 +7,7 @@ tags: [writing]
 render_with_liquid: false
 ---
 
-This tutorial will guide you how to write a post in the _Chirpy_ template, and it's worth reading even if you've used Jekyll before, as many features require specific variables to be set.
+This tutorial will guide you on how to write a post in the _Chirpy_ template, and it's worth reading even if you've used Jekyll before, as many features require specific variables to be set.
 
 ## Naming and Path
 
@@ -173,7 +173,7 @@ By default, the image is centered, but you can specify the position by using one
 
 - **Normal position**
 
-  Image will be left aligned in below sample:
+  The image will be left aligned in the below sample:
 
   ```markdown
   ![Desktop View](/assets/img/sample/mockup.png){: .normal }
@@ -277,7 +277,7 @@ The following table shows how to get the two parameters we need in a given video
 
 Spotify supports some additional parameters:
 
-- `compact` - to display compact player instead (ex. `{% include embed/spotify.html id='3OuMIIFP5TxM8tLXMWYPGV' compact=1 %}`);
+- `compact` - to display a compact player instead (ex. `{% include embed/spotify.html id='3OuMIIFP5TxM8tLXMWYPGV' compact=1 %}`);
 - `dark` - to force dark theme (ex. `{% include embed/spotify.html id='3OuMIIFP5TxM8tLXMWYPGV' dark=1 %}`).
 
 ### Video Files
@@ -293,7 +293,7 @@ Where `URL` is a URL to a video file e.g. `/path/to/sample/video.mp4`.
 You can also specify additional attributes for the embedded video file. Here is a full list of attributes allowed.
 
 - `poster='/path/to/poster.png'` — poster image for a video that is shown while video is downloading
-- `title='Text'` — title for a video that appears below the video and looks same as for images
+- `title='Text'` — title for a video that appears below the video and looks the same as for images
 - `autoplay=true` — video automatically begins to play back as soon as it can
 - `loop=true` — automatically seek back to the start upon reaching the end of the video
 - `muted=true` — audio will be initially silenced
@@ -326,7 +326,7 @@ Where `URL` is a URL to an audio file e.g. `/path/to/audio.mp3`.
 
 You can also specify additional attributes for the embedded audio file. Here is a full list of attributes allowed.
 
-- `title='Text'` — title for an audio that appears below the audio and looks same as for images
+- `title='Text'` — title for an audio that appears below the audio and looks the same as for images
 - `types` — specify the extensions of additional audio formats separated by `|`. Ensure these files exist in the same directory as your primary audio file.
 
 Consider an example using all of the above:
diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md
index 71383938..9bc84328 100644
--- a/_posts/2019-08-09-getting-started.md
+++ b/_posts/2019-08-09-getting-started.md
@@ -59,7 +59,7 @@ For Unix-like systems, you can set up the environment natively for optimal perfo
 1. Follow the [Jekyll installation guide](https://jekyllrb.com/docs/installation/) to install Jekyll and ensure [Git](https://git-scm.com/) is installed.
 2. Clone your repository to your local machine.
 3. If you forked the theme, install [Node.js][nodejs] and run `bash tools/init.sh` in the root directory to initialize the repository.
-4. Run command `bundle` in the root of your repository to install the dependencies.
+4. Run command `bundle install` in the root of your repository to install the dependencies.
 
 ## Usage
 
@@ -105,7 +105,7 @@ Before deploying, check the `_config.yml`{: .filepath} file and ensure the `url`
 
 Now you can choose _ONE_ of the following methods to deploy your Jekyll site.
 
-### Deploy Using Github Actions
+### Deploy Using GitHub Actions
 
 Prepare the following:
 

From 6afe5a6d7bc318116056777bceaccc621699fc31 Mon Sep 17 00:00:00 2001
From: Cotes Chung <11371340+cotes2020@users.noreply.github.com>
Date: Sat, 14 Mar 2026 19:01:21 +0800
Subject: [PATCH 154/177] refactor: correct typos in comments and identifiers
 (#2681)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rename `loadTooptip` to `loadTooltip` in tooltip-loader.js, components.js, and basic.js
- Fix grammar: "This script make" → "This script makes" in search-display.js
- Fix "HomgPage" → "HomePage" in post-paginator.html
- Fix "CND URL" → "CDN URL" in media-url.html
- Fix "locale-dateime.js" → "locale-datetime.js" in datetime.html
- Fix "LaTex" → "LaTeX" in language-alias.html
- Fix "exist  tag" → "existing  tag" in refactor-content.html
- Fix "Archvies" → "Archives" in _archives.scss
- Fix "underlinke" → "underline" in _syntax.scss
---
 _includes/datetime.html                          |  2 +-
 _includes/language-alias.html                    | 16 +++++++---------
 _includes/media-url.html                         |  2 +-
 _includes/post-paginator.html                    |  2 +-
 _includes/refactor-content.html                  |  2 +-
 _javascript/modules/components.js                |  2 +-
 _javascript/modules/components/search-display.js |  2 +-
 _javascript/modules/components/tooltip-loader.js |  2 +-
 _javascript/modules/layouts/basic.js             |  4 ++--
 _sass/base/_syntax.scss                          |  5 +++--
 _sass/pages/_archives.scss                       |  2 +-
 11 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/_includes/datetime.html b/_includes/datetime.html
index 9f954b69..b07b132a 100644
--- a/_includes/datetime.html
+++ b/_includes/datetime.html
@@ -1,6 +1,6 @@
 
 
 {% assign df_strftime = site.data.locales[include.lang].df.post.strftime | default: '%d/%m/%Y' %}
diff --git a/_includes/language-alias.html b/_includes/language-alias.html
index abfa7ba9..c2e9adbb 100644
--- a/_includes/language-alias.html
+++ b/_includes/language-alias.html
@@ -1,9 +1,7 @@
 {% comment %}
-
   Convert the alias of the syntax language to the official name
 
   See: 
-
 {% endcomment %}
 
 {% assign _lang = include.language | default: '' %}
@@ -20,13 +18,13 @@
   {% when 'coffeescript', 'coffee', 'coffee-script' %}
     {{ 'CoffeeScript' }}
   {% when 'cs', 'csharp' %}
-   {{ 'C#' }}
+    {{ 'C#' }}
   {% when 'erl' %}
     {{ 'Erlang' }}
   {% when 'graphql' %}
-   {{ 'GraphQL' }}
+    {{ 'GraphQL' }}
   {% when 'haskell', 'hs' %}
-   {{ 'Haskell' }}
+    {{ 'Haskell' }}
   {% when 'javascript', 'js' %}
     {{ 'JavaScript' }}
   {% when 'make', 'mf', 'gnumake', 'bsdmake' %}
@@ -39,22 +37,22 @@
     {{ 'Objective-C' }}
   {% when 'perl', 'pl' %}
     {{ 'Perl' }}
-  {% when 'php','php3','php4','php5' %}
+  {% when 'php', 'php3', 'php4', 'php5' %}
     {{ 'PHP' }}
   {% when 'py' %}
     {{ 'Python' }}
   {% when 'rb' %}
     {{ 'Ruby' }}
-  {% when 'rs','no_run','ignore','should_panic' %}
+  {% when 'rs', 'no_run', 'ignore', 'should_panic' %}
     {{ 'Rust' }}
   {% when 'bash', 'zsh', 'ksh', 'sh' %}
     {{ 'Shell' }}
   {% when 'st', 'squeak' %}
     {{ 'Smalltalk' }}
-  {% when 'tex'%}
+  {% when 'tex' %}
     {{ 'TeX' }}
   {% when 'latex' %}
-    {{ 'LaTex' }}
+    {{ 'LaTeX' }}
   {% when 'ts', 'typescript' %}
     {{ 'TypeScript' }}
   {% when 'vb', 'visualbasic' %}
diff --git a/_includes/media-url.html b/_includes/media-url.html
index ea410750..7ace24a5 100644
--- a/_includes/media-url.html
+++ b/_includes/media-url.html
@@ -17,7 +17,7 @@
     {%- comment -%} Add media resources subpath prefix {%- endcomment -%}
     {% assign url = include.subpath | default: '' | append: '/' | append: url %}
 
-    {%- comment -%} Prepend CND URL {%- endcomment -%}
+    {%- comment -%} Prepend CDN URL {%- endcomment -%}
     {% if site.cdn %}
       {% assign url = site.cdn | append: '/' | append: url %}
     {% endif %}
diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html
index c74e978a..5ccad708 100644
--- a/_includes/post-paginator.html
+++ b/_includes/post-paginator.html
@@ -1,4 +1,4 @@
-
+