Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
lotusk08 committed Dec 16, 2024
2 parents 9ee9d8e + c12875f commit 1f01959
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion _includes/toc.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% if enable_toc %}
<div class="toc-border-cover z-3"></div>
<section id="toc-wrapper" class="invisible position-sticky ps-0 pe-4 pb-4">
<h2 class="panel-heading ps-3 pb-2 mb-0">{{- site.data.locales[include.lang].panel.toc -}}</h2>
<h2 class="panel-heading ps-3 pb-1 mb-0">{{- site.data.locales[include.lang].panel.toc -}}</h2>
<nav id="toc"></nav>
</section>
{% endif %}
4 changes: 2 additions & 2 deletions _javascript/modules/components/mermaid.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ function refreshTheme(event) {
const mermaidList = document.getElementsByClassName(MERMAID);

[...mermaidList].forEach((elem) => {
const svgCode = elem.previousSibling.children.item(0).innerHTML;
elem.innerHTML = svgCode;
const svgCode = elem.previousSibling.children.item(0).textContent;
elem.textContent = svgCode;
elem.removeAttribute('data-processed');
});

Expand Down
21 changes: 8 additions & 13 deletions _sass/pages/_post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,11 @@ header {
@-webkit-keyframes fade-up {
from {
opacity: 0;
position: relative;
top: 2rem;
margin-top: 4rem;
}

to {
opacity: 1;
position: relative;
top: 0;
}
}

Expand All @@ -247,6 +244,7 @@ header {
%top-cover {
content: '';
display: block;
position: -webkit-sticky;
position: sticky;
top: 0;
width: 100%;
Expand All @@ -258,16 +256,12 @@ header {
#toc-wrapper {
opacity: 0; /* Start hidden */
top: 0;
transition: opacity 0.3s ease-in-out; /* Smooth opacity transition */
-webkit-animation: fade-up 0.3s;
animation: fade-up 0.3s;
transition: top 0.2s ease-in-out;
overflow-y: auto;
max-height: 100vh;
scrollbar-width: none;
margin-top: 2rem;


/* When hovering over the TOC, show it */
&:hover {
opacity: 1;
transition: opacity 0.3s ease-in-out, visibility 0s linear 0s; /* Immediate visibility when hovered */
Expand All @@ -278,6 +272,11 @@ header {
transition: opacity 0.3s ease-in-out, visibility 0s linear 0s;
}

&:not(.invisible) {
-webkit-animation: fade-up 0.8s;
animation: fade-up 0.8s;
}

ul {
list-style: none;
font-size: 0.85rem;
Expand All @@ -289,10 +288,6 @@ header {
margin: 0.4rem 0;
}

&:first-child {
margin-top: 0;
}

a {
padding: 0.2rem 0 0.2rem 1.25rem;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/js/dist/app.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/dist/categories.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dist/commons.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dist/home.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dist/misc.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/js/dist/page.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/js/dist/post.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/js/dist/sw.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/dist/theme.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [7.2.3](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.2...v7.2.3) (2024-12-15)

### Bug Fixes

* refreshing mermaid theme may fail ([#2113](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2113)) ([2f00d41](https://github.com/cotes2020/jekyll-theme-chirpy/commit/2f00d41861f1b06c2ff7fa4e67e14e647c3c34b0))
* **ui:** gap between TOC entries is inconsistent ([#2119](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2119)) ([1b4e318](https://github.com/cotes2020/jekyll-theme-chirpy/commit/1b4e318dc1cd57da812e11bf69ebb06083c213fc))
* **ui:** slow script loading hides TOC fade-up effect in desktop ([#2120](https://github.com/cotes2020/jekyll-theme-chirpy/issues/2120)) ([e0c3faf](https://github.com/cotes2020/jekyll-theme-chirpy/commit/e0c3fafa470eb12bd04ffdf198018bc28b6de20d))

## [7.2.2](https://github.com/cotes2020/jekyll-theme-chirpy/compare/v7.2.1...v7.2.2) (2024-12-06)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion jekyll-theme-chirpy.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "jekyll-theme-chirpy"
spec.version = "7.2.2"
spec.version = "7.2.3"
spec.authors = ["Cotes Chung"]
spec.email = ["cotes.chung@gmail.com"]

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jekyll-theme-chirpy",
"version": "7.2.2",
"version": "7.2.3",
"description": "A minimal, responsive, and feature-rich Jekyll theme for technical writing.",
"repository": {
"type": "git",
Expand Down

0 comments on commit 1f01959

Please sign in to comment.