diff --git a/apps/test/content/posts/fontawesome-test.md b/apps/test/content/posts/fontawesome-test.md index 290346b9..8349be6a 100644 --- a/apps/test/content/posts/fontawesome-test.md +++ b/apps/test/content/posts/fontawesome-test.md @@ -18,6 +18,7 @@ Test for rendering Font Awesome icons. :(fa-solid fa-camera fa-xs): :(fa-solid fa-camera fa-sm): :(fa-solid fa-camera fa-lg): +:(fa-solid fa-camera fa-1x): :(fa-solid fa-camera fa-2x): :(fa-solid fa-camera fa-3x): :(fa-solid fa-camera fa-5x): @@ -26,9 +27,9 @@ Test for rendering Font Awesome icons. ## Fixed width -:(fa-solid fa-skating fa-fw fa-2x): Skating\ -:(fa-solid fa-skiing fa-fw fa-2x): Skiing\ -:(fa-solid fa-skiing-nordic fa-fw fa-2x): Nordic Skiing +:(fa-solid fa-skating fa-2x): Skating\ +:(fa-solid fa-skiing fa-2x): Skiing\ +:(fa-solid fa-skiing-nordic fa-2x): Nordic Skiing ## List icon @@ -75,4 +76,4 @@ hey guys! ## Border -:(fa-brands fa-apple fa-border fa-fw fa-10x): +:(fa-brands fa-apple fa-border fa-10x): diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 3bf0c734..d4005aeb 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -105,8 +105,6 @@ &.awesome-hr { &::before { display: inline-block; - font-weight: 600; - font-family: 'Font Awesome 6 Free'; text-rendering: auto; -webkit-font-smoothing: antialiased; position: absolute; @@ -115,10 +113,12 @@ transform: translateY(-50%); z-index: 1; color: var(#{$rootPrefix}hr-active-color); - content: '\f0c4'; font-size: 20px; line-height: 1; transition: left 1s ease-in-out, color 0.3s ease, border-color 0.3s ease; + font-family: var(--fa-family-classic); + font-weight: 600; + content: '\f0c4'; } &:hover::before { diff --git a/assets/css/_partials/_single/_diagram-copy-btn.scss b/assets/css/_partials/_single/_diagram-copy-btn.scss index b03f19f4..091da3e3 100644 --- a/assets/css/_partials/_single/_diagram-copy-btn.scss +++ b/assets/css/_partials/_single/_diagram-copy-btn.scss @@ -6,6 +6,8 @@ // Diagram copy button styles .diagram-copy-btn { + width: 1rem; + height: 1rem; position: absolute; top: 0.5rem; right: 0.5rem; @@ -40,10 +42,14 @@ } } + .fa-clone { + font-size: 1rem; + } + &[data-copied] { .fa-clone { - --fa: "\f00c"; - font-weight: 900; + --fa: '\f00c'; + --fa-style: 900; color: var(#{$rootPrefix}global-link-hover-color); } } diff --git a/assets/css/_shortcodes/_center-quote.scss b/assets/css/_shortcodes/_center-quote.scss index e6fa03c0..9ab79dd5 100644 --- a/assets/css/_shortcodes/_center-quote.scss +++ b/assets/css/_shortcodes/_center-quote.scss @@ -19,9 +19,9 @@ blockquote.blockquote-center { border-top: 1px solid $global-border-color; text-align: left; top: -20px; - content: '\f10d'; - font-family: 'Font Awesome 5 Free'; + font-family: var(--fa-family-classic); font-weight: 900; + content: '\f10d'; [data-theme='dark'] & { border-top-color: $global-border-color-dark; @@ -32,9 +32,9 @@ blockquote.blockquote-center { border-bottom: 1px solid $global-border-color; bottom: -20px; text-align: right; - content: '\f10e'; - font-family: 'Font Awesome 5 Free'; + font-family: var(--fa-family-classic); font-weight: 900; + content: '\f10e'; [data-theme='dark'] & { border-bottom-color: $global-border-color-dark; diff --git a/assets/data/social.yml b/assets/data/social.yml index 1b525f78..8e97460c 100644 --- a/assets/data/social.yml +++ b/assets/data/social.yml @@ -4,7 +4,7 @@ github: Prefix: https://github.com/ Title: GitHub Icon: - Class: fa-brands fa-github-alt fa-fw + Class: fa-brands fa-github-alt # 002: LinkedIn linkedin: @@ -12,7 +12,7 @@ linkedin: Prefix: https://linkedin.com/in/ Title: LinkedIn Icon: - Class: fa-brands fa-linkedin fa-fw + Class: fa-brands fa-linkedin # 003: Twitter (X) twitter: @@ -20,7 +20,7 @@ twitter: Prefix: https://twitter.com/ Title: X Icon: - Class: fa-brands fa-x-twitter fa-fw + Class: fa-brands fa-x-twitter # 004: Instagram instagram: @@ -28,7 +28,7 @@ instagram: Prefix: https://www.instagram.com/ Title: Instagram Icon: - Class: fa-brands fa-instagram fa-fw + Class: fa-brands fa-instagram # 005: facebook facebook: @@ -36,7 +36,7 @@ facebook: Prefix: https://facebook.com/ Title: facebook Icon: - Class: fa-brands fa-facebook fa-fw + Class: fa-brands fa-facebook # 006: Telegram telegram: @@ -44,7 +44,7 @@ telegram: Prefix: https://t.me/ Title: Telegram Icon: - Class: fa-brands fa-telegram-plane fa-fw + Class: fa-brands fa-telegram-plane # 007: Medium medium: @@ -52,7 +52,7 @@ medium: Prefix: https://medium.com/ Title: Medium Icon: - Class: fa-brands fa-medium fa-fw + Class: fa-brands fa-medium # 008: GitLab gitlab: @@ -60,7 +60,7 @@ gitlab: Prefix: https://gitlab.com/ Title: GitLab Icon: - Class: fa-brands fa-gitlab fa-fw + Class: fa-brands fa-gitlab # 009: YouTube Legacy youtubelegacy: @@ -68,7 +68,7 @@ youtubelegacy: Prefix: https://www.youtube.com/user/ Title: YouTube Icon: - Class: fa-brands fa-youtube fa-fw + Class: fa-brands fa-youtube # 010: YouTube Custom youtubecustom: @@ -76,7 +76,7 @@ youtubecustom: Prefix: https://www.youtube.com/c/ Title: YouTube Icon: - Class: fa-brands fa-youtube fa-fw + Class: fa-brands fa-youtube # 011: YouTube Channel youtubechannel: @@ -84,7 +84,7 @@ youtubechannel: Prefix: https://www.youtube.com/channel/ Title: YouTube Icon: - Class: fa-brands fa-youtube fa-fw + Class: fa-brands fa-youtube # 012: Tumblr tumblr: @@ -92,7 +92,7 @@ tumblr: Template: https://%v.tumblr.com/ Title: Tumblr Icon: - Class: fa-brands fa-tumblr fa-fw + Class: fa-brands fa-tumblr # 013: Quora quora: @@ -100,7 +100,7 @@ quora: Prefix: https://www.quora.com/profile/ Title: Quora Icon: - Class: fa-brands fa-quora fa-fw + Class: fa-brands fa-quora # 014: Keybase keybase: @@ -108,7 +108,7 @@ keybase: Prefix: https://keybase.io/ Title: Keybase Icon: - Class: fa-brands fa-keybase fa-fw + Class: fa-brands fa-keybase # 015: Pinterest pinterest: @@ -116,7 +116,7 @@ pinterest: Prefix: https://www.pinterest.com/ Title: Pinterest Icon: - Class: fa-brands fa-pinterest fa-fw + Class: fa-brands fa-pinterest # 016: Reddit reddit: @@ -124,7 +124,7 @@ reddit: Prefix: https://www.reddit.com/user/ Title: Reddit Icon: - Class: fa-brands fa-reddit fa-fw + Class: fa-brands fa-reddit # 017: CodePen codepen: @@ -132,7 +132,7 @@ codepen: Prefix: https://codepen.io/ Title: CodePen Icon: - Class: fa-brands fa-codepen fa-fw + Class: fa-brands fa-codepen # 018: freeCodeCamp freecodecamp: @@ -140,7 +140,7 @@ freecodecamp: Prefix: https://freecodecamp.org/ Title: freeCodeCamp Icon: - Class: fa-brands fa-free-code-camp fa-fw + Class: fa-brands fa-free-code-camp # 019: Bitbucket bitbucket: @@ -148,7 +148,7 @@ bitbucket: Prefix: https://bitbucket.org/ Title: Bitbucket Icon: - Class: fa-brands fa-bitbucket fa-fw + Class: fa-brands fa-bitbucket # 020: Stack Overflow stackoverflow: @@ -156,7 +156,7 @@ stackoverflow: Prefix: https://stackoverflow.com/users/ Title: Stack Overflow Icon: - Class: fa-brands fa-stack-overflow fa-fw + Class: fa-brands fa-stack-overflow # 021: 微博 weibo: @@ -164,7 +164,7 @@ weibo: Prefix: https://weibo.com/ Title: 微博 Icon: - Class: fa-brands fa-weibo fa-fw + Class: fa-brands fa-weibo # 022: OK.RU odnoklassniki: @@ -172,7 +172,7 @@ odnoklassniki: Prefix: https://ok.ru/ Title: OK.RU Icon: - Class: fa-brands fa-odnoklassniki fa-fw + Class: fa-brands fa-odnoklassniki # 023: VK vk: @@ -180,7 +180,7 @@ vk: Prefix: https://vk.com/ Title: VK Icon: - Class: fa-brands fa-vk fa-fw + Class: fa-brands fa-vk # 024: Flickr flickr: @@ -188,7 +188,7 @@ flickr: Prefix: https://www.flickr.com/photos/ Title: Flickr Icon: - Class: fa-brands fa-flickr fa-fw + Class: fa-brands fa-flickr # 025: Xing xing: @@ -196,7 +196,7 @@ xing: Prefix: https://www.xing.com/profile/ Title: Xing Icon: - Class: fa-brands fa-xing fa-fw + Class: fa-brands fa-xing # 026: Snapchat snapchat: @@ -204,7 +204,7 @@ snapchat: Prefix: https://www.snapchat.com/add/ Title: Snapchat Icon: - Class: fa-brands fa-snapchat fa-fw + Class: fa-brands fa-snapchat # 027: SoundCloud soundcloud: @@ -212,7 +212,7 @@ soundcloud: Prefix: https://soundcloud.com/ Title: SoundCloud Icon: - Class: fa-brands fa-soundcloud fa-fw + Class: fa-brands fa-soundcloud # 028: Spotify spotify: @@ -220,7 +220,7 @@ spotify: Prefix: https://open.spotify.com/user/ Title: Spotify Icon: - Class: fa-brands fa-spotify fa-fw + Class: fa-brands fa-spotify # 029: Bandcamp bandcamp: @@ -228,7 +228,7 @@ bandcamp: Template: https://%v.bandcamp.com/ Title: Bandcamp Icon: - Class: fa-brands fa-bandcamp fa-fw + Class: fa-brands fa-bandcamp # 030: PayPal paypal: @@ -236,7 +236,7 @@ paypal: Prefix: https://paypal.me/ Title: PayPal Icon: - Class: fa-brands fa-paypal fa-fw + Class: fa-brands fa-paypal # 031: 500px fivehundredpx: @@ -244,7 +244,7 @@ fivehundredpx: Prefix: https://500px.com/ Title: 500px Icon: - Class: fa-brands fa-500px fa-fw + Class: fa-brands fa-500px # 032: Mix mix: @@ -252,7 +252,7 @@ mix: Prefix: https://mix.com/ Title: Mix Icon: - Class: fa-brands fa-mix fa-fw + Class: fa-brands fa-mix # 033: Goodreads goodreads: @@ -260,7 +260,7 @@ goodreads: Prefix: https://www.goodreads.com/user/show/ Title: Goodreads Icon: - Class: fa-brands fa-goodreads fa-fw + Class: fa-brands fa-goodreads # 034: Last.fm lastfm: @@ -268,7 +268,7 @@ lastfm: Prefix: https://www.last.fm/user/ Title: Last.fm Icon: - Class: fa-brands fa-lastfm fa-fw + Class: fa-brands fa-lastfm # 035: Foursquare foursquare: @@ -276,7 +276,7 @@ foursquare: Prefix: https://foursquare.com/ Title: Foursquare Icon: - Class: fa-brands fa-foursquare fa-fw + Class: fa-brands fa-foursquare # 036: Hacker News hackernews: @@ -284,7 +284,7 @@ hackernews: Template: https://news.ycombinator.com/user?id=%v Title: Hacker News Icon: - Class: fa-brands fa-hacker-news fa-fw + Class: fa-brands fa-hacker-news # 037: Kickstarter kickstarter: @@ -292,7 +292,7 @@ kickstarter: Prefix: https://kickstarter.com/profile/ Title: Kickstarter Icon: - Class: fa-brands fa-kickstarter fa-fw + Class: fa-brands fa-kickstarter # 038: Patreon patreon: @@ -300,7 +300,7 @@ patreon: Prefix: https://patreon.com/ Title: Patreon Icon: - Class: fa-brands fa-patreon fa-fw + Class: fa-brands fa-patreon # 039: Steam steam: @@ -308,7 +308,7 @@ steam: Prefix: https://steamcommunity.com/id/ Title: Steam Icon: - Class: fa-brands fa-steam fa-fw + Class: fa-brands fa-steam # 040: Twitch twitch: @@ -316,7 +316,7 @@ twitch: Prefix: https://www.twitch.tv/ Title: Twitch Icon: - Class: fa-brands fa-twitch fa-fw + Class: fa-brands fa-twitch # 041: Strava strava: @@ -324,7 +324,7 @@ strava: Prefix: https://www.strava.com/athletes/ Title: Strava Icon: - Class: fa-brands fa-strava fa-fw + Class: fa-brands fa-strava # 042: Skype skype: @@ -332,7 +332,7 @@ skype: Template: 'skype:' Title: Skype Icon: - Class: fa-brands fa-skype fa-fw + Class: fa-brands fa-skype # 043: WhatsApp whatsapp: @@ -340,7 +340,7 @@ whatsapp: Prefix: https://wa.me/ Title: WhatsApp Icon: - Class: fa-brands fa-whatsapp fa-fw + Class: fa-brands fa-whatsapp # 044: 知乎 zhihu: @@ -348,7 +348,7 @@ zhihu: Prefix: https://www.zhihu.com/people/ Title: 知乎 Icon: - Class: fa-brands fa-zhihu fa-fw + Class: fa-brands fa-zhihu # 045: 豆瓣 douban: @@ -364,7 +364,7 @@ angellist: Prefix: https://angel.co/ Title: Angellist Icon: - Class: fa-brands fa-angellist fa-fw + Class: fa-brands fa-angellist # 047: SlideShare slideshare: @@ -372,7 +372,7 @@ slideshare: Prefix: https://slideshare.com/ Title: SlideShare Icon: - Class: fa-brands fa-slideshare fa-fw + Class: fa-brands fa-slideshare # 048: JSFiddle jsfiddle: @@ -380,7 +380,7 @@ jsfiddle: Prefix: https://jsfiddle.com/ Title: JSFiddle Icon: - Class: fa-brands fa-jsfiddle fa-fw + Class: fa-brands fa-jsfiddle # 049: DeviantArt deviantart: @@ -388,7 +388,7 @@ deviantart: Template: https://%v.deviantart.com/ Title: DeviantArt Icon: - Class: fa-brands fa-deviantart fa-fw + Class: fa-brands fa-deviantart # 050: Behance behance: @@ -396,7 +396,7 @@ behance: Prefix: https://behance.net/ Title: Behance Icon: - Class: fa-brands fa-behance fa-fw + Class: fa-brands fa-behance # 051: Dribbble dribbble: @@ -404,7 +404,7 @@ dribbble: Prefix: https://dribbble.com/ Title: Dribbble Icon: - Class: fa-brands fa-dribbble fa-fw + Class: fa-brands fa-dribbble # 052: WordPress wordpress: @@ -412,7 +412,7 @@ wordpress: Template: https://%v.wordpress.com/ Title: WordPress Icon: - Class: fa-brands fa-wordpress fa-fw + Class: fa-brands fa-wordpress # 053: Vine vine: @@ -420,7 +420,7 @@ vine: Prefix: https://vine.co/ Title: Vine Icon: - Class: fa-brands fa-vine fa-fw + Class: fa-brands fa-vine # 054: Google Scholar googlescholar: @@ -436,7 +436,7 @@ researchgate: Prefix: https://www.researchgate.net/profile/ Title: ResearchGate Icon: - Class: fa-brands fa-researchgate fa-fw + Class: fa-brands fa-researchgate # 056: Mastodon mastodon: @@ -444,7 +444,7 @@ mastodon: Prefix: https://mastodon.social/ Title: Mastodon Icon: - Class: fa-brands fa-mastodon fa-fw + Class: fa-brands fa-mastodon # 057: Thingiverse thingiverse: @@ -460,7 +460,7 @@ devto: Prefix: https://dev.to/ Title: Dev.To Icon: - Class: fa-brands fa-dev fa-fw + Class: fa-brands fa-dev # 059: Gitea gitea: @@ -499,7 +499,7 @@ orcid: Prefix: https://orcid.org/ Title: ORCID Icon: - Class: fa-brands fa-orcid fa-fw + Class: fa-brands fa-orcid # 064 Liberapay liberapay: @@ -570,7 +570,7 @@ discord: Prefix: https://discordapp.com/users/ Title: Discord Icon: - Class: fa-brands fa-discord fa-fw + Class: fa-brands fa-discord # 073: Discord Server Invite Link discordinvite: @@ -578,7 +578,7 @@ discordinvite: Prefix: https://discord.gg/ Title: Discord Icon: - Class: fa-brands fa-discord fa-fw + Class: fa-brands fa-discord # 074: Lichess user profile lichess: @@ -601,14 +601,14 @@ kaggle: Prefix: https://kaggle.com/ Title: Kaggle Icon: - Class: fa-brands fa-kaggle fa-fw + Class: fa-brands fa-kaggle # 077: MediaWiki mediawiki: Weight: 77 Title: MediaWiki Icon: - Class: fa-brands fa-wikipedia-w fa-fw + Class: fa-brands fa-wikipedia-w # 078: Plume plume: @@ -687,7 +687,7 @@ phone: Template: tel:%v Title: Phone Icon: - Class: fa-solid fa-phone fa-fw + Class: fa-solid fa-phone # Email email: @@ -695,7 +695,7 @@ email: Template: mailto:%v Title: Email Icon: - Class: fa-regular fa-envelope fa-fw + Class: fa-regular fa-envelope # RSS rss: @@ -704,4 +704,4 @@ rss: Title: RSS Newtab: true Icon: - Class: fa-solid fa-rss fa-fw + Class: fa-solid fa-rss diff --git a/assets/js/theme.js b/assets/js/theme.js index e7310c92..a3e7068a 100644 --- a/assets/js/theme.js +++ b/assets/js/theme.js @@ -349,7 +349,7 @@ class FixIt { switch (searchConfig.type) { case 'algolia': searchType = 'algolia'; - icon = ''; + icon = ''; href = 'https://www.algolia.com/'; break; case 'fuse': @@ -360,7 +360,7 @@ class FixIt { case 'cse': if (this.config.cse.engine === 'google') { searchType = 'Google CSE'; - icon = ''; + icon = ''; href = 'https://programmablesearchengine.google.com/'; } break; diff --git a/hugo.toml b/hugo.toml index 21cef513..9fc64f46 100644 --- a/hugo.toml +++ b/hugo.toml @@ -809,7 +809,7 @@ RSS = true # Title = "Twitter" # [params.social.twitter.icon] -# class = "fa-brands fa-x-twitter fa-fw" +# class = "fa-brands fa-x-twitter" # TypeIt config [params.typeit] diff --git a/layouts/404.html b/layouts/404.html index 091ea057..4d96cc9a 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -9,7 +9,7 @@

{{- T "pageNotFoundText" -}}  - {{- dict "Class" "fa-regular fa-hand-point-left fa-fw" | partial "plugin/icon.html" -}} + {{- dict "Class" "fa-regular fa-hand-point-left" | partial "plugin/icon.html" -}}

diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html index 0c103187..5e0cd289 100644 --- a/layouts/_partials/footer.html +++ b/layouts/_partials/footer.html @@ -29,7 +29,7 @@
{{- /* Copyright year */ -}} {{- if ne $footerConfig.copyright false -}} - {{ dict "Class" "fa-regular fa-copyright fa-fw" | partial "plugin/icon.html" }} + {{ dict "Class" "fa-regular fa-copyright" | partial "plugin/icon.html" }} {{ with $footerConfig.since -}} {{- if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year -}} @@ -59,7 +59,7 @@ {{- if $siteTime.enable | and $siteTime.value -}} {{- with $siteTime -}} - {{- $siteTimeIcon := printf (cond .Animate "%v fa-fw animate-icon" "%v fa-fw") .Icon -}} + {{- $siteTimeIcon := printf (cond .Animate "%v animate-icon" "%v") .Icon -}} {{- dict "Class" $siteTimeIcon | partial "plugin/icon.html" -}} {{- with .Pre -}}{{ . }}{{- end -}} {{- printf `%v` (T "footer.siteRunning") | safeHTML -}} @@ -72,9 +72,9 @@ {{- /* 不蒜子 */ -}} {{- $busuanzi := .Site.Params.busuanzi -}} {{- if eq $busuanzi.enable true -}} - {{- $loading := dict "Class" "fa-solid fa-spinner fa-spin fa-fw" | partial "plugin/icon.html" -}} - {{- $iconUV := dict "Class" "fa-regular fa-user fa-fw me-1" | partial "plugin/icon.html" -}} - {{- $iconPV := dict "Class" "fa-regular fa-eye fa-fw me-1" | partial "plugin/icon.html" -}} + {{- $loading := dict "Class" "fa-solid fa-spinner fa-spin" | partial "plugin/icon.html" -}} + {{- $iconUV := dict "Class" "fa-regular fa-user me-1" | partial "plugin/icon.html" -}} + {{- $iconPV := dict "Class" "fa-regular fa-eye me-1" | partial "plugin/icon.html" -}}
{{- $iconUV }}{{ $loading }} diff --git a/layouts/_partials/function/code-copy-btn.html b/layouts/_partials/function/code-copy-btn.html index 84f47d6b..ad98354c 100644 --- a/layouts/_partials/function/code-copy-btn.html +++ b/layouts/_partials/function/code-copy-btn.html @@ -3,7 +3,7 @@ {{- $wrapper := .Wrapper -}} {{- if $config.copyable -}} - {{- $copyIcon := dict "Class" "fa-regular fa-clone" | partial "plugin/icon.html" -}} + {{- $copyIcon := dict "Class" "fa-regular fa-clone fa-width-auto" | partial "plugin/icon.html" -}} {{- $copyBtn := printf `
%s
` (T "assets.copyToClipboard") (T "assets.copyToClipboard") $copyIcon -}} {{- $wrapper = replaceRE `(
[\s\S]*?<\/div>)` (printf `$1%s` $copyBtn) $wrapper -}} {{- end -}} diff --git a/layouts/_partials/function/code-header.html b/layouts/_partials/function/code-header.html index f0453a84..3f00f603 100644 --- a/layouts/_partials/function/code-header.html +++ b/layouts/_partials/function/code-header.html @@ -7,27 +7,27 @@ {{- $lineWrapBtn := "" -}} {{- $editBtn := "" -}} {{- $copyBtn := "" -}} -{{- $foldIcon := dict "Class" "arrow fa-solid fa-chevron-down fa-fw" | partial "plugin/icon.html" -}} +{{- $foldIcon := dict "Class" "arrow fa-solid fa-chevron-down" | partial "plugin/icon.html" -}} {{- $titleEl := printf `%s` $foldIcon -}} -{{- $ellipsisBtn := printf `%s` (dict "Class" "fa-solid fa-ellipsis-h fa-fw" | partial "plugin/icon.html") -}} +{{- $ellipsisBtn := printf `%s` (dict "Class" "fa-solid fa-ellipsis-h" | partial "plugin/icon.html") -}} {{- if $config.title -}} {{- $titleEl = printf `%s%s` $foldIcon $config.title -}} {{- end -}} {{- if $config.linenostoggler -}} - {{- $lineNosIcon := dict "Class" "fa-solid fa-list-ol fa-fw" | partial "plugin/icon.html" -}} + {{- $lineNosIcon := dict "Class" "fa-solid fa-list-ol" | partial "plugin/icon.html" -}} {{- $lineNosBtn = printf `%s` (T "assets.toggleLineNumbers") (T "assets.toggleLineNumbers") $lineNosIcon -}} {{- end -}} {{- if $config.linewraptoggler -}} - {{- $lineWrapIcon := dict "Class" "fa-solid fa-right-left fa-fw" | partial "plugin/icon.html" -}} + {{- $lineWrapIcon := dict "Class" "fa-solid fa-right-left" | partial "plugin/icon.html" -}} {{- $lineWrapBtn = printf `%s` (T "assets.toggleLineWrap") (T "assets.toggleLineWrap") $lineWrapIcon -}} {{- end -}} {{- if $config.editable -}} - {{- $editIcon := dict "Class" "fa-solid fa-pen-to-square fa-fw" | partial "plugin/icon.html" -}} + {{- $editIcon := dict "Class" "fa-solid fa-pen-to-square" | partial "plugin/icon.html" -}} {{- $editBtn = printf `%s` (T "assets.toggleCodeEditable") (T "assets.toggleCodeEditable") $editIcon -}} {{- end -}} {{- if $config.copyable -}} - {{- $copyIcon := dict "Class" "fa-regular fa-clone fa-fw" | partial "plugin/icon.html" -}} + {{- $copyIcon := dict "Class" "fa-regular fa-clone" | partial "plugin/icon.html" -}} {{- $copyBtn = printf `%s` (T "assets.copyToClipboard") (T "assets.copyToClipboard") $copyIcon -}} {{- end -}} {{- with $config.name -}} diff --git a/layouts/_partials/function/task-lists.html b/layouts/_partials/function/task-lists.html index 00aab260..62b99659 100644 --- a/layouts/_partials/function/task-lists.html +++ b/layouts/_partials/function/task-lists.html @@ -26,11 +26,11 @@ - [ ] Unchecked - [x] Checked */ -}} -{{- $icon := dict "Class" (add "checkbox-icon fa-fw " (index $iconMap " ")) | partial "plugin/icon.html" -}} +{{- $icon := dict "Class" (add "checkbox-icon " (index $iconMap " ")) | partial "plugin/icon.html" -}} {{- $label := T (printf "taskList.%v" " ") -}} {{- $content := replaceRE `
  • (\n

    )* (.+?)(

    \n)*
    • ` (printf `
  • $1%s$2$3
    • ` $label $icon) . -}} {{- $label := T (printf "taskList.%v" "x") -}} -{{- $icon := dict "Class" (add "checkbox-icon fa-fw " (index $iconMap "x")) | partial "plugin/icon.html" -}} +{{- $icon := dict "Class" (add "checkbox-icon " (index $iconMap "x")) | partial "plugin/icon.html" -}} {{- $content = replaceRE `
  • (\n

    )* (.+?)(

    \n)*
    • ` (printf `
  • $1%s$2$3
    • ` $label $icon) $content -}} {{- /* @@ -45,7 +45,7 @@ */ -}} {{- range $extendedSigns -}} {{- $class := index $iconMap . | default "fa-solid fa-check-square" -}} - {{- $icon := dict "Class" (add "checkbox-icon fa-fw " $class) | partial "plugin/icon.html" -}} + {{- $icon := dict "Class" (add "checkbox-icon " $class) | partial "plugin/icon.html" -}} {{- $sign := htmlEscape . -}} {{- $originSign := replace . "\\" "" -}} {{- $label := (T (printf "taskList.%v" $originSign)) | default (T (printf "taskList.%v" " ")) -}} diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html index ab0861d4..076246a1 100644 --- a/layouts/_partials/header.html +++ b/layouts/_partials/header.html @@ -53,7 +53,7 @@ {{- if (urls.Parse $url).Host }} rel="noopener noreferrer" target="_blank"{{ end -}} > {{- with .Pre -}}{{- . | safeHTML }} {{ end }} - {{- with .Params.Icon -}}{{ dict "Class" (printf "%v fa-fw fa-sm" .) | partial "plugin/icon.html" }} {{ end }} + {{- with .Params.Icon -}}{{ dict "Class" (printf "%v fa-sm" .) | partial "plugin/icon.html" }} {{ end }} {{- .Name }} {{- with .Post }} {{ . | safeHTML -}}{{- end -}} @@ -79,7 +79,7 @@ {{- if (urls.Parse $url).Host }} rel="noopener noreferrer" target="_blank"{{ end -}} > {{- with $v.Pre -}}{{- . | safeHTML }} {{ end }} - {{- with $v.Params.Icon -}}{{ dict "Class" (printf "%v fa-fw fa-sm" .) | partial "plugin/icon.html" }} {{ end }} + {{- with $v.Params.Icon -}}{{ dict "Class" (printf "%v fa-sm" .) | partial "plugin/icon.html" }} {{ end }} {{- $v.Name }} {{- with $v.Post }} {{ . | safeHTML -}}{{- end -}} @@ -98,23 +98,23 @@ {{- end -}}
  • - {{- dict "Class" "fa-solid fa-adjust fa-fw" | partial "plugin/icon.html" -}} + {{- dict "Class" "fa-solid fa-adjust" | partial "plugin/icon.html" -}}
    • {{- if hugo.IsMultilingual -}}
  • - {{- dict "Class" "fa-solid fa-language fa-fw" | partial "plugin/icon.html" -}} + {{- dict "Class" "fa-solid fa-language" | partial "plugin/icon.html" -}}
      {{- if (eq .Kind "404") -}} @@ -188,7 +188,7 @@ {{- end -}}
    • - {{- dict "Class" "fa-solid fa-adjust fa-fw" | partial "plugin/icon.html" -}} + {{- dict "Class" "fa-solid fa-adjust" | partial "plugin/icon.html" -}}