diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index 54e7a6f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,55 +0,0 @@ -# How to Contribute - -:tada: We really appreciate you taking the time to improve this project! :tada: - -To ensure that the blog design is not confusing, this project does not accept -suggestions for design changes, such as color scheme, fonts, typography, etc. -If your request is about an enhancement, it is recommended to first submit a -[Feature Request][pr-issue] issue to discuss whether your idea fits the project. - -Basically, you can follow these steps to complete the contribution. - -1. Fork this project on GitHub and clone it locally. -2. Create a new branch from the default branch and give it a descriptive name - (format: `feature/` or `fix/`). -3. After completing development, create a [Conventional Commit][cc] with git. - (See also: ["Verify the commits"](#verify-the-commits)) -4. Create a [Pull Request][gh-pr]. - -## Make sure you can pass the CI tests - -This project has [CI][ci] turned on. In order for your [PR][gh-pr] to pass the test, -please read the following. - -### Check the core functionality - -```console -bash ./tools/test -``` - -### Check the SASS syntax style - -```console -npm test -``` - -### Verify the commits - -Before you create a git commit, please complete the following setup. - -Install `commitlint` & `husky`: - -```console -npm i -g @commitlint/{cli,config-conventional} husky -``` - -And then enable `husky`: - -```console -husky install -``` - -[pr-issue]: https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md -[gh-pr]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests -[cc]: https://www.conventionalcommits.org/ -[ci]: https://en.wikipedia.org/wiki/Continuous_integration diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index cdfb095..2eb21a1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -3,14 +3,7 @@ name: Bug Report about: Create a report to help us improve --- -**NOTE:** Before you start, the following should be completed. - -- Read [Wiki][wiki] to understand the usage and the correct effect of functional design. -- Make sure no [similar issue(including closed ones)][issues] exists. -- Make sure the bug is found in the latest code of the `master` branch. - -[wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki -[issues]: https://github.com/cotes2020/jekyll-theme-chirpy/issues?q=is%3Aissue +> **Tips**: Remember, contributions to this repository should follow the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). ## Describe the bug diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..1dfb2b2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Ask the community for help + url: https://github.com/cotes2020/jekyll-theme-chirpy/discussions + about: Please ask and answer questions here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 089503f..2a8d6d6 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,14 +4,7 @@ about: Suggest an idea for this project labels: enhancement --- -**NOTE:** Before you start, the following should be completed. - -- Read [Wiki][wiki] to understand the usage and the correct effect of functional design. -- Make sure no [similar issue(including closed ones)][issues] exists. -- Make sure the request is based on the latest code in the `master` branch. - -[wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki -[issues]: https://github.com/cotes2020/jekyll-theme-chirpy/issues?q=is%3Aissue +> **Tips**: Remember, contributions to this repository should follow the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md). ## Is your feature request related to a problem? Please describe diff --git a/.github/ISSUE_TEMPLATE/help_wanted.md b/.github/ISSUE_TEMPLATE/help_wanted.md deleted file mode 100644 index 1f41040..0000000 --- a/.github/ISSUE_TEMPLATE/help_wanted.md +++ /dev/null @@ -1,28 +0,0 @@ ---- -name: Help Wanted -about: Need help that is not covered in the tutorial -labels: 'help wanted' ---- - -**NOTE:** Before you start, the following should be completed. - -- Read [Wiki][wiki] to understand the usage and the correct effect of functional design. -- Make sure no [similar issue(including closed ones)][issues] exists. -- Try to find the answer on [Jekyll Forum][forum] and [StackOverflow][stack_overflow]. - -[wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki -[issues]: https://github.com/cotes2020/jekyll-theme-chirpy/issues?q=is%3Aissue -[forum]: https://talk.jekyllrb.com/ -[stack_overflow]: https://stackoverflow.com/questions/tagged/jekyll - -## Description - - - -## Operations you have already tried - - - -## Logs/Screenshots - - diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index e3cda3f..0000000 --- a/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Question -about: Issues that differ from other templates -labels: question ---- - -**NOTE:** Before you start, the following should be completed. - -- Read [Wiki][wiki] to understand the usage and the correct effect of functional design. -- Make sure no [similar issue(including closed ones)][issues] exists. -- Try to find the answer on [Jekyll Forum][forum] and [StackOverflow][stack_overflow]. - -[wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki -[issues]: https://github.com/cotes2020/jekyll-theme-chirpy/issues?q=is%3Aissue -[forum]: https://talk.jekyllrb.com/ -[stack_overflow]: https://stackoverflow.com/questions/tagged/jekyll - -## Description - - diff --git a/.github/SECURITY.md b/.github/SECURITY.md deleted file mode 100644 index 5704dc7..0000000 --- a/.github/SECURITY.md +++ /dev/null @@ -1,12 +0,0 @@ -# Security Policy - -## Supported Versions - -| Version | Supported | -|---------| ------------------ | -| 5.x | :white_check_mark: | -| < 5.0.0 | :x: | - -## Reporting a Vulnerability - -If you find a vulnerability, please report it to `cotes.chung@gmail.com`. We will try our best to respond within a week. Thank you for your time! diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..bec1046 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,26 @@ +version: 2 +updates: + - package-ecosystem: "bundler" + directory: "/" + versioning-strategy: increase + groups: + bundler: + dependency-type: "production" + schedule: + interval: "weekly" + - package-ecosystem: "npm" + directory: "/" + versioning-strategy: increase + groups: + npm: + dependency-type: "development" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + groups: + gh-actions: + update-types: + - "major" + schedule: + interval: "weekly" diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index af4a885..2e239a4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,7 +1,10 @@ name: CD on: push: - branches: [production, docs] + tags: + - "v[0-9]+.[0-9]+.[0-9]+" + branches: + - docs jobs: launch: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b51c183..cf30b48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,7 @@ on: - ".github/**" - "!.github/workflows/ci.yml" - ".gitignore" + - "docs/**" - "README.md" - "LICENSE" pull_request: @@ -24,7 +25,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # for posts's lastmod diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dda3e8e..769e9c8 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -25,7 +25,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml index affd492..d79814a 100644 --- a/.github/workflows/commitlint.yml +++ b/.github/workflows/commitlint.yml @@ -5,7 +5,7 @@ jobs: commitlint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wagoid/commitlint-github-action@v5 diff --git a/.github/workflows/pages-deploy.yml.hook b/.github/workflows/pages-deploy.yml.hook index 1c4bd9d..87089c9 100644 --- a/.github/workflows/pages-deploy.yml.hook +++ b/.github/workflows/pages-deploy.yml.hook @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # submodules: true @@ -42,7 +42,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3 # reads from a '.ruby-version' or '.tools-version' file if 'ruby-version' is omitted + ruby-version: 3 bundler-cache: true - name: Build site @@ -52,7 +52,9 @@ jobs: - name: Test site run: | - bundle exec htmlproofer _site --disable-external --check-html --allow_hash_href + bundle exec htmlproofer _site \ + \-\-disable-external=true \ + \-\-ignore-urls "/^http:\/\/127.0.0.1/,/^http:\/\/0.0.0.0/,/^http:\/\/localhost/" - name: Upload site artifact uses: actions/upload-pages-artifact@v1 diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml index 9500ac4..3b8ae7a 100644 --- a/.github/workflows/style-lint.yml +++ b/.github/workflows/style-lint.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node uses: actions/setup-node@v3 diff --git a/Gemfile b/Gemfile index 7b5377f..e3415c8 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ source "https://rubygems.org" gemspec group :test do - gem "html-proofer", "~> 3.18" + gem "html-proofer", "~> 4.4" end # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/README.md b/README.md index a99e041..3fb4a19 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ A minimal, responsive and feature-rich Jekyll theme for technical writing. - [![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy?color=brightgreen)](https://rubygems.org/gems/jekyll-theme-chirpy) - [![CI](https://github.com/cotes2020/jekyll-theme-chirpy/actions/workflows/ci.yml/badge.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/actions/workflows/ci.yml) - [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4e556876a3c54d5e8f2d2857c4f43894)](https://www.codacy.com/gh/cotes2020/jekyll-theme-chirpy/dashboard?utm_source=github.com&utm_medium=referral&utm_content=cotes2020/jekyll-theme-chirpy&utm_campaign=Badge_Grade) - [![GitHub license](https://img.shields.io/github/license/cotes2020/jekyll-theme-chirpy.svg)](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE) + [![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]  + [![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) [**Live Demo →**][demo] @@ -26,19 +26,20 @@ - Dark / Light Theme Mode - Localized UI language - - Pinned Posts + - Pinned Posts on Home Page - Hierarchical Categories - Trending Tags - Table of Contents - - Last Modified Date of Posts + - Last Modified Date - Syntax Highlighting - Mathematical Expressions - - Mermaid Diagram & Flowchart + - Mermaid Diagrams & Flowcharts - Dark / Light Mode Images - Embed Videos - Disqus / Utterances / Giscus Comments - - Search + - Built-in Search - Atom Feeds + - PWA - Google Analytics - SEO & Performance Optimization @@ -47,13 +48,11 @@ ## Documentation -To explore usage, development, and upgrade guide of the project, please refer to -the [Wiki][wiki]. +To explore usage, development, and upgrade guide of the project, please refer to the [**Wiki**][wiki]. ## Contributing -Welcome to report bugs, help improve the code or submit new features. -For more information, please see the ["Contributing Guidelines"][contribute-guide]. +Contributions (Issues/PRs/Discussions) are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are greatly appreciated. For details, see the "[Contributing Guidelines][contribute-guide]". ## Credits @@ -61,34 +60,36 @@ This theme is mainly built with [Jekyll][jekyllrb] ecosystem, [Bootstrap][bootstrap], [Font Awesome][icons] and some other [wonderful tools][lib]. The avatar and favicon design come from [Clipart Max][image]. -Thanks to all the [contributors][contributors]. Also, folks who submitted issues -or unmerged PRs should not be forgotten. Because they reported bugs, shared ideas, -or inspired me to write more readable documentation. +Many thanks to the [contributors][contributors] who participated in the development +and to the folks who reported bugs or shared ideas. -Last but not least, thanks to [JetBrains][jetbrains] for providing the -_Open Source Development_ license. +Last but not least, thanks to [JetBrains][jetbrains] for providing the _Open Source License_. ## Sponsoring If you'd like to sponsor this project, the following options are available. -[![Ko-fi](https://img.shields.io/badge/-Buy%20Me%20a%20Coffee-ff5f5f?logo=ko-fi&logoColor=white)](https://ko-fi.com/coteschung) -[![Wechat Pay](https://img.shields.io/badge/-Tip%20Me%20on%20WeChat-brightgreen?logo=wechat&logoColor=white)][donation] -[![Alipay](https://img.shields.io/badge/-Tip%20Me%20on%20Alipay-blue?logo=alipay&logoColor=white)][donation] +[![Ko-fi](https://img.shields.io/badge/Support_Me_on_Ko--fi-ff5e5b?logo=ko-fi&logoColor=white)][ko-fi]  +[![Wechat Pay](https://img.shields.io/badge/Tip_Me_on_WeChat-brightgreen?logo=wechat&logoColor=white)][donation]  +[![Alipay](https://img.shields.io/badge/Tip_Me_on_Alipay-blue?logo=alipay&logoColor=white)][donation] ## License -This work is published under [MIT][mit] License. +This work is published under [MIT License][license]. +[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 +[license]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE [jekyllrb]: https://jekyllrb.com/ [bootstrap]: https://getbootstrap.com/ [icons]: https://fontawesome.com/ [image]: https://www.clipartmax.com/middle/m2i8b1m2K9Z5m2K9_ant-clipart-childrens-ant-cute/ [demo]: https://cotes2020.github.io/chirpy-demo/ [wiki]: https://github.com/cotes2020/jekyll-theme-chirpy/wiki -[contribute-guide]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md +[contribute-guide]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/docs/CONTRIBUTING.md [contributors]: https://github.com/cotes2020/jekyll-theme-chirpy/graphs/contributors [lib]: https://github.com/cotes2020/chirpy-static-assets [jetbrains]: https://www.jetbrains.com/?from=jekyll-theme-chirpy +[ko-fi]: https://ko-fi.com/coteschung/ [donation]: https://sponsor.cotes.page/ -[mit]: https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/LICENSE diff --git a/_config.yml b/_config.yml index 9ffdf0e..f7245f8 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,7 @@ baseurl: "" # otherwise, the layout language will use the default value of 'en'. lang: en -# Change to your timezone › http://www.timezoneconverter.com/cgi-bin/findzone/findzone +# Change to your timezone › https://kevinnovak.github.io/Time-Zone-Picker timezone: Asia/Shanghai # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md @@ -177,12 +177,12 @@ compress_html: exclude: - "*.gem" - "*.gemspec" + - docs - tools - README.md - CHANGELOG.md - LICENSE - rollup.config.js - - node_modules - package*.json jekyll-archives: diff --git a/_data/contact.yml b/_data/contact.yml index 76b667a..1ed228a 100644 --- a/_data/contact.yml +++ b/_data/contact.yml @@ -4,7 +4,7 @@ icon: "fab fa-github" - type: twitter - icon: "fab fa-twitter" + icon: "fa-brands fa-x-twitter" - type: email icon: "fas fa-envelope" diff --git a/_data/locales/tr-TR.yml b/_data/locales/tr-TR.yml index 851f5fc..50d8110 100644 --- a/_data/locales/tr-TR.yml +++ b/_data/locales/tr-TR.yml @@ -23,7 +23,7 @@ search: no_results: Hop! Öyle bir şey bulamadım. panel: - lastmod: Yeni Güncellendi + lastmod: Son Güncellenenler trending_tags: Yükselen Etiketler toc: İçindekiler @@ -38,7 +38,7 @@ copyright: brief: Bazı hakları saklıdır. verbose: >- Aksi belirtilmediği sürece, bu sitedeki gönderiler Creative Commons Atıf 4.0 Uluslararası (CC BY 4.0) Lisansı altındadır. - Kısaca sayfa linkini de vererek paylaşabilir veya düzenleyip paylaşabilirsin. + Kısaca sayfa linkini vererek değiştirebilir / paylaşabilirsiniz. meta: :PLATFORM ve :THEME teması @@ -53,8 +53,8 @@ notification: post: written_by: Yazan - posted: Gönderilme Tarihi - updated: Güncellenme Tarihi + posted: Gönderim + updated: Güncelleme words: sözcük pageview_measure: görüntülenme read_time: diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml index 2d28bba..6d6f496 100644 --- a/_data/origin/cors.yml +++ b/_data/origin/cors.yml @@ -16,31 +16,31 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato&family=Source+Sans+Pro:w # Libraries jquery: - js: https://cdn.jsdelivr.net/npm/jquery@3.7.0/dist/jquery.min.js + js: https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js bootstrap: - css: https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css - js: https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js + css: https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css + js: https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js toc: - css: https://cdn.jsdelivr.net/npm/tocbot@4.21.0/dist/tocbot.min.css - js: https://cdn.jsdelivr.net/npm/tocbot@4.21.0/dist/tocbot.min.js + css: https://cdn.jsdelivr.net/npm/tocbot@4.21.1/dist/tocbot.min.css + js: https://cdn.jsdelivr.net/npm/tocbot@4.21.1/dist/tocbot.min.js fontawesome: - css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.4.0/css/all.min.css + css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.4.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@9.4.3/dist/mermaid.min.js + js: https://cdn.jsdelivr.net/npm/mermaid@10.4.0/dist/mermaid.min.js dayjs: js: - common: https://cdn.jsdelivr.net/npm/dayjs@1.11.7/dayjs.min.js - locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.7/locale/:LOCALE.min.js - relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.7/plugin/relativeTime.min.js - localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.7/plugin/localizedFormat.min.js + common: https://cdn.jsdelivr.net/npm/dayjs@1.11.9/dayjs.min.js + locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.9/locale/:LOCALE.min.js + relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.9/plugin/relativeTime.min.js + localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.9/plugin/localizedFormat.min.js magnific-popup: css: https://cdn.jsdelivr.net/npm/magnific-popup@1.1.0/dist/magnific-popup.min.css diff --git a/_data/share.yml b/_data/share.yml index c1d4d63..feede74 100644 --- a/_data/share.yml +++ b/_data/share.yml @@ -3,7 +3,7 @@ platforms: - type: Twitter - icon: "fab fa-twitter" + icon: "fa-brands fa-square-x-twitter" link: "https://twitter.com/intent/tweet?text=TITLE&url=URL" - type: Facebook diff --git a/_includes/comments/disqus.html b/_includes/comments/disqus.html index d2f59df..02a5367 100644 --- a/_includes/comments/disqus.html +++ b/_includes/comments/disqus.html @@ -1,5 +1,6 @@ -
+ +

Comments powered by Disqus.

diff --git a/_includes/datetime.html b/_includes/datetime.html index 53258ba..9f954b6 100644 --- a/_includes/datetime.html +++ b/_includes/datetime.html @@ -3,12 +3,13 @@ See: ${JS_ROOT}/utils/locale-dateime.js --> -{% assign wrap_elem = include.wrap | default: 'em' %} {% assign df_strftime = site.data.locales[include.lang].df.post.strftime | default: '%d/%m/%Y' %} {% assign df_dayjs = site.data.locales[include.lang].df.post.dayjs | default: 'DD/MM/YYYY' %} -<{{ wrap_elem }} - class="{% if include.class %}{{ include.class }}{% endif %}" + diff --git a/_includes/footer.html b/_includes/footer.html index 3b36c4a..a992355 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,34 +1,36 @@ -
-
-
-

- {%- capture _platform -%} - Jekyll - {%- endcapture -%} +

+

+ {{ '©' }} + + {{ site.social.name }}. + {% if site.data.locales[include.lang].copyright.brief %} + + {{- site.data.locales[include.lang].copyright.brief -}} + + {% endif %} +

- {%- capture _theme -%} - Chirpy - {%- endcapture -%} +

+ {%- capture _platform -%} + Jekyll + {%- endcapture -%} - {{ site.data.locales[include.lang].meta | replace: ':PLATFORM', _platform | replace: ':THEME', _theme }} -

+ {%- capture _theme -%} + Chirpy + {%- endcapture -%} -

- {{- '©' }} - {{ 'now' | date: '%Y' }} - {{ site.social.name }}. - {% if site.data.locales[include.lang].copyright.brief %} - - {{- site.data.locales[include.lang].copyright.brief -}} - - {% endif %} -

-
-
+ {{ site.data.locales[include.lang].meta | replace: ':PLATFORM', _platform | replace: ':THEME', _theme }} +

diff --git a/_includes/head.html b/_includes/head.html index e4bfcb6..408358f 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -74,7 +74,7 @@ - + {% if site.toc and page.toc %} diff --git a/_includes/notification.html b/_includes/notification.html new file mode 100644 index 0000000..80049b0 --- /dev/null +++ b/_includes/notification.html @@ -0,0 +1,24 @@ + diff --git a/_includes/post-nav.html b/_includes/post-nav.html index 76bcd59..736bec3 100644 --- a/_includes/post-nav.html +++ b/_includes/post-nav.html @@ -1,19 +1,19 @@ -
+ diff --git a/_includes/post-paginator.html b/_includes/post-paginator.html index 668b49f..c74e978 100644 --- a/_includes/post-paginator.html +++ b/_includes/post-paginator.html @@ -1,89 +1,91 @@ -
    - - {% if paginator.previous_page %} - {% assign prev_url = paginator.previous_page_path | relative_url %} - {% else %} - {% assign prev_url = '#' %} - {% endif %} - -
  • - - - -
    • - - - {% assign left_ellipsis = false %} - {% assign right_ellipsis = false %} - - {% for i in (1..paginator.total_pages) %} - {% assign pre = paginator.page | minus: 1 %} - {% assign next = paginator.page | plus: 1 %} - {% assign pre_less = pre | minus: 1 %} - {% assign next_more = next | plus: 1 %} - {% assign show = false %} - - {% if paginator.page == 1 %} - {% if i <= 3 or i == paginator.total_pages %} - {% assign show = true %} - {% endif %} - {% elsif paginator.page == paginator.total_pages %} - {% if i == 1 or i >= pre_less %} - {% assign show = true %} - {% endif %} +
+ diff --git a/_includes/post-sharing.html b/_includes/post-sharing.html index f607ba2..a316001 100644 --- a/_includes/post-sharing.html +++ b/_includes/post-sharing.html @@ -1,6 +1,6 @@ -