diff --git a/assets/scss/partials/menu.scss b/assets/scss/partials/menu.scss index 281dc3ad..19476acc 100644 --- a/assets/scss/partials/menu.scss +++ b/assets/scss/partials/menu.scss @@ -127,10 +127,8 @@ } /* Menu style */ -.menu { - padding-left: 0; +#main-menu { list-style: none; - flex-direction: column; overflow-y: auto; flex-grow: 1; font-size: 1.4rem; @@ -141,13 +139,15 @@ margin: 0 calc(var(--container-padding) * -1); padding: 30px 30px; + @include respond(xl) { padding: 15px 0; } - &, - .menu-bottom-section { + &, .menu-bottom-section ol { + flex-direction: column; gap: 30px; + @include respond(xl) { gap: 25px; } @@ -200,13 +200,15 @@ font-weight: bold; } } - } - .menu-bottom-section { - margin-top: auto; - display: flex; - flex-direction: column; - width: 100%; + &.menu-bottom-section { + margin-top: auto; + + ol { + display: flex; + padding-left: 0; + } + } } } diff --git a/assets/scss/partials/sidebar.scss b/assets/scss/partials/sidebar.scss index 65126dc8..96f436a0 100644 --- a/assets/scss/partials/sidebar.scss +++ b/assets/scss/partials/sidebar.scss @@ -66,7 +66,7 @@ } .social-menu, - .menu { + #main-menu { margin-top: var(--sidebar-element-separation); } } diff --git a/config/_default/params.yaml b/config/_default/params.yaml index 8c3c663d..706c52d5 100644 --- a/config/_default/params.yaml +++ b/config/_default/params.yaml @@ -59,6 +59,12 @@ comments: issueTerm: pathname label: + beaudar: + repo: + issueTerm: pathname + label: + theme: + remark42: host: site: @@ -72,7 +78,7 @@ comments: clientSecret: autoCreateIssue: false - # Waline client configuration see: https://waline.js.org/en/reference/component.html + # Waline client configuration see: https://waline.js.org/en/reference/client.html waline: serverURL: lang: diff --git a/data/external.yaml b/data/external.yaml index 269ef4cc..1fc350a3 100644 --- a/data/external.yaml +++ b/data/external.yaml @@ -1,15 +1,15 @@ KaTeX: - - src: https://cdn.jsdelivr.net/npm/katex@0.15.6/dist/katex.min.css - integrity: sha256-J+iAE0sgH8QSz9hpcDxXIftnj65JEZgNhGcgReTTK9s= + - src: https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/katex.min.css + integrity: sha384-n8MVd4RsNIU0tAv4ct0nTaAbDJwPJzDEaqSD1odI+WdtXRGWt2kTvGFasHpSy3SV type: style - - src: https://cdn.jsdelivr.net/npm/katex@0.15.6/dist/katex.min.js - integrity: sha256-InsNdER1b2xUewP+pKCUJpkhiqwHgqiPXDlIk7GzBu4= + - src: https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/katex.min.js + integrity: sha384-XjKyOOlGwcjNTAIQHIpgOno0Hl1YQqzUOEleOLALmuqehneUG+vnGctmUb0ZY0l8 type: script defer: true - - src: https://cdn.jsdelivr.net/npm/katex@0.15.6/dist/contrib/auto-render.min.js - integrity: sha256-y39Mpg7V3D4lhBX4x6O0bUqTV4pSrfgwEfGKfxkOdgI= + - src: https://cdn.jsdelivr.net/npm/katex@0.16.9/dist/contrib/auto-render.min.js + integrity: sha384-+VBxd3r6XgURycqtZ117nYw44OOcIax56Z4dCRWbxyPt0Koah1uHoK0o4+/RRE05 type: script defer: true diff --git a/exampleSite/config/_default/hugo.yaml b/exampleSite/config/_default/hugo.yaml index d8a57568..9bce8478 100644 --- a/exampleSite/config/_default/hugo.yaml +++ b/exampleSite/config/_default/hugo.yaml @@ -1,6 +1,6 @@ baseurl: https://stack.jimmycai.com/demo/ languageCode: en-us -paginate: 5 +paginate: 3 # Note: This title is overridden by the title in i18n config file title: Hugo Theme Stack Starter @@ -13,9 +13,11 @@ DefaultContentLanguage: en # This will make .Summary and .WordCount behave correctly for CJK languages. hasCJKLanguage: false -disqusShortname: hugo-theme-stack +services: + disqus: + shortname: hugo-theme-stack + # GA Tracking ID + googleAnalytics: + id: -# GA Tracking ID -googleAnalytics: "" - -publishDir: ../public/demo \ No newline at end of file +publishDir: ../public/demo diff --git a/exampleSite/content/page/about/index.md b/exampleSite/content/page/about/index.md index 494cb46a..68911f9a 100644 --- a/exampleSite/content/page/about/index.md +++ b/exampleSite/content/page/about/index.md @@ -15,7 +15,7 @@ menu: icon: user --- -Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows. +Written in Go, Hugo is an open source static site generator available under the [Apache License 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows. Hugo makes use of a variety of open source projects including: @@ -29,6 +29,6 @@ Hugo is ideal for blogs, corporate websites, creative portfolios, online magazin Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases. -Websites built with Hugo are extremelly fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. +Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider. Learn more and contribute on [GitHub](https://github.com/gohugoio). diff --git a/exampleSite/content/post/math-typesetting/index.md b/exampleSite/content/post/math-typesetting/index.md index ce8d0bf3..060fd7f7 100644 --- a/exampleSite/content/post/math-typesetting/index.md +++ b/exampleSite/content/post/math-typesetting/index.md @@ -21,17 +21,17 @@ In this example we will be using [KaTeX](https://katex.org/) {{ end }} ``` -- To enable KaTex globally set the parameter `math` to `true` in a project's configuration -- To enable KaTex on a per page basis include the parameter `math: true` in content files +- To enable KaTeX globally set the parameter `math` to `true` in a project's configuration +- To enable KaTeX on a per page basis include the parameter `math: true` in content files **Note:** Use the online reference of [Supported TeX Functions](https://katex.org/docs/supported.html) {{< math.inline >}} {{ if or .Page.Params.math .Site.Params.math }} - - - + + + {{ end }} {{}} diff --git a/i18n/be.yaml b/i18n/be.yaml new file mode 100644 index 00000000..605cd086 --- /dev/null +++ b/i18n/be.yaml @@ -0,0 +1,72 @@ +toggleMenu: + other: Паказаць/схаваць меню + +darkMode: + other: Цёмны рэжым + +list: + page: + one: "{{ .Count }} старонка" + few: "{{ .Count }} старонкі" + many: "{{ .Count }} старонак" + other: "{{ .Count }} старонкі" + + section: + other: Раздзел + + subsection: + one: Падраздзел + few: Падраздзелы + many: Падраздзелы + other: Падраздзелы + +article: + back: + other: Назад + + relatedContent: + other: Таксама рэкамендуем + + lastUpdatedOn: + other: Абноўлена + + tableOfContents: + other: Змест + + readingTime: + other: "Час чытання: {{ .Count }} хв." + +notFound: + title: + other: Не знойдзена + + subtitle: + other: Запытваемая старонка не існуе + +widget: + archives: + title: + other: Архівы + more: + other: Яшчэ + + tagCloud: + title: + other: Тэгі + +search: + title: + other: Пошук + + placeholder: + other: Увядзіце нешта... + + resultTitle: + other: "Знайдзена #PAGES_COUNT старонак (за #TIME_SECONDS с.)" + +footer: + builtWith: + other: Створана пры дапамозе {{ .Generator }} + + designedBy: + other: Тэма {{ .Theme }}, дызайн {{ .DesignedBy }} diff --git a/i18n/hi.yaml b/i18n/hi.yaml new file mode 100644 index 00000000..27316fe2 --- /dev/null +++ b/i18n/hi.yaml @@ -0,0 +1,73 @@ +toggleMenu: + other: मेनू टॉगल करें + +darkMode: + other: डार्क मोड + +list: + page: + one: "{{ .Count }} पेज" + other: "{{ .Count }} पेज" + + section: + other: अनुभाग + + subsection: + one: उपधारा + other: उपखंड + +article: + back: + other: पीछे + + tableOfContents: + other: विषयसूची + + relatedContent: + other: संबंधित सामग्री + + lastUpdatedOn: + other: अंतिम बार अपडेट किया गया + + readingTime: + one: "{{ .Count }} मिनट पढ़ें" + other: "{{ .Count }} मिनट पढ़ें" + +notFound: + title: + other: 404 नहीं मिला। + + subtitle: + other: यह पृष्ठ मौजूद नहीं है। + +widget: + archives: + title: + other: अभिलेखागार + + more: + other: अधिक + + tagCloud: + title: + other: टैग + categoriesCloud: + title: + other: श्रेणियाँ + +search: + title: + other: खोज + + placeholder: + other: कुछ लिखें... + + resultTitle: + other: "#PAGES_COUNT पेज (#TIME_SECONDS सेकंड)" + +footer: + builtWith: + other: निर्मित {{ .Generator }} के साथ + + designedBy: + other: थीम {{ .Theme }} द्वारा डिज़ाइन किया गया {{ .DesignedBy }} diff --git a/i18n/sk.yaml b/i18n/sk.yaml new file mode 100644 index 00000000..59c680ef --- /dev/null +++ b/i18n/sk.yaml @@ -0,0 +1,71 @@ +toggleMenu: + other: Skryť menu + +darkMode: + other: Tmavý režim + +list: + page: + one: "{{ .Count }} stránka" + other: "{{ .Count }} stránok" + + section: + other: Kategórie + + subsection: + one: Podkategória + other: Podkategórie + +article: + back: + other: Späť + + tableOfContents: + other: Obsah + + relatedContent: + other: Súvisiace + + lastUpdatedOn: + other: Naposledy aktualizované + + readingTime: + one: "{{ .Count }} minúta" + other: "{{ .Count }} minút" + +notFound: + title: + other: Nenájdené + + subtitle: + other: Tato stránka neexistuje + +widget: + archives: + title: + other: Archívy + more: + other: Viac + tagCloud: + title: + other: Štítky + categoriesCloud: + title: + other: Kategórie + +search: + title: + other: Hladať + + placeholder: + other: Zadajte niečo... + + resultTitle: + other: "#PAGES_COUNT stránok (#TIME_SECONDS sekúnd)" + +footer: + builtWith: + other: Vytvorené pomocou {{ .Generator }} + + designedBy: + other: Šablóna {{ .Theme }} od {{ .DesignedBy }} diff --git a/i18n/zh-cn.yaml b/i18n/zh-cn.yaml index 12a7ac63..ac42d8f8 100644 --- a/i18n/zh-cn.yaml +++ b/i18n/zh-cn.yaml @@ -2,6 +2,11 @@ toggleMenu: 切换菜单 darkMode: 暗色模式 +list: + page: "{{ .Count }} 个页面" + section: 章节 + subsection: 子章节 + article: back: 返回 tableOfContents: 目录 @@ -24,5 +29,5 @@ search: resultTitle: "#PAGES_COUNT 个结果 （用时 #TIME_SECONDS 秒）" footer: - builtWith: Built with {{ .Generator }} + builtWith: 使用 {{ .Generator }} 构建 designedBy: 主题 {{ .Theme }} 由 {{ .DesignedBy }} 设计 diff --git a/layouts/partials/comments/provider/beaudar.html b/layouts/partials/comments/provider/beaudar.html new file mode 100644 index 00000000..761801fa --- /dev/null +++ b/layouts/partials/comments/provider/beaudar.html @@ -0,0 +1,46 @@ + + + + + diff --git a/layouts/partials/comments/provider/twikoo.html b/layouts/partials/comments/provider/twikoo.html index 71eae39a..53830dd7 100644 --- a/layouts/partials/comments/provider/twikoo.html +++ b/layouts/partials/comments/provider/twikoo.html @@ -13,7 +13,9 @@ } .twikoo .el-input-group__prepend, .twikoo .tk-action-icon, + .twikoo .tk-submit-action-icon, .twikoo .tk-time, + .twikoo .tk-comments-no, .twikoo .tk-comments-count { color: var(--twikoo-body-text-color); } @@ -28,6 +30,9 @@ .twikoo .el-button{ color: var(--twikoo-body-text-color)!important; } + .twikoo .el-input__count { + color: var(--twikoo-body-text-color) !important; + } .OwO .OwO-body { background-color: var(--body-background) !important; color: var(--body-text-color) !important; diff --git a/layouts/partials/head/head.html b/layouts/partials/head/head.html index 5de60712..ae7bde17 100644 --- a/layouts/partials/head/head.html +++ b/layouts/partials/head/head.html @@ -5,7 +5,7 @@ {{ with .Params.Keywords }}{{ end }} -{{- $title := partialCached "data/title" . .RelPermalink -}} +{{- $title := partial "data/title" . -}} {{ $title }} diff --git a/layouts/partials/head/opengraph/provider/base.html b/layouts/partials/head/opengraph/provider/base.html index 3e51d37c..60da962a 100644 --- a/layouts/partials/head/opengraph/provider/base.html +++ b/layouts/partials/head/opengraph/provider/base.html @@ -32,8 +32,8 @@ {{- end -}} {{- else -}} - {{- if not .Site.LastChange.IsZero -}} - + {{- if not .Site.Lastmod.IsZero -}} + {{- end -}} {{- end -}} diff --git a/layouts/partials/sidebar/left.html b/layouts/partials/sidebar/left.html index 001d9d69..2dc879ac 100644 --- a/layouts/partials/sidebar/left.html +++ b/layouts/partials/sidebar/left.html @@ -63,27 +63,30 @@ {{ end }} +
  • +
      + {{- $currentLanguageCode := .Language.Lang -}} + {{ if ( compare.Gt .Site.Home.AllTranslations.Len 1 ) }} + {{ with .Site.Home.AllTranslations }} +
    1. + {{ partial "helper/icon" "language" }} + +
      2. + {{ end }} + {{ end }} -
      - {{- $currentLanguageCode := .Language.Lang -}} - {{ with .Site.Home.AllTranslations }} -
    2. - {{ partial "helper/icon" "language" }} - -
      3. - {{ end }} - - {{ if .Site.Params.colorScheme.toggle }} -
    3. - {{ partial "helper/icon" "toggle-left" }} - {{ partial "helper/icon" "toggle-right" }} - {{ T "darkMode" }} -
      4. - {{ end }} -
      + {{ if (default false .Site.Params.colorScheme.toggle) }} +
    4. + {{ partial "helper/icon" "toggle-left" }} + {{ partial "helper/icon" "toggle-right" }} + {{ T "darkMode" }} +
      5. + {{ end }} +
    +
    • diff --git a/layouts/partials/sidebar/right.html b/layouts/partials/sidebar/right.html index d2a6ae80..6333f10d 100644 --- a/layouts/partials/sidebar/right.html +++ b/layouts/partials/sidebar/right.html @@ -4,7 +4,10 @@