diff --git a/assets/ts/colorScheme.ts b/assets/ts/colorScheme.ts index e17ff07..7c4ff77 100644 --- a/assets/ts/colorScheme.ts +++ b/assets/ts/colorScheme.ts @@ -9,6 +9,8 @@ class StackColorScheme { this.bindMatchMedia(); this.currentScheme = this.getSavedScheme(); + this.dispatchEvent(document.body.dataset.scheme as colorScheme); + if (toggleEl) this.bindClick(toggleEl); diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml index a0266c8..fb89f51 100644 --- a/exampleSite/config.yaml +++ b/exampleSite/config.yaml @@ -60,7 +60,6 @@ params: archives: limit: 5 - path: archives tagCloud: limit: 10 @@ -82,7 +81,7 @@ params: colorScheme: # Display toggle toggle: true - + # Available values: auto, light, dark default: auto diff --git a/i18n/en.yaml b/i18n/en.yaml index e131b61..99d34ce 100644 --- a/i18n/en.yaml +++ b/i18n/en.yaml @@ -16,10 +16,6 @@ list: one: Subsection other: Subsections -archives: - categories: - other: Categories - article: relatedContents: other: Related contents diff --git a/i18n/ja.yaml b/i18n/ja.yaml index e83e531..e9744c2 100644 --- a/i18n/ja.yaml +++ b/i18n/ja.yaml @@ -4,10 +4,6 @@ toggleMenu: darkMode: other: ダークモード -archives: - categories: - other: 分類 - article: relatedContents: other: 関連するコンテンツ diff --git a/i18n/pt-BR.yaml b/i18n/pt-BR.yaml index 5380c68..8240755 100644 --- a/i18n/pt-BR.yaml +++ b/i18n/pt-BR.yaml @@ -1,9 +1,20 @@ toggleMenu: other: Alternar Menu -archives: - categories: - other: Categorias +darkMode: + other: Modo Escuro + +list: + page: + one: "{{ .Count }} página" + other: "{{ .Count }} páginas" + + section: + other: Seção + + subsection: + one: Subseção + other: Subseções article: relatedContents: diff --git a/i18n/ru.yaml b/i18n/ru.yaml index f606ffa..f0c562f 100644 --- a/i18n/ru.yaml +++ b/i18n/ru.yaml @@ -12,17 +12,13 @@ list: other: "{{ .Count }} страниц" section: - other: Разделы + other: Раздел subsection: one: Подраздел - few: Подраздела - many: Подразделов - other: Подразделов - -archives: - categories: - other: Категории + few: Подразделы + many: Подразделы + other: Подразделы article: relatedContents: @@ -32,7 +28,7 @@ article: notFound: title: - other: Не найшено + other: Не найдено subtitle: other: Запрашиваемая страница не существует @@ -58,4 +54,4 @@ footer: builtWith: other: Создано при помощи {{ .Generator }} designedBy: - other: Тема {{ .Theme }} дизайн {{ .DesignedBy }} + other: Тема {{ .Theme }}, дизайн {{ .DesignedBy }} diff --git a/i18n/tr.yaml b/i18n/tr.yaml index fbcb7b0..fe9269b 100644 --- a/i18n/tr.yaml +++ b/i18n/tr.yaml @@ -16,10 +16,6 @@ list: one: Alt bölüm other: Alt bölümler -archives: - categories: - other: Kategoriler - article: relatedContents: other: Alakalı içerikler diff --git a/i18n/zh-CN.yaml b/i18n/zh-CN.yaml index 0583bf7..9f1ac94 100644 --- a/i18n/zh-CN.yaml +++ b/i18n/zh-CN.yaml @@ -4,10 +4,6 @@ toggleMenu: darkMode: other: 暗色模式 -archives: - categories: - other: 分类 - article: relatedContents: other: 相关文章 diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 49c0ddf..321aa6d 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,11 +1,12 @@ {{ define "body-class" }}template-archives{{ end }} {{ define "main" }} - {{ $categories := ($.Site.GetPage "taxonomyTerm" "categories").Pages }} - {{ if $categories }} -

{{ T "archives.categories" }}

+ {{- $taxonomy := $.Site.GetPage "taxonomyTerm" "categories" -}} + {{- $terms := $taxonomy.Pages -}} + {{ if $terms }} +

{{ $taxonomy.Title }}

- {{ range $categories }} + {{ range $terms }} {{ partial "article-list/tile" (dict "context" . "size" "250x150" "Type" "taxonomy") }} {{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b4efb67..90e5b66 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -42,8 +42,17 @@ {{ end }}
- {{ $subsections := .Sections }} - {{ with $subsections }} + {{- $subsections := .Sections -}} + {{- $pages := .Pages | complement $subsections -}} + + {{- if eq (len $pages) 0 -}} + {{/* If there are no normal pages, display subsections in list style, with pagination */}} + {{/* This happens with taxonomies like categories or tags */}} + {{- $pages = $subsections -}} + {{- $subsections = slice -}} + {{- end -}} + + {{- with $subsections -}}

{{ T "list.subsection" (len $subsections) }}

@@ -52,10 +61,10 @@ {{ end }}
- {{ end }} + {{- end -}} {{/* List only pages that are not a subsection */}} - {{ $paginator := .Paginate (.Pages | complement $subsections) }} + {{ $paginator := .Paginate $pages }}
{{ range $paginator.Pages }} {{ partial "article-list/compact" . }} diff --git a/layouts/page/search.html b/layouts/page/search.html index 259d398..935b384 100644 --- a/layouts/page/search.html +++ b/layouts/page/search.html @@ -11,7 +11,7 @@

- diff --git a/layouts/partials/comments/provider/disqus.html b/layouts/partials/comments/provider/disqus.html index 74f3460..1f283df 100644 --- a/layouts/partials/comments/provider/disqus.html +++ b/layouts/partials/comments/provider/disqus.html @@ -10,3 +10,13 @@ padding: var(--card-padding); } + + \ No newline at end of file diff --git a/layouts/partials/comments/provider/utterances.html b/layouts/partials/comments/provider/utterances.html index 75d63ce..e2ecf6d 100644 --- a/layouts/partials/comments/provider/utterances.html +++ b/layouts/partials/comments/provider/utterances.html @@ -13,4 +13,19 @@ .utterances { max-width: unset; } - \ No newline at end of file + + + \ No newline at end of file diff --git a/layouts/partials/widget/archives.html b/layouts/partials/widget/archives.html index 950dbf2..4a92a30 100644 --- a/layouts/partials/widget/archives.html +++ b/layouts/partials/widget/archives.html @@ -1,27 +1,33 @@ -
-
- {{ partial "helper/icon" "infinity" }} -
-

{{ T "widget.archives.title" }}

+{{- $query := first 1 (where .Site.Pages "Layout" "==" "archives") -}} +{{- if $query -}} + {{- $archivesPage := index $query 0 -}} +
+
+ {{ partial "helper/icon" "infinity" }} +
+

{{ T "widget.archives.title" }}

- {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} - {{ $notHidden := where .Site.RegularPages "Params.hidden" "!=" true }} - {{ $filtered := ($pages | intersect $notHidden) }} - {{ $archives := $filtered.GroupByDate "2006" }} - -
- {{ range $index, $item := first (add .Site.Params.widgets.archives.limit 1) ($archives) }} - {{- $id := lower (replace $item.Key " " "-") -}} -
- - {{ if eq $index $.Site.Params.widgets.archives.limit }} - {{ T "widget.archives.more" }} - {{ else }} - {{ .Key }} - {{ len $item.Pages }} - {{ end }} - -
- {{ end }} -
-
\ No newline at end of file + {{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }} + {{ $notHidden := where .Site.RegularPages "Params.hidden" "!=" true }} + {{ $filtered := ($pages | intersect $notHidden) }} + {{ $archives := $filtered.GroupByDate "2006" }} + +
+ {{ range $index, $item := first (add .Site.Params.widgets.archives.limit 1) ($archives) }} + {{- $id := lower (replace $item.Key " " "-") -}} +
+ + {{ if eq $index $.Site.Params.widgets.archives.limit }} + {{ T "widget.archives.more" }} + {{ else }} + {{ .Key }} + {{ len $item.Pages }} + {{ end }} + +
+ {{ end }} +
+
+{{- else -}} + {{- warnf "Archives page not found. Create a page with layout: archives." -}} +{{- end -}} \ No newline at end of file diff --git a/layouts/partials/widget/search.html b/layouts/partials/widget/search.html index 2275eb9..833f740 100644 --- a/layouts/partials/widget/search.html +++ b/layouts/partials/widget/search.html @@ -1,10 +1,16 @@ -
-

- - - - -

-
\ No newline at end of file +{{- $query := first 1 (where .Site.Pages "Layout" "==" "search") -}} +{{- if $query -}} + {{- $searchPage := index $query 0 -}} +
+

+ + + + +

+
+{{- else -}} + {{- warnf "Search page not found. Create a page with layout: search." -}} +{{- end -}} \ No newline at end of file