diff --git a/assets/data/social.yml b/assets/data/social.yml index ff60a010..6c35dace 100644 --- a/assets/data/social.yml +++ b/assets/data/social.yml @@ -562,7 +562,7 @@ csdn: Prefix: https://blog.csdn.net/ Title: CSDN Icon: - Src: svg/icons/csdn.svg + Src: images/icons/csdn.svg # 072: Discord User Profile discord: @@ -615,7 +615,7 @@ plume: Weight: 78 Title: Plume Icon: - Src: svg/icons/plume.svg + Src: images/icons/plume.svg # 079: Hack The Box hackthebox: @@ -631,7 +631,7 @@ rootme: Title: Root-Me Prefix: https://www.root-me.org/ Icon: - Src: svg/icons/rootme.svg + Src: images/icons/rootme.svg # 081: Feishu feishu: diff --git a/assets/svg/fixit.svg b/assets/images/fixit.svg similarity index 100% rename from assets/svg/fixit.svg rename to assets/images/fixit.svg diff --git a/assets/svg/hugo.svg b/assets/images/hugo.svg similarity index 100% rename from assets/svg/hugo.svg rename to assets/images/hugo.svg diff --git a/assets/svg/icons/csdn.svg b/assets/images/icons/csdn.svg similarity index 100% rename from assets/svg/icons/csdn.svg rename to assets/images/icons/csdn.svg diff --git a/assets/svg/icons/plume.svg b/assets/images/icons/plume.svg similarity index 100% rename from assets/svg/icons/plume.svg rename to assets/images/icons/plume.svg diff --git a/assets/svg/icons/rootme.svg b/assets/images/icons/rootme.svg similarity index 100% rename from assets/svg/icons/rootme.svg rename to assets/images/icons/rootme.svg diff --git a/assets/svg/loading.svg b/assets/images/loading.svg similarity index 100% rename from assets/svg/loading.svg rename to assets/images/loading.svg diff --git a/assets/svg/version.template.svg b/assets/images/version.template.svg similarity index 100% rename from assets/svg/version.template.svg rename to assets/images/version.template.svg diff --git a/assets/js/service-worker.js b/assets/js/service-worker.js index c0bebe6f..5cd08417 100644 --- a/assets/js/service-worker.js +++ b/assets/js/service-worker.js @@ -8,14 +8,12 @@ const BASE_CACHE_FILES = [ '/css/style.min.css', '/js/theme.min.js', '/site.webmanifest', - '/fixit.min.svg' ]; const OFFLINE_CACHE_FILES = [ '/css/style.min.css', '/js/theme.min.js', '/site.webmanifest', - '/fixit.min.svg', '/offline/' ]; @@ -23,7 +21,6 @@ const NOT_FOUND_CACHE_FILES = [ '/css/style.min.css', '/js/theme.min.js', '/site.webmanifest', - '/fixit.min.svg', '/404.html' ]; diff --git a/docs b/docs index af9cedea..ec2bbf0e 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit af9cedead5f7fe9c0fac1173221283e236790ee9 +Subproject commit ec2bbf0e755d0d23dd0bde97286bc455f83d8a5a diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 0588381a..dbf2f13f 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -12,11 +12,11 @@ {{- $hugo := printf `{hugoLogo}Hugo` hugo.Version -}} {{- $theme := printf `{themeLogo}FixIt` (.Scratch.Get "version") -}} {{- if $footerConfig.powered.hugoLogo -}} - {{- $hugoLogo := printf `Hugo logo ` (resources.Get "svg/hugo.svg" | minify).RelPermalink -}} + {{- $hugoLogo := printf `Hugo logo ` (resources.Get "images/hugo.svg" | minify).RelPermalink -}} {{- $hugo = replace $hugo "{hugoLogo}" $hugoLogo -}} {{- end -}} {{- if $footerConfig.powered.themeLogo -}} - {{- $themeLogo := printf `FixIt logo ` (resources.Get "svg/fixit.svg" | minify).RelPermalink -}} + {{- $themeLogo := printf `FixIt logo ` (resources.Get "images/fixit.svg" | minify).RelPermalink -}} {{- $theme = replace $theme "{themeLogo}" $themeLogo -}} {{- end -}} {{- $hugo = replace $hugo "{hugoLogo}" "" -}} diff --git a/layouts/partials/plugin/image.html b/layouts/partials/plugin/image.html index f904a464..dcbb568b 100644 --- a/layouts/partials/plugin/image.html +++ b/layouts/partials/plugin/image.html @@ -79,7 +79,7 @@ {{- $commonScript := "this.title=this.dataset.title;for(const i of ['style', 'data-title','onerror','onload']){this.removeAttribute(i);}" -}} {{- $onload = printf " onload=\"%vthis.dataset.lazyloaded='';\"" $commonScript | safeHTMLAttr -}} {{- $onerror = printf " onerror=\"%v\"" $commonScript | safeHTMLAttr -}} - {{- $style = printf " style=\"%vbackground: url(%v) no-repeat center;\"" $style (resources.Get "svg/loading.svg" | minify).RelPermalink | safeHTMLAttr -}} + {{- $style = printf " style=\"%vbackground: url(%v) no-repeat center;\"" $style (resources.Get "images/loading.svg" | minify).RelPermalink | safeHTMLAttr -}} {{- end -}} {{- /* structure of lightgallery or img */ -}} diff --git a/layouts/partials/plugin/link.html b/layouts/partials/plugin/link.html index bd286d65..e853a72f 100644 --- a/layouts/partials/plugin/link.html +++ b/layouts/partials/plugin/link.html @@ -40,7 +40,7 @@ {{- dict "Class" "fa-solid fa-download fa-fw ms-1 text-secondary" | partial "plugin/icon.html" -}} {{- end -}} {{- else -}} - + diff --git a/layouts/partials/single/fixit-decryptor.html b/layouts/partials/single/fixit-decryptor.html index ec67f944..422288ab 100644 --- a/layouts/partials/single/fixit-decryptor.html +++ b/layouts/partials/single/fixit-decryptor.html @@ -1,5 +1,5 @@ {{- $msg := (.Scratch.Get "params").message | default (T "single.encryptedMessage") -}} -{{- $loading := resources.Get "svg/loading.svg" | minify -}} +{{- $loading := resources.Get "images/loading.svg" | minify -}}
decryptor loading diff --git a/layouts/shortcodes/version.html b/layouts/shortcodes/version.html index 890344a9..be999006 100644 --- a/layouts/shortcodes/version.html +++ b/layouts/shortcodes/version.html @@ -3,9 +3,9 @@ {{- $type := .Get 1 | default "new" | lower -}} {{- $label := T (printf "version.%v" $type) -}} {{- $color := cond (eq $type "changed") "ff9101" "00b1ff" | cond (eq $type "deleted") "ff5252" -}} -{{- $pathTemplate := cond .Site.IsMultiLingual (printf "svg/version/%%v-%%v.%v.svg" .Page.Language.Lang) "svg/version/%v-%v.svg" -}} +{{- $pathTemplate := cond .Site.IsMultiLingual (printf "images/version/%%v-%%v.%v.svg" .Page.Language.Lang) "images/version/%v-%v.svg" -}} {{- $path := printf $pathTemplate $version $type -}} -{{- $resource := resources.Get "svg/version.template.svg" -}} +{{- $resource := resources.Get "images/version.template.svg" -}} {{- $resource = $resource | resources.ExecuteAsTemplate $path (dict "version" $version "label" $label "color" $color "isCJK" .Page.Params.IsCJKLanguage) | minify -}} {{- $alt := printf "FixIt %v | %v" $version $label -}}