From d3682b35674788b955288078b5b6dd5678c87950 Mon Sep 17 00:00:00 2001 From: SimbaFs <39305460+simbafs@users.noreply.github.com> Date: Sun, 3 Sep 2023 19:03:17 +0800 Subject: [PATCH 1/5] fix(article): margin collapsing in code block (firefox) (#833) fix margin collasping in codeblock --- assets/scss/partials/highlight/common.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scss/partials/highlight/common.scss b/assets/scss/partials/highlight/common.scss index c9b70bb..c680fa4 100644 --- a/assets/scss/partials/highlight/common.scss +++ b/assets/scss/partials/highlight/common.scss @@ -55,6 +55,7 @@ margin-right: 0.4em; padding: 0 0.4em 0 0.4em; color: #7f7f7f; + display: block; } /* LineNumbers */ From be4fd5509548d3a9d65cdfd5dd50baad1c65a2e5 Mon Sep 17 00:00:00 2001 From: Jacob Zhong Date: Sun, 3 Sep 2023 09:32:44 -0400 Subject: [PATCH 2/5] feat(article): font enhancement (#767) Change font settings --- assets/scss/partials/article.scss | 1 + assets/scss/partials/layout/article.scss | 4 ++++ assets/scss/variables.scss | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/scss/partials/article.scss b/assets/scss/partials/article.scss index 2c3a7af..e2c05a4 100644 --- a/assets/scss/partials/article.scss +++ b/assets/scss/partials/article.scss @@ -54,6 +54,7 @@ } .article-title { + font-family: var(--article-font-family); font-weight: 600; margin: 0; color: var(--card-text-color-main); diff --git a/assets/scss/partials/layout/article.scss b/assets/scss/partials/layout/article.scss index 73757e4..695d656 100644 --- a/assets/scss/partials/layout/article.scss +++ b/assets/scss/partials/layout/article.scss @@ -33,6 +33,10 @@ margin: var(--card-padding) 0; color: var(--card-text-color-main); + .footnotes { + font-family: var(--base-font-family); + } + img { max-width: 100%; height: auto; diff --git a/assets/scss/variables.scss b/assets/scss/variables.scss index 6709f0c..97810a1 100644 --- a/assets/scss/variables.scss +++ b/assets/scss/variables.scss @@ -44,7 +44,7 @@ $defaultTagColors: #fff, #fff, #fff, #fff, #fff; --zh-font-family: "PingFang SC", "Hiragino Sans GB", "Droid Sans Fallback", "Microsoft YaHei"; --base-font-family: "Lato", var(--sys-font-family), var(--zh-font-family), sans-serif; - --code-font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + --code-font-family: Menlo, Monaco, Consolas, "Courier New", var(--zh-font-family), monospace; } /* From 418d5677b1b8d88a6e1f9916afec52e781d777a6 Mon Sep 17 00:00:00 2001 From: sand3rk <31222573+sand3rk@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:10:23 +0200 Subject: [PATCH 3/5] feat(i18n): add readtime translation in Dutch (#801) * Update nl.yaml Added readtime translation in Dutch * style(i18n/nl): remove duplicated translation --------- Co-authored-by: Jimmy Cai --- i18n/nl.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/i18n/nl.yaml b/i18n/nl.yaml index a814232..b5bf264 100644 --- a/i18n/nl.yaml +++ b/i18n/nl.yaml @@ -21,6 +21,8 @@ article: other: Gerelateerde inhoud lastUpdatedOn: other: Laatst bijgewerkt op + readingTime: + other: "{{ .Count }} leestijd" notFound: title: From d84d0a85225b20506036b5907eb97d48633357df Mon Sep 17 00:00:00 2001 From: Brandon Szeto <99768694+brandonszeto@users.noreply.github.com> Date: Sun, 3 Sep 2023 07:15:51 -0700 Subject: [PATCH 4/5] fix(menu): consistent svg coloring in menu (#837) * Consistent svg coloring in menu * fix: use `currentColor` to avoid breaking style of active element --------- Co-authored-by: Jimmy Cai --- assets/scss/partials/menu.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scss/partials/menu.scss b/assets/scss/partials/menu.scss index 4f29c9f..281dc3a 100644 --- a/assets/scss/partials/menu.scss +++ b/assets/scss/partials/menu.scss @@ -176,8 +176,8 @@ } svg { + stroke: currentColor; stroke-width: 1.33; - width: 20px; height: 20px; } From 6f1d676948b2e452cd13c5505095da3ebaea262b Mon Sep 17 00:00:00 2001 From: Jimmy Cai Date: Sun, 3 Sep 2023 16:17:25 +0200 Subject: [PATCH 5/5] release: 3.20.0 --- layouts/partials/footer/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html index ade2f7b..b56236d 100644 --- a/layouts/partials/footer/footer.html +++ b/layouts/partials/footer/footer.html @@ -1,4 +1,4 @@ -{{- $ThemeVersion := "3.19.0" -}} +{{- $ThemeVersion := "3.20.0" -}}