diff options
| -rw-r--r-- | assets/scss/_fuji-style/_content.scss | 1 | ||||
| -rw-r--r-- | assets/scss/_fuji-style/_header.scss | 2 | ||||
| -rw-r--r-- | exampleSite/content/post/post-meta-test.md | 9 | ||||
| -rw-r--r-- | layouts/partials/analytic-cfga.html | 2 | ||||
| -rw-r--r-- | layouts/partials/comment-disqusjs.html | 2 | ||||
| -rw-r--r-- | layouts/partials/head.html | 8 | ||||
| -rw-r--r-- | layouts/partials/math.html | 6 | ||||
| -rw-r--r-- | layouts/partials/scripts-end.html | 18 |
8 files changed, 29 insertions, 19 deletions
diff --git a/assets/scss/_fuji-style/_content.scss b/assets/scss/_fuji-style/_content.scss index 4c06c45..1d2bb8c 100644 --- a/assets/scss/_fuji-style/_content.scss +++ b/assets/scss/_fuji-style/_content.scss @@ -26,6 +26,7 @@ span { display: flex; align-items: center; + flex-wrap: wrap; } span:not(:last-child) { diff --git a/assets/scss/_fuji-style/_header.scss b/assets/scss/_fuji-style/_header.scss index af70929..c962dbd 100644 --- a/assets/scss/_fuji-style/_header.scss +++ b/assets/scss/_fuji-style/_header.scss @@ -13,7 +13,7 @@ header { .title-sub { margin: 0 0.1rem; display: block; - white-space: nowrap; + white-space: normal; &::-webkit-scrollbar { display: none; // WebKit diff --git a/exampleSite/content/post/post-meta-test.md b/exampleSite/content/post/post-meta-test.md new file mode 100644 index 0000000..dce2227 --- /dev/null +++ b/exampleSite/content/post/post-meta-test.md @@ -0,0 +1,9 @@ ++++ +title = "Post-Meta Test with Lots of Tags" +date = "2016-12-21" +description = "Because existing posts don't have enough tags" +tags = ["tags", "css", "cascading stylesheets", "html", "hypertext markup language", "fuji theme tests", "test", "text", "excessive tags"] +showToc = false ++++ + +**The tags should wrap and not make a horizontal scroll bar appear.** Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. diff --git a/layouts/partials/analytic-cfga.html b/layouts/partials/analytic-cfga.html index fa93ede..cd934ee 100644 --- a/layouts/partials/analytic-cfga.html +++ b/layouts/partials/analytic-cfga.html @@ -3,5 +3,5 @@ window.ga_tid = '{{ .Site.Params.googleAnalyticsTid }}'; window.ga_api = '{{ .Site.Params.googleAnalyticsRoute }}'; </script> -<script async src="https://cdn.jsdelivr.net/npm/cfga@1.0.3/cfga.min.js"></script> +<script async src="https://cdn.jsdelivr.net/npm/cfga@1.0.3/cfga.min.js" integrity="sha512-lRbEZn5fxOABG6OSL9nc8jcBtSrkYGirXoMDfNoatsLtJBxLSQEdFoglfdflmdE8uTLesQlo1iLtSH08lNJxfw==" crossorigin="anonymous"></script> {{ end }} diff --git a/layouts/partials/comment-disqusjs.html b/layouts/partials/comment-disqusjs.html index 18d1d82..af5bd3d 100644 --- a/layouts/partials/comment-disqusjs.html +++ b/layouts/partials/comment-disqusjs.html @@ -3,7 +3,7 @@ <i class="iconfont icon-chatbox-ellipses-sharp"></i> {{ i18n "postComment" }} </span> <div id="disqus_thread" style="display: none;"></div> - <script src="https://cdn.jsdelivr.net/npm/disqusjs@1.3.0/dist/disqus.js"></script> + <script src="https://cdn.jsdelivr.net/npm/disqusjs@1.3.0/dist/disqus.js" integrity="sha512-j5DrA9cH4ZMlbjZYukrp7SmVHevVXxIDueolM1HqajB1sZVjC9HhpOpQLIVthQEmoRk08nq5jWWQV07hJZuWDw==" crossorigin="anonymous"></script> <script> function loadComment() { document.querySelector('#disqus_thread').removeAttribute('style'); diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 7dedc44..99e0e98 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -34,16 +34,16 @@ <!-- dep --> {{ partial "styles.html" . }} {{ $options := (dict "targetPath" "assets/css/fuji.min.css" "outputStyle" "compressed") }} -{{ $style := resources.Get "scss/fuji.scss" | resources.ToCSS $options }} -<link rel="stylesheet" href="{{ $style.Permalink }}" /> +{{ $style := resources.Get "scss/fuji.scss" | resources.ToCSS $options | resources.Fingerprint "sha512" }} +<link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}" /> {{ with .Site.Params.googleAdsense }} <script async data-ad-client="ca-pub-{{ . }}" src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script> {{ end}} {{ if .Params.aplayer }} -<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" /> +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" integrity="sha512-CIYsJUa3pr1eoXlZFroEI0mq0UIMUqNouNinjpCkSWo3Bx5NRlQ0OuC6DtEB/bDqUWnzXc1gs2X/g52l36N5iw==" crossorigin="anonymous"> {{ end }} {{ if .Site.Params.useDisqusJS }} -<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/disqusjs@1.3.0/dist/disqusjs.css" /> +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/disqusjs@1.3.0/dist/disqusjs.css" integrity="sha512-ETZaCUD/oKDyXhm065Kgi1WXukzv7EWek8RgqpI/RAniGf8eKo1XVP8tXe7AlGsiPf+m7M2wiq+C6vIGRdP40Q==" crossorigin="anonymous"> {{ end }} {{ partial "analytic-gtag.html" . }} {{ partial "analytic-cfga.html" . }} diff --git a/layouts/partials/math.html b/layouts/partials/math.html index 04d9610..3d3441e 100644 --- a/layouts/partials/math.html +++ b/layouts/partials/math.html @@ -1,6 +1,6 @@ -<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css" /> -<script src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js"></script> -<script src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/contrib/auto-render.min.js"></script> +<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.css" integrity="sha512-07YhC3P4/vS5HdgGuNAAeIxb5ee//efgRNo5AGdMtqFBUPYOdQG/sDK0Nl5qNq94kdEk/Pvu8pmN4GYUeucUkw==" crossorigin="anonymous"> +<script src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/katex.min.js" integrity="sha512-aMDiFsrEV3KzAn9EHwyBRS7y1APjZWt/Z/73ukLN2Ca2KcGGzlOQFQSnfOdnEcehpwMaQ8edlDB/0cMX2GsHbg==" crossorigin="anonymous"></script> +<script src="https://cdn.jsdelivr.net/npm/katex@0.15.3/dist/contrib/auto-render.min.js" integrity="sha512-ZA/RPrAo88DlwRnnoNVqKINnQNcWERzRK03PDaA4GIJiVZvGFIWQbdWCsUebMZfkWohnfngsDjXzU6PokO4jGw==" crossorigin="anonymous"></script> <script> renderMathInElement(document.querySelector('div.content'), { delimiters: [ diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html index c901e0d..e80099b 100644 --- a/layouts/partials/scripts-end.html +++ b/layouts/partials/scripts-end.html @@ -1,21 +1,21 @@ {{ if eq .Section "search" }} -<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script> -<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.5.3/dist/fuse.min.js"></script> +<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js" integrity="sha512-/8K8Hs4pVcqd/wI87fQEzHCeGZVYPo3vMbmf8GzT3nQec19dfHVnRwBZHvkkzjaQSO9vpilow841VfvE6b86Lw==" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.5.3/dist/fuse.min.js" integrity="sha512-W+QdO2uEYG8oKLFGKPGGwT43RQWOBzAcxSpPMRyR6zAC3DLjMPp6GxoPvasKfs1pbYYXd0ByDCOiBd7M554qbw==" crossorigin="anonymous"></script> {{ else if eq .Section "archives" }} {{ else }} -<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.6/dist/medium-zoom.min.js"></script> -<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.3.2/lazysizes.min.js"></script> -<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.27.0/components/prism-core.min.js"></script> -<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.27.0/plugins/autoloader/prism-autoloader.min.js"></script> +<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.6/dist/medium-zoom.min.js" integrity="sha512-N9IJRoc3LaP3NDoiGkcPa4gG94kapGpaA5Zq9/Dr04uf5TbLFU5q0o8AbRhLKUUlp8QFS2u7S+Yti0U7QtuZvQ==" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.3.2/lazysizes.min.js" integrity="sha512-q583ppKrCRc7N5O0n2nzUiJ+suUv7Et1JGels4bXOaMFQcamPk9HjdUknZuuFjBNs7tsMuadge5k9RzdmO+1GQ==" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.27.0/components/prism-core.min.js" integrity="sha512-LCKPTo0gtJ74zCNMbWw04ltmujpzSR4oW+fgN+Y1YclhM5ZrHCZQAJE4quEodcI/G122sRhSGU2BsSRUZ2Gu3w==" crossorigin="anonymous"></script> +<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.27.0/plugins/autoloader/prism-autoloader.min.js" integrity="sha512-GP4x8UWxWyh4BMbyJGOGneiTbkrWEF5izsVJByzVLodP8CuJH/n936+yQDMJJrOPUHLgyPbLiGw2rXmdvGdXHA==" crossorigin="anonymous"></script> {{ end }} {{ $options := (dict "targetPath" "assets/js/fuji.min.js" "minify" true "target" "es2015" "format" "iife") }} -{{ $built := resources.Get "js/fuji.js" | js.Build $options }} -<script defer src="{{ $built.RelPermalink }}"></script> +{{ $built := resources.Get "js/fuji.js" | js.Build $options | resources.Fingerprint "sha512" }} +<script defer src="{{ $built.RelPermalink }}" integrity="{{ $built.Data.Integrity }}"></script> {{ if or .Params.math .Site.Params.math }} {{ partial "math.html" . }} {{ end }} {{ with .Params.aplayer }} -<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script> +<script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js" integrity="sha512-RWosNnDNw8FxHibJqdFRySIswOUgYhFxnmYO3fp+BgCU7gfo4z0oS7mYFBvaa8qu+axY39BmQOrhW3Tp70XbaQ==" crossorigin="anonymous"></script> <script> (function () { function parseBasePath(basePath, rawURL) { |