chore: upgrade to 7.3.0

2026-10-18 09:22:53 +00:00 · 2025-06-14 16:43:25 +03:00
parent bae97744d4
commit 297c058ad1
6 changed files with 121 additions and 0 deletions
@@ -2,7 +2,11 @@

 source "https://rubygems.org"

+<<<<<<< HEAD
 gem "jekyll-theme-chirpy", "~> 7.2", ">= 7.2.4"
+=======
+gem "jekyll-theme-chirpy", "~> 7.3"
+>>>>>>> v7.3.0

 gem "html-proofer", "~> 5.0", group: :test

@@ -1,3 +1,49 @@
+<<<<<<< HEAD
 # https://andwati.xyz
 - jekyll
 - chirpy theme
+=======
+# Chirpy Starter
+
+[![Gem Version](https://img.shields.io/gem/v/jekyll-theme-chirpy)][gem]&nbsp;
+[![GitHub license](https://img.shields.io/github/license/cotes2020/chirpy-starter.svg?color=blue)][mit]
+
+When installing the [**Chirpy**][chirpy] theme through [RubyGems.org][gem], Jekyll can only read files in the folders
+`_data`, `_layouts`, `_includes`, `_sass` and `assets`, as well as a small part of options of the `_config.yml` file
+from the theme's gem. If you have ever installed this theme gem, you can use the command
+`bundle info --path jekyll-theme-chirpy` to locate these files.
+
+The Jekyll team claims that this is to leave the ball in the user’s court, but this also results in users not being
+able to enjoy the out-of-the-box experience when using feature-rich themes.
+
+To fully use all the features of **Chirpy**, you need to copy the other critical files from the theme's gem to your
+Jekyll site. The following is a list of targets:
+
+```shell
+.
+├── _config.yml
+├── _plugins
+├── _tabs
+└── index.html
+```
+
+To save you time, and also in case you lose some files while copying, we extract those files/configurations of the
+latest version of the **Chirpy** theme and the [CD][CD] workflow to here, so that you can start writing in minutes.
+
+## Usage
+
+Check out the [theme's docs](https://github.com/cotes2020/jekyll-theme-chirpy/wiki).
+
+## Contributing
+
+This repository is automatically updated with new releases from the theme repository. If you encounter any issues or want to contribute to its improvement, please visit the [theme repository][chirpy] to provide feedback.
+
+## License
+
+This work is published under [MIT][mit] License.
+
+[gem]: https://rubygems.org/gems/jekyll-theme-chirpy
+[chirpy]: https://github.com/cotes2020/jekyll-theme-chirpy/
+[CD]: https://en.wikipedia.org/wiki/Continuous_deployment
+[mit]: https://github.com/cotes2020/chirpy-starter/blob/master/LICENSE
+>>>>>>> v7.3.0
@@ -9,20 +9,31 @@ theme: jekyll-theme-chirpy
 lang: en

 # Change to your timezone › https://kevinnovak.github.io/Time-Zone-Picker
+<<<<<<< HEAD
 timezone: Africa/Nairobi
+=======
+timezone:
+>>>>>>> v7.3.0

 # jekyll-seo-tag settings › https://github.com/jekyll/jekyll-seo-tag/blob/master/docs/usage.md
 # ↓ --------------------------

+<<<<<<< HEAD
 title: andwati # the main title

 tagline: init 1 # it will display as the subtitle
+=======
+title: Chirpy # the main title
+
+tagline: A text-focused Jekyll theme # it will display as the subtitle
+>>>>>>> v7.3.0

 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 '/'.
+<<<<<<< HEAD
 url: "https://andwati.github.io"

 github:
@@ -30,10 +41,20 @@ github:

 twitter:
  username: andwati_ # change to your Twitter username
+=======
+url: ""
+
+github:
+  username: github_username # change to your GitHub username
+
+twitter:
+  username: twitter_username # change to your Twitter username
+>>>>>>> v7.3.0

 social:
  # Change to your full name.
  # It will be displayed as the default author of the posts and the copyright owner in the Footer
+<<<<<<< HEAD
  name: mockingspectre
  email: 56686898[email protected] # change to your email address
  links:
@@ -43,6 +64,17 @@ social:
    # Uncomment below to add more social links
    # - https://www.facebook.com/username
    # - https://www.linkedin.com/in/andwati
+=======
+  name: your_full_name
+  email: [email protected] # 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
+    # Uncomment below to add more social links
+    # - https://www.facebook.com/username
+    # - https://www.linkedin.com/in/username
+>>>>>>> v7.3.0

 # Site Verification Settings
 webmaster_verifications:
@@ -61,7 +93,11 @@ analytics:
  google:
    id: # fill in your Google Analytics ID
  goatcounter:
+<<<<<<< HEAD
    id: andwati # fill in your GoatCounter ID
+=======
+    id: # fill in your GoatCounter ID
+>>>>>>> v7.3.0
  umami:
    id: # fill in your Umami ID
    domain: # fill in your Umami domain
@@ -75,7 +111,11 @@ analytics:

 # Page views settings
 pageviews:
+<<<<<<< HEAD
  provider: goatcounter # now only supports 'goatcounter'
+=======
+  provider: # now only supports 'goatcounter'
+>>>>>>> v7.3.0

 # Prefer color scheme setting.
 #
@@ -98,25 +138,42 @@ theme_mode: # [light | dark]
 cdn:

 # the avatar on sidebar, support local or CORS resources
+<<<<<<< HEAD
 avatar: /assets/img/avatar.jpg
+=======
+avatar:
+>>>>>>> v7.3.0

 # The URL of the site-wide social preview image used in SEO `og:image` meta tag.
 # It can be overridden by a customized `page.image` in front matter.
 social_preview_image: # string, local or CORS resources

 # boolean type, the global switch for TOC in posts.
+<<<<<<< HEAD
 toc: false

 comments:
  # Global switch for the post-comment system. Keeping it empty means disabled.
  provider: utterances # [disqus | utterances | giscus]
+=======
+toc: true
+
+comments:
+  # Global switch for the post-comment system. Keeping it empty means disabled.
+  provider: # [disqus | utterances | giscus]
+>>>>>>> v7.3.0
  # The provider options are as follows:
  disqus:
    shortname: # fill with the Disqus shortname. › https://help.disqus.com/en/articles/1717111-what-s-a-shortname
  # utterances settings › https://utteranc.es/
  utterances:
+<<<<<<< HEAD
    repo: andwati/andwati.github.io # <gh-username>/<repo>
    issue_term: title # < url | pathname | title | ...>
+=======
+    repo: # <gh-username>/<repo>
+    issue_term: # < url | pathname | title | ...>
+>>>>>>> v7.3.0
  # Giscus options › https://giscus.app
  giscus:
    repo: # <gh-username>/<repo>
@@ -213,7 +270,11 @@ exclude:
  - README.md
  - LICENSE
  - purgecss.js
+<<<<<<< HEAD
  - rollup.config.js
+=======
+  - "*.config.js"
+>>>>>>> v7.3.0
  - "package*.json"

 jekyll-archives:
@@ -18,7 +18,11 @@ platforms:
  #
  # - type: Linkedin
  #   icon: "fab fa-linkedin"
+<<<<<<< HEAD
  #   link: "https://www.linkedin.com/sharing/share-offsite/?url=URL"
+=======
+  #   link: "https://www.linkedin.com/feed/?shareActive=true&shareUrl=URL"
+>>>>>>> v7.3.0
  #
  # - type: Weibo
  #   icon: "fab fa-weibo"
@@ -0,0 +1 @@
+
@@ -4,6 +4,7 @@ icon: fas fa-info-circle
 order: 4
 ---

+<<<<<<< HEAD
 I spend my free time working on hobby projects and sometimes I write about my experiences. In particular, I enjoy learning about offensive security and reverse engineering. You can find me on GitHub as [@andwati]. If you're willing to suffer the `gpg` interface, you can use
 [my key].

@@ -12,3 +13,7 @@ The writing here is licensed under [CC BY 4.0](https://creativecommons.org/licen

 [@andwati]: https://github.com/andwati
 [my key]: https://github.com/andwati.gpg
+=======
+> Add Markdown syntax content to file `_tabs/about.md`{: .filepath } and it will show up on this page.
+{: .prompt-tip }
+>>>>>>> v7.3.0