From 88481e9f0b23d51f11ce72b4a0dddf7cb8117fba Mon Sep 17 00:00:00 2001 From: Mivinci Date: Wed, 9 Nov 2022 18:03:38 +0800 Subject: [PATCH] fix mermaid --- assets/css/atom.scss | 9 +++++++++ assets/css/syntax.scss | 2 +- assets/js/main.js | 8 +++++--- assets/js/selectable.js | 8 +++++--- assets/js/style.js | 19 ++++++++---------- assets/js/theme.js | 10 ++++------ exampleSite/content/markdown-syntax.md | 7 ++++--- exampleSite/content/markdown-syntax.zh-cn.md | 7 ++++--- layouts/_default/single.html | 2 +- layouts/_default/terms.html | 21 ++++++++++---------- layouts/partials/item.html | 4 ++-- layouts/partials/{math.html => katex.html} | 0 layouts/partials/mermaid.html | 2 +- layouts/partials/plugin.html | 6 +++++- layouts/shortcodes/mermaid.html | 1 - 15 files changed, 59 insertions(+), 47 deletions(-) rename layouts/partials/{math.html => katex.html} (100%) delete mode 100644 layouts/shortcodes/mermaid.html diff --git a/assets/css/atom.scss b/assets/css/atom.scss index f875d77..b1af7e6 100644 --- a/assets/css/atom.scss +++ b/assets/css/atom.scss @@ -36,6 +36,10 @@ align-items: flex-start; } +.items-end { + align-items: flex-end; +} + .items-baseline { align-items: baseline; } @@ -78,6 +82,11 @@ $texts: (xs, 0.75), (sm, 0.875), (base, 1), (lg, 1.125), (xl, 1.25), white-space: nowrap; } +.list-disc { + list-style-type: disc; + padding-inline-start: 22px; +} + /* interactivity */ .cursor-pointer { cursor: pointer; diff --git a/assets/css/syntax.scss b/assets/css/syntax.scss index e3cf5b2..05169a4 100644 --- a/assets/css/syntax.scss +++ b/assets/css/syntax.scss @@ -3,7 +3,7 @@ } .chroma { - background-color: #292929; + background-color: #222222; margin: .5em 0; } diff --git a/assets/js/main.js b/assets/js/main.js index ab59668..c1e94f0 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -1,6 +1,8 @@ import { setup_theme_switch } from "./theme" -import "./style"; -import "./selectable"; +import { fix_checkbox_list_style } from "./style" +import { setup_selectable } from './selectable' -setup_theme_switch('theme-switch') \ No newline at end of file +setup_theme_switch('theme-switch') +setup_selectable() +fix_checkbox_list_style('.md ul') \ No newline at end of file diff --git a/assets/js/selectable.js b/assets/js/selectable.js index dc2def5..a801f89 100644 --- a/assets/js/selectable.js +++ b/assets/js/selectable.js @@ -1,4 +1,6 @@ -const selectable = '{{ .Site.Params.selectable }}' -if (selectable === 'false') { - document.documentElement.style = 'user-select:none' +export function setup_selectable () { + const selectable = '{{ .Site.Params.selectable }}' + if (selectable === 'false') { + document.documentElement.style = 'user-select:none' + } } \ No newline at end of file diff --git a/assets/js/style.js b/assets/js/style.js index c185aec..4f63afe 100644 --- a/assets/js/style.js +++ b/assets/js/style.js @@ -1,11 +1,8 @@ -// fix style of checked/unchecked list items -document.querySelectorAll('.md ul').forEach(v => { - if (/
  • .+<\/li>/.test(v.innerHTML)) { - console.log(v); - v.classList.add('ul-checkbox'); - } -}); - - -// // use custom font family -// document.querySelector('body').style.setProperty('--global-font-family', '{{ .Site.Params.globalFontFamily }}'); \ No newline at end of file +/** @param {string} selectors */ +export function fix_checkbox_list_style(selectors) { + document.querySelectorAll(selectors).forEach(v => { + if (/
  • .+<\/li>/.test(v.innerHTML)) { + v.classList.add('ul-checkbox'); + } + }); +} \ No newline at end of file diff --git a/assets/js/theme.js b/assets/js/theme.js index 662c7df..163c55c 100644 --- a/assets/js/theme.js +++ b/assets/js/theme.js @@ -53,16 +53,14 @@ function switch_minima_theme(current, next) { /** @param {string} theme */ function switch_utterances_theme(theme) { - if (!utterances) { - utterances = document.querySelector('iframe.utterances-frame') - } + utterances =utterances || document.querySelector('iframe.utterances-frame') + if (!utterances) return utterances.contentWindow.postMessage({ type: 'set-theme', theme }, 'https://utteranc.es') } /** @param {string} theme */ function switch_giscus_theme(theme) { - if (!giscus) { - giscus = document.querySelector('iframe.giscus-frame') - } + giscus = giscus || document.querySelector('iframe.giscus-frame') + if (!giscus) return giscus.contentWindow.postMessage({giscus: {setConfig: {theme}}}, 'https://giscus.app') } diff --git a/exampleSite/content/markdown-syntax.md b/exampleSite/content/markdown-syntax.md index 3d6992f..c16ab5d 100644 --- a/exampleSite/content/markdown-syntax.md +++ b/exampleSite/content/markdown-syntax.md @@ -3,8 +3,9 @@ author: "Hugo Authors" title: "Markdown Syntax Guide" date: "2021-07-18T10:52:59+08:00" description: "Sample article showcasing basic Markdown syntax." -categories: ["markdown"] -tags: ["markdown"] +categories: +tags: + - markdown --- This article offers a sample of basic Markdown syntax that can be used in Hugo content files, also it shows whether basic HTML elements are decorated with CSS in a Hugo theme. @@ -100,7 +101,7 @@ Tables aren't part of the core Markdown spec, but Hugo supports supports them ou type Registry interface { Register(*Service, ...RegisterOption) error Deregister(*Service, ...DeregisterOption) error - GetService(string, ...GetOption) ([]*Service, error) + List(string, ...ListOption) ([]*Service, error) } ``` diff --git a/exampleSite/content/markdown-syntax.zh-cn.md b/exampleSite/content/markdown-syntax.zh-cn.md index 175e92a..8ca9d37 100644 --- a/exampleSite/content/markdown-syntax.zh-cn.md +++ b/exampleSite/content/markdown-syntax.zh-cn.md @@ -3,8 +3,9 @@ author: "Mivinci" title: "Markdown 语法指北" date: "2021-07-18T10:52:59+08:00" description: "一篇 Markdown 示例文章，翻译自官方示例。" -categories: ["markdown"] -tags: ["markdown"] +categories: +tags: + - markdown --- 本文提供了一个可以在 Hugo 内容文件中使用的基本 Markdown 语法示例，还展示了基本 HTML 元素是否在 Hugo 主题中使用 CSS 进行修饰。 @@ -100,7 +101,7 @@ blockquote 元素表示从另一个来源引用的内容，可选地带有必须 type Registry interface { Register(*Service, ...RegisterOption) error Deregister(*Service, ...DeregisterOption) error - GetService(string, ...GetOption) ([]*Service, error) + List(string, ...ListOption) ([]*Service, error) } ``` diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1720af9..1bcdfcc 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -21,7 +21,7 @@ {{ end }} -
    +

    {{ .Description | markdownify | safeHTML }}

    {{ .Content }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 75ff2bf..86f0080 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,16 +1,15 @@ {{ define "main" }}
    -

    {{ .Title }}

    -
    {{ end }} \ No newline at end of file diff --git a/layouts/partials/item.html b/layouts/partials/item.html index 238daed..7d63575 100644 --- a/layouts/partials/item.html +++ b/layouts/partials/item.html @@ -1,12 +1,12 @@
    -
    +
    {{ if .Page.Params.link }} {{ .Title }} {{ else }} {{ .Title }} {{ end }} {{ if .Site.Params.displayDate }} -
    {{ .Date | time.Format (T "timeformat") }}
    +
    {{ .Date | time.Format (T "timeformat") }}
    {{ end }}
    {{ if .Site.Params.displayDescription }} diff --git a/layouts/partials/math.html b/layouts/partials/katex.html similarity index 100% rename from layouts/partials/math.html rename to layouts/partials/katex.html diff --git a/layouts/partials/mermaid.html b/layouts/partials/mermaid.html index fec2c08..46667a0 100644 --- a/layouts/partials/mermaid.html +++ b/layouts/partials/mermaid.html @@ -3,5 +3,5 @@ crossorigin="anonymous"> \ No newline at end of file diff --git a/layouts/partials/plugin.html b/layouts/partials/plugin.html index 846b11a..3528b2c 100644 --- a/layouts/partials/plugin.html +++ b/layouts/partials/plugin.html @@ -1,5 +1,9 @@ + + {{ if or .Params.math .Site.Params.math }} -{{ partial "math.html" . }} +{{ partial "katex.html" . }} {{ end }} {{ if or .Params.mermaid .Site.Params.mermaid }} diff --git a/layouts/shortcodes/mermaid.html b/layouts/shortcodes/mermaid.html deleted file mode 100644 index 13638ee..0000000 --- a/layouts/shortcodes/mermaid.html +++ /dev/null @@ -1 +0,0 @@ -

    {{ safeHTML .Inner }}

    \ No newline at end of file