diff --git a/assets/customize.scss b/assets/customize.scss index 5652181e..5c6bdd3b 100644 --- a/assets/customize.scss +++ b/assets/customize.scss @@ -1,8 +1,11 @@ -img.shields-icon { - display: inline-block; - vertical-align: text-bottom; - border: none; - border-radius: 0%; +a.shields { + display: inline; + img { + display: inline; + vertical-align: text-bottom; + border: none; + border-radius: 0%; + } } a.github-profile { display: inline-block; @@ -34,11 +37,19 @@ a.github-profile { } } .csv-table { - margin: 0; + width: max-content; + max-width: max-content !important; white-space: nowrap; + table-layout: fixed; + word-break: break-all; th { text-align: center; } + th, + td { + border: 1px solid black; + border-collapse: collapse; + } } .mtf-wiki > { .c1 { @@ -145,15 +156,15 @@ a.anchor { color: #96ccff; } } - .highlight { code, - pre, span { + pre, + span { font-family: "Courier New", Courier, monospace; - background-color: transparent!important; + background-color: transparent !important; } .lntd code { - margin: 0!important; - padding: 0!important; + margin: 0 !important; + padding: 0 !important; } } diff --git a/content/en/about.md b/content/en/about.md index 79ac9184..71ca1e3c 100644 --- a/content/en/about.md +++ b/content/en/about.md @@ -40,17 +40,14 @@ and other lovely guys who give us help and information. ## Contact -Through Discord [![Discord][shields/discord]](https://233.plus/discord) +Through Discord {{< shields/discord 883004164760801320 "MtF.wiki Official" "https://233.plus/discord" >}} -Twitter {{< shields/twitter mtfwiki >}} +Twitter {{< shields/twitter MtFwiki >}} -Through GitHub [![GitHub issues][shields/github]](https://github.com/mtf-wiki/MtF-wiki/issues/new/choose) +Through GitHub {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} Via Email -[shields/discord]: https://img.shields.io/discord/883004164760801320?style=flat-square -[shields/github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square - ## Acknowledgement We run a [Hugo][hugo-url] on GitHub Pages with theme [zdoc][zdoc-url]. Thanks for them. diff --git a/content/es/about.md b/content/es/about.md index 1c43fd01..f8e5978d 100644 --- a/content/es/about.md +++ b/content/es/about.md @@ -37,17 +37,14 @@ y los otros queridos que nos dan ayuda y información. ## Contacto -Por Discord [![Discord][shields/discord]](https://233.plus/discord) +Por Discord {{< shields/discord 883004164760801320 "MtF.wiki Official" "https://233.plus/discord" >}} -Twitter {{< shields/twitter mtfwiki >}} +Twitter {{< shields/twitter MtFwiki >}} -Por GitHub [![GitHub issues][shields/github]](https://github.com/mtf-wiki/MtF-wiki/issues/new/choose) +Por GitHub {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} Por correo electrónico -[shields/discord]: https://img.shields.io/discord/883004164760801320?style=flat-square -[shields/github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square - ## Agradecimiento Ejecutamos [Hugo][hugo-url] en GitHub Pages. Tema visual [zdoc][zdoc-url]. Muchas gracias. diff --git a/content/ja/about.md b/content/ja/about.md index 8aa2b9f7..cec54501 100755 --- a/content/ja/about.md +++ b/content/ja/about.md @@ -40,17 +40,14 @@ weight: 0 ## 連絡 -Discord [![Discord][shields/discord]](https://233.plus/discord) +Discord {{< shields/discord 883004164760801320 "MtF.wiki Official" "https://233.plus/discord" >}} -Twitter {{< shields/twitter mtfwiki >}} +Twitter {{< shields/twitter MtFwikiJapan >}} -GitHub [![GitHub issues][shields/github]](https://github.com/mtf-wiki/MtF-wiki/issues/new/choose) +GitHub {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} Email -[shields/discord]: https://img.shields.io/discord/883004164760801320?style=flat-square -[shields/github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square - ## 感謝 日本語版に特別な感謝: diff --git a/content/zh-cn/about.md b/content/zh-cn/about.md index d76c7eb3..ed0b74ea 100644 --- a/content/zh-cn/about.md +++ b/content/zh-cn/about.md @@ -40,17 +40,14 @@ weight: 0 ## 联系方式 -Discord [![Discord][badge-discord]](https://233.plus/discord) +Discord {{< shields/discord 883004164760801320 "MtF.wiki Official" "https://233.plus/discord" >}} -Twitter {{< shields/twitter mtfwiki >}} +Twitter {{< shields/twitter MtFwikiJapan >}} -GitHub [![GitHub issues][badge-github]](https://github.com/mtf-wiki/MtF-wiki/issues/new/choose) +GitHub {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} 邮件 -[badge-discord]: https://img.shields.io/discord/883004164760801320?style=flat-square -[badge-github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square - ## ~~办公地点~~ {{< expand "谨慎展开">}} diff --git a/content/zh-cn/docs/contributor-guide.md b/content/zh-cn/docs/contributor-guide.md index 5ce6eba9..32613db7 100644 --- a/content/zh-cn/docs/contributor-guide.md +++ b/content/zh-cn/docs/contributor-guide.md @@ -4,13 +4,10 @@ title: 贡献者指南 贡献方式: -1. 会 GitHub 操作,直接 PR 或 通过 [![GitHub issues][badge-github]][new-issue] (该方法的过程将是公开的,请注意处理隐私数据,如果不会处理隐私数据,请通过邮件方式贡献内容) +1. 会 GitHub 操作,直接 PR 或 通过 {{< shields/github-issue "mtf-wiki/MtF-wiki" >}}(该方法的过程将是公开的,请注意处理隐私数据,如果不会处理隐私数据,请通过邮件方式贡献内容) 1. 发送邮件到 1. 在 [TransLand](https://chat.transland.lgbt) 发布主题 -[badge-github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square -[new-issue]: https://github.com/mtf-wiki/MtF-wiki/issues/new/choose - {{< notice info "友情提醒" >}} 绝对不要做出任何道德绑架的行为!!! {{< /notice >}} diff --git a/content/zh-cn/docs/friendship.md b/content/zh-cn/docs/friendship.md index 2e36c565..19417f5e 100644 --- a/content/zh-cn/docs/friendship.md +++ b/content/zh-cn/docs/friendship.md @@ -24,7 +24,7 @@ QQ,跨儿音游组,[{{< shields/qq 717099350 >}}](https://jq.qq.com/?_wv=1027&k= Telegram,Backlight.Town 逆光小镇,联系 {{< shields/telegram rikablossom >}} 加入 Telegram,跨儿音游组,{{< shields/telegram otoge_trans >}} Matrix,Arch 木桶饭,{{< shields/matrix arch-mtf matrix.malacology.net >}} -Discord,MtF.wiki,https://233.plus/discord +Discord,MtF.wiki Official,https://233.plus/discord ``` ## SRS 手术交流群 diff --git a/content/zh-hant/about.md b/content/zh-hant/about.md index fa4d0848..74f300ba 100644 --- a/content/zh-hant/about.md +++ b/content/zh-hant/about.md @@ -42,17 +42,14 @@ weight: 0 ## 社群聯絡 -Discord [![Discord][shields/discord]](https://233.plus/discord) +Discord {{< shields/discord 883004164760801320 "MtF.wiki Official" "https://233.plus/discord" >}} -Twitter {{< shields/twitter mtfwiki >}} +Twitter {{< shields/twitter MtFwikiJapan >}} -GitHub [![GitHub issues][shields/github]](https://github.com/mtf-wiki/MtF-wiki/issues/new/choose) +GitHub {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} 電郵 -[shields/discord]: https://img.shields.io/discord/883004164760801320?style=flat-square -[shields/github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square - ## 致謝 本網站目前使用 [Hugo][hugo-url] 部署於 [GitHub Pages][pages-url],並使用 [zdoc][zdoc-url] 主題,在此表示感謝! diff --git a/content/zh-hant/docs/contributor-guide.md b/content/zh-hant/docs/contributor-guide.md index c3dde289..6e7be746 100644 --- a/content/zh-hant/docs/contributor-guide.md +++ b/content/zh-hant/docs/contributor-guide.md @@ -9,12 +9,9 @@ title: 貢獻者指南 貢獻方式: -1. 會 GitHub 操作,直接 PR 或者 透過 [![GitHub issues][badge-github]][new-issue] +1. 會 GitHub 操作,直接 PR 或者 透過 {{< shields/github-issue "mtf-wiki/MtF-wiki" >}} 1. 傳送郵件到 -[badge-github]: https://img.shields.io/github/issues/mtf-wiki/MtF-wiki?style=flat-square -[new-issue]: https://github.com/mtf-wiki/MtF-wiki/issues/new/choose - {{< notice info "友情提醒" >}} 絕對不要做出任何道德綁架的行為!!! {{< /notice >}} diff --git a/content/zh-hant/docs/friendship.md b/content/zh-hant/docs/friendship.md index 2a2972c5..9c9bd450 100644 --- a/content/zh-hant/docs/friendship.md +++ b/content/zh-hant/docs/friendship.md @@ -22,7 +22,7 @@ QQ,跨兒音遊組,[{{< shields/qq 717099350 >}}](https://jq.qq.com/?_wv=1027&k= Telegram,Backlight.Town 逆光小鎮,聯絡 {{< shields/telegram rikablossom >}} 加入 Telegram,跨兒音遊組,{{< shields/telegram otoge_trans >}} Matrix,Arch 木桶飯,{{< shields/matrix arch-mtf matrix.malacology.net >}} -Discord,MtF.wiki,https://233.plus/discord +Discord,MtF.wiki Official,https://233.plus/discord ``` ## SRS 手術交流群 diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index 4f994a11..11c20d46 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1,5 +1 @@ -{{- if hasPrefix .Destination "https://img.shields.io" -}} -{{ .Text }} -{{- else -}} -

{{ .Text }}

-{{- end -}} \ No newline at end of file +

{{ .Text }}

\ No newline at end of file diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html index f95ff64d..1a46aad3 100644 --- a/layouts/_default/_markup/render-link.html +++ b/layouts/_default/_markup/render-link.html @@ -1,7 +1,7 @@ {{- if hasPrefix .Destination "mailto:" -}} {{- $text := replace (replace .Text "-" "--") "_" "__" -}} - - + + {{- else -}} diff --git a/layouts/shortcodes/shield.html b/layouts/shortcodes/shield.html index 4457ae52..763d7ae1 100644 --- a/layouts/shortcodes/shield.html +++ b/layouts/shortcodes/shield.html @@ -2,4 +2,4 @@ {{- $message := .Get 1 -}} {{- $link := .Get 2 -}} {{- $qs := querify "label" $type "logo" $type "message" $message "color" "blue" "style" "flat-square" -}} -{{ $type }} {{ $message }} \ No newline at end of file +{{ $type }} {{ $message }} \ No newline at end of file diff --git a/layouts/shortcodes/shields/discord.html b/layouts/shortcodes/shields/discord.html new file mode 100644 index 00000000..77ac4b22 --- /dev/null +++ b/layouts/shortcodes/shields/discord.html @@ -0,0 +1,10 @@ +{{- $id := .Get 0 -}} +{{- $message := .Get 1 -}} +{{- $href := .Get 2 -}} +{{- $qs := querify "style" "flat-square" -}} + + Discord {{ $message }} + \ No newline at end of file diff --git a/layouts/shortcodes/shields/github-issue.html b/layouts/shortcodes/shields/github-issue.html new file mode 100644 index 00000000..32c2ce88 --- /dev/null +++ b/layouts/shortcodes/shields/github-issue.html @@ -0,0 +1,8 @@ +{{- $repo := .Get 0 -}} +{{- $qs := querify "style" "flat-square" -}} + + {{ $repo }} issues + diff --git a/layouts/shortcodes/shields/line.html b/layouts/shortcodes/shields/line.html index f2351b87..418566a9 100644 --- a/layouts/shortcodes/shields/line.html +++ b/layouts/shortcodes/shields/line.html @@ -1,3 +1,3 @@ {{- $message := .Get 0 -}} {{- $qs := querify "label" "LINE" "logo" "LINE" "message" $message "color" "00C300" "style" "flat-square" -}} -LINE {{ $message }} \ No newline at end of file +LINE {{ $message }} \ No newline at end of file diff --git a/layouts/shortcodes/shields/matrix.html b/layouts/shortcodes/shields/matrix.html index 7811d258..d3160a5e 100644 --- a/layouts/shortcodes/shields/matrix.html +++ b/layouts/shortcodes/shields/matrix.html @@ -1,4 +1,9 @@ {{- $name := .Get 0 -}} {{- $fqdn := .Get 1 -}} {{- $qs := querify "server_fqdn" $fqdn "style" "flat-square" "label" "matrix" -}} -Matrix #{{ $name }}:{{ $fqdn }} \ No newline at end of file + + Matrix #{{ $name }}:{{ $fqdn }} + \ No newline at end of file diff --git a/layouts/shortcodes/shields/qq.html b/layouts/shortcodes/shields/qq.html index a554e407..b78cb99e 100644 --- a/layouts/shortcodes/shields/qq.html +++ b/layouts/shortcodes/shields/qq.html @@ -1,3 +1,8 @@ {{- $message := .Get 0 -}} {{- $qs := querify "label" "QQ" "logo" "Tencent QQ" "message" $message "color" "blue" "style" "flat-square" -}} -QQ {{ $message }} \ No newline at end of file + + QQ {{ $message }} + \ No newline at end of file diff --git a/layouts/shortcodes/shields/telegram.html b/layouts/shortcodes/shields/telegram.html index 61d78655..65fce147 100644 --- a/layouts/shortcodes/shields/telegram.html +++ b/layouts/shortcodes/shields/telegram.html @@ -1,3 +1,8 @@ {{- $message := .Get 0 -}} {{- $qs := querify "label" "Telegram" "logo" "Telegram" "message" $message "color" "26A5E4" "style" "flat-square" -}} -Telegram {{ $message }} \ No newline at end of file + + Telegram {{ $message }} + \ No newline at end of file diff --git a/layouts/shortcodes/shields/twitter.html b/layouts/shortcodes/shields/twitter.html index 4c5e4e7a..91cb33e8 100644 --- a/layouts/shortcodes/shields/twitter.html +++ b/layouts/shortcodes/shields/twitter.html @@ -1,3 +1,8 @@ {{- $message := .Get 0 -}} {{- $qs := querify "label" "Twitter" "logo" "Twitter" "message" $message "color" "blue" "style" "flat-square" -}} -Twitter {{ $message }} \ No newline at end of file + + Twitter {{ $message }} + \ No newline at end of file diff --git a/layouts/shortcodes/shields/wechat.html b/layouts/shortcodes/shields/wechat.html index 91491ad1..ae828bba 100644 --- a/layouts/shortcodes/shields/wechat.html +++ b/layouts/shortcodes/shields/wechat.html @@ -1,8 +1,9 @@ {{- $message := .Get 0 -}} -{{ if eq $.Site.Language.Lang "zh-cn" }} -{{- $qs := querify "label" "微信" "logo" "WeChat" "message" $message "color" "07C160" "style" "flat-square" -}} -微信 {{ $message }} -{{ else }} -{{- $qs := querify "label" "WeChat" "logo" "WeChat" "message" $message "color" "07C160" "style" "flat-square" -}} -WeChat {{ $message }} -{{ end }} \ No newline at end of file +{{ $label := cond (eq $.Site.Language.Lang "zh-cn") "微信" "WeChat" }} +{{- $qs := querify "label" $label "logo" "WeChat" "message" $message "color" "07C160" "style" "flat-square" -}} + + {{ $label }} {{ $message }} + \ No newline at end of file