From b00509683338703f549e50e2391404a50dfd039d Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:43:00 +0800 Subject: [PATCH 1/5] fix(rtl): incorrect article-link badge padding --- assets/css/compiled/main.css | 6 +++--- layouts/partials/article-meta/basic.html | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 0c5b0abd..c32f9757 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -2053,6 +2053,9 @@ body.zen-mode-enable { .py-\[1px\] { padding-block: 1px; } + .ps-2 { + padding-inline-start: calc(var(--spacing) * 2); + } .ps-5 { padding-inline-start: calc(var(--spacing) * 5); } @@ -2119,9 +2122,6 @@ body.zen-mode-enable { .pl-0 { padding-left: calc(var(--spacing) * 0); } - .pl-2 { - padding-left: calc(var(--spacing) * 2); - } .pl-4 { padding-left: calc(var(--spacing) * 4); } diff --git a/layouts/partials/article-meta/basic.html b/layouts/partials/article-meta/basic.html index 15ef16d9..aa374289 100644 --- a/layouts/partials/article-meta/basic.html +++ b/layouts/partials/article-meta/basic.html @@ -71,7 +71,7 @@ {{/* Output draft label */}} {{ if and (eq $scope "single") (and .Draft .Site.Params.article.showDraftLabel) }} - {{ partial "badge.html" (i18n "article.draft" | emojify) }} + {{ partial "badge.html" (i18n "article.draft" | emojify) }} {{ end }} @@ -81,7 +81,9 @@ {{ if (eq $taxonomy "authors") }} {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }} {{ range $i, $a := $context.GetTerms $taxonomy }} - {{ if not (eq $i 0) }}, {{ end }} + {{ if not (eq $i 0) }} + ,  + {{ end }} {{ $a.LinkTitle }} {{ end }} {{ end }} @@ -97,9 +99,9 @@ {{ if and (not (eq $taxonomy "authors")) (not (eq $taxonomy "series")) }} {{ if (gt (len ($context.GetTerms $taxonomy)) 0) }} {{ range $context.GetTerms $taxonomy }} - {{ partial "badge.html" .LinkTitle }} + + {{ partial "badge.html" .LinkTitle }} + {{ end }} {{ end }} {{ end }} @@ -111,9 +113,9 @@ {{ if .Params.showCategoryOnly | default (.Site.Params.article.showCategoryOnly | default false) }}
{{ range (.GetTerms "categories") }} - {{ partial "badge.html" .LinkTitle }} + + {{ partial "badge.html" .LinkTitle }} + {{ end }}
{{ end }} From 637c43a1257b182aaf90acbfefa22ef22910ed5d Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sat, 2 Aug 2025 17:59:27 +0800 Subject: [PATCH 2/5] fix(rtl): cardViewScreenWidth broken on rtl site --- assets/css/compiled/main.css | 6 +++--- layouts/_default/list.html | 4 ++-- layouts/_default/term.html | 4 ++-- layouts/partials/recent-articles/cardview-fullwidth.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index c32f9757..723d0333 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -494,6 +494,9 @@ body.zen-mode-enable { .-start-6 { inset-inline-start: calc(var(--spacing) * -6); } + .start-\[calc\(max\(-50vw\,-800px\)\+50\%\)\] { + inset-inline-start: calc(max(-50vw, -800px) + 50%); + } .top-0 { top: calc(var(--spacing) * 0); } @@ -521,9 +524,6 @@ body.zen-mode-enable { .left-1\/2 { left: calc(1/2 * 100%); } - .left-\[calc\(max\(-50vw\,-800px\)\+50\%\)\] { - left: calc(max(-50vw, -800px) + 50%); - } .-z-10 { z-index: calc(10 * -1); } diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0d0ba8c5..1d4723e5 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -88,7 +88,7 @@ {{ if $groupByYear }} {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} {{ if $cardViewScreenWidth }} -
+

{{ .Key }}

@@ -113,7 +113,7 @@ {{/* else: not groupByYear */}} {{ else }} {{ if $cardViewScreenWidth }} -
+
{{ if not $orderByWeight }} {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 3506a66e..fc8a9c9b 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -86,7 +86,7 @@ {{ if $groupByYear }} {{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} -
+

{{ .Key }}

@@ -100,7 +100,7 @@ {{ else }} -
+
{{ range (.Paginate (.Pages.GroupByDate "2006")).PageGroups }} {{ range .Pages }} diff --git a/layouts/partials/recent-articles/cardview-fullwidth.html b/layouts/partials/recent-articles/cardview-fullwidth.html index 5df00190..c0fd48b5 100644 --- a/layouts/partials/recent-articles/cardview-fullwidth.html +++ b/layouts/partials/recent-articles/cardview-fullwidth.html @@ -2,7 +2,7 @@ {{ $recentArticles = .Site.Params.homepage.showRecentItems }} -
+
{{ range first $recentArticles (.Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections)).Pages From 3150fb6631a46be0d25356f438e704e00bb469c3 Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sat, 2 Aug 2025 19:16:33 +0800 Subject: [PATCH 3/5] fix(rtl): timeline shortcode broken on rtl site --- assets/css/compiled/main.css | 27 +++++++++++++++++---------- layouts/shortcodes/timeline.html | 2 +- layouts/shortcodes/timelineItem.html | 8 ++++---- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 723d0333..50f0a131 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -635,6 +635,9 @@ body.zen-mode-enable { .ms-2 { margin-inline-start: calc(var(--spacing) * 2); } + .ms-6 { + margin-inline-start: calc(var(--spacing) * 6); + } .me-1 { margin-inline-end: calc(var(--spacing) * 1); } @@ -1210,9 +1213,6 @@ body.zen-mode-enable { .mb-\[2px\] { margin-bottom: 2px; } - .-ml-12 { - margin-left: calc(var(--spacing) * -12); - } .ml-0 { margin-left: calc(var(--spacing) * 0); } @@ -1222,9 +1222,6 @@ body.zen-mode-enable { .ml-3 { margin-left: calc(var(--spacing) * 3); } - .ml-6 { - margin-left: calc(var(--spacing) * 6); - } .ml-auto { margin-left: auto; } @@ -1779,6 +1776,10 @@ body.zen-mode-enable { border-inline-start-style: var(--tw-border-style); border-inline-start-width: 1px; } + .border-s-2 { + border-inline-start-style: var(--tw-border-style); + border-inline-start-width: 2px; + } .border-s-\[0\.125rem\] { border-inline-start-style: var(--tw-border-style); border-inline-start-width: 0.125rem; @@ -1795,10 +1796,6 @@ body.zen-mode-enable { border-bottom-style: var(--tw-border-style); border-bottom-width: 2px; } - .border-l-2 { - border-left-style: var(--tw-border-style); - border-left-width: 2px; - } .border-dotted { --tw-border-style: dotted; border-style: dotted; @@ -3236,6 +3233,11 @@ body.zen-mode-enable { margin-right: calc(var(--spacing) * 4); } } + .ltr\:-ml-12 { + &:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) { + margin-left: calc(var(--spacing) * -12); + } + } .ltr\:block { &:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) { display: block; @@ -3261,6 +3263,11 @@ body.zen-mode-enable { left: calc(var(--spacing) * 0); } } + .rtl\:-mr-\[79px\] { + &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { + margin-right: calc(79px * -1); + } + } .rtl\:ml-4 { &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { margin-left: calc(var(--spacing) * 4); diff --git a/layouts/shortcodes/timeline.html b/layouts/shortcodes/timeline.html index 175ab5b9..a94352a1 100644 --- a/layouts/shortcodes/timeline.html +++ b/layouts/shortcodes/timeline.html @@ -1,3 +1,3 @@ -
    +
      {{- .Inner -}}
    diff --git a/layouts/shortcodes/timelineItem.html b/layouts/shortcodes/timelineItem.html index df9c9632..4937993a 100644 --- a/layouts/shortcodes/timelineItem.html +++ b/layouts/shortcodes/timelineItem.html @@ -3,12 +3,12 @@ {{ $badge := .Get "badge" }} {{ $subheader := .Get "subheader" }}
  1. -
    +
    + class="bg-primary-500 dark:bg-primary-300 text-neutral-50 dark:text-neutral-700 min-w-[30px] h-8 text-2xl flex items-center justify-center rounded-full ltr:-ml-12 rtl:-mr-[79px] mt-5"> {{ partial "icon" $icon }}
    -
    +
    {{ if $header }}

    {{ $header }}

    @@ -29,4 +29,4 @@
    -
    2. + \ No newline at end of file From 2efd19e7936beb7ed963b5ed860b97cc3f18833c Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sat, 2 Aug 2025 09:17:33 +0800 Subject: [PATCH 4/5] fix(rtl): homepage card layout broken on rtl site --- assets/css/compiled/main.css | 21 ++++++++------------- layouts/partials/home/card.html | 4 ++-- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 50f0a131..90386f93 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -638,6 +638,9 @@ body.zen-mode-enable { .ms-6 { margin-inline-start: calc(var(--spacing) * 6); } + .-me-48 { + margin-inline-end: calc(var(--spacing) * -48); + } .me-1 { margin-inline-end: calc(var(--spacing) * 1); } @@ -1144,9 +1147,6 @@ body.zen-mode-enable { .mt-\[0\.5rem\] { margin-top: 0.5rem; } - .-mr-48 { - margin-right: calc(var(--spacing) * -48); - } .-mr-\[100\%\] { margin-right: calc(100% * -1); } @@ -2968,16 +2968,16 @@ body.zen-mode-enable { } } } + .md\:-me-16 { + @media (width >= 853px) { + margin-inline-end: calc(var(--spacing) * -16); + } + } .md\:mt-0 { @media (width >= 853px) { margin-top: calc(var(--spacing) * 0); } } - .md\:-mr-16 { - @media (width >= 853px) { - margin-right: calc(var(--spacing) * -16); - } - } .md\:mr-7 { @media (width >= 853px) { margin-right: calc(var(--spacing) * 7); @@ -3068,11 +3068,6 @@ body.zen-mode-enable { top: 140px; } } - .lg\:left-0 { - @media (width >= 1024px) { - left: calc(var(--spacing) * 0); - } - } .lg\:order-last { @media (width >= 1024px) { order: 9999; diff --git a/layouts/partials/home/card.html b/layouts/partials/home/card.html index 21cabadd..b117a747 100644 --- a/layouts/partials/home/card.html +++ b/layouts/partials/home/card.html @@ -13,7 +13,7 @@
-
+
{{ $homepageImage := "" }} {{ with .Site.Params.defaultBackgroundImage }} {{ if or (strings.HasPrefix . "http:") (strings.HasPrefix . "https:") }} @@ -31,7 +31,7 @@ {{ end }} {{ if $homepageImage }} {{ end }}
From aa76e94538aa6ae4a32fe2b7a8b60714c6be1b23 Mon Sep 17 00:00:00 2001 From: ZhenShuo Leo <98386542+ZhenShuo2021@users.noreply.github.com> Date: Sun, 3 Aug 2025 17:25:25 +0800 Subject: [PATCH 5/5] fix(rtl): correct article-link title direction (#2023) --- assets/css/compiled/main.css | 3 +++ layouts/partials/article-link/_shortcode.html | 2 +- layouts/partials/article-link/simple.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 90386f93..0dba83a0 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -2137,6 +2137,9 @@ body.zen-mode-enable { .text-right { text-align: right; } + .text-start { + text-align: start; + } .-indent-\[999px\] { text-indent: calc(999px * -1); } diff --git a/layouts/partials/article-link/_shortcode.html b/layouts/partials/article-link/_shortcode.html index c9eee3e9..2d11ca81 100644 --- a/layouts/partials/article-link/_shortcode.html +++ b/layouts/partials/article-link/_shortcode.html @@ -71,7 +71,7 @@
-
+
{{ with $target.Params.externalUrl }}
-
+
{{ with .Params.externalUrl }}