From f4c9fe750de9ad242d68906b728efa0fb4b2c407 Mon Sep 17 00:00:00 2001 From: Dillon Date: Wed, 6 May 2020 21:31:37 +0800 Subject: [PATCH] fix(shortcode): style shortcode scss file path (#327) --- layouts/_default/baseof.html | 2 +- layouts/shortcodes/style.html | 5 +++-- .../id-1.scss_3bfbc84092731480b8d374981b54d253.content} | 0 .../id-1.scss_3bfbc84092731480b8d374981b54d253.json | 1 + .../id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content | 2 ++ .../id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json | 1 + .../id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content | 2 ++ .../id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json | 1 + .../id-1.scss_66d6eb926874a089016353786f28e165.content | 2 ++ .../id-1.scss_66d6eb926874a089016353786f28e165.json | 1 + .../id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content | 4 ++++ .../id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json | 1 + .../id-1.scss_0d902f60eb581fec9411dd1846631db7.content | 4 ++++ .../id-1.scss_0d902f60eb581fec9411dd1846631db7.json | 1 + .../id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content | 2 ++ .../id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json | 1 + .../id-1.scss_da37cb970ff275a236f7c8e80f90244b.content | 2 ++ .../id-1.scss_da37cb970ff275a236f7c8e80f90244b.json | 1 + .../id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content | 4 ++++ .../id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json | 1 + .../stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json | 1 - 21 files changed, 35 insertions(+), 4 deletions(-) rename resources/_gen/assets/scss/{stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.content => style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.content} (100%) create mode 100644 resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json create mode 100644 resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content create mode 100644 resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json create mode 100644 resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content create mode 100644 resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json create mode 100644 resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content create mode 100644 resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json create mode 100644 resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content create mode 100644 resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json create mode 100644 resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content create mode 100644 resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json create mode 100644 resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content create mode 100644 resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json create mode 100644 resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content create mode 100644 resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json create mode 100644 resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content create mode 100644 resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json delete mode 100644 resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b08da4a4..a196159c 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -10,7 +10,7 @@ {{- end -}} {{- $params := .Params | merge .Site.Params.page -}} -{{- .Scratch.Set "version" "0.2.5" -}} +{{- .Scratch.Set "version" "0.2.6" -}} {{- if eq hugo.Environment "production" -}} {{- .Scratch.Set "cdn" .Site.Params.cdn -}} diff --git a/layouts/shortcodes/style.html b/layouts/shortcodes/style.html index 3e1e999e..4ac5f60e 100644 --- a/layouts/shortcodes/style.html +++ b/layouts/shortcodes/style.html @@ -4,7 +4,8 @@ {{- printf `<%s id="%s">%s` $tag $id $content $tag | safeHTML -}} {{- $style := .Get 0 | printf "#%s{%s}" $id -}} -{{- $res := resources.FromString (printf "stype/%s.scss" $id) $style -}} -{{- $res = $res | toCSS (dict "targetPath" (printf "stype/%s.css" $id)) -}} +{{- $path := printf "style/%s/%s" (md5 .Page.RelPermalink) $id -}} +{{- $res := resources.FromString (printf "%s.scss" $path) $style -}} +{{- $res = $res | toCSS (dict "targetPath" (printf "%s.css" $path)) -}} {{- $styleArr := (.Page.Scratch.Get "this").styleArr | default slice -}} {{- $styleArr | append $res.Content | .Page.Scratch.SetInMap "this" "styleArr" -}} diff --git a/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.content b/resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.content similarity index 100% rename from resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.content rename to resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.content diff --git a/resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json b/resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json new file mode 100644 index 00000000..a1d0304c --- /dev/null +++ b/resources/_gen/assets/scss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json @@ -0,0 +1 @@ +{"Target":"style/06219b515bd3039bce88e4417e803b29/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content b/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content new file mode 100644 index 00000000..4705b8a7 --- /dev/null +++ b/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content @@ -0,0 +1,2 @@ +#id-1 img { + height: 1.25rem; } diff --git a/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json b/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json new file mode 100644 index 00000000..349e4878 --- /dev/null +++ b/resources/_gen/assets/scss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json @@ -0,0 +1 @@ +{"Target":"style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content b/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content new file mode 100644 index 00000000..eeea1945 --- /dev/null +++ b/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content @@ -0,0 +1,2 @@ +#id-1 { + text-align: right; } diff --git a/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json b/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json new file mode 100644 index 00000000..4f999833 --- /dev/null +++ b/resources/_gen/assets/scss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json @@ -0,0 +1 @@ +{"Target":"style/2f6a44c07cd36aed63db163b9f515d63/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content b/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content new file mode 100644 index 00000000..eeea1945 --- /dev/null +++ b/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content @@ -0,0 +1,2 @@ +#id-1 { + text-align: right; } diff --git a/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json b/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json new file mode 100644 index 00000000..b6df739a --- /dev/null +++ b/resources/_gen/assets/scss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json @@ -0,0 +1 @@ +{"Target":"style/387e497be0b7dbdc903468dec88ce042/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content b/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content new file mode 100644 index 00000000..b50337c9 --- /dev/null +++ b/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content @@ -0,0 +1,4 @@ +#id-1 { + text-align: right; } + #id-1 strong { + color: #00b1ff; } diff --git a/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json b/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json new file mode 100644 index 00000000..aaf81b1f --- /dev/null +++ b/resources/_gen/assets/scss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json @@ -0,0 +1 @@ +{"Target":"style/409594da26069e6252388311312abfd5/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content b/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content new file mode 100644 index 00000000..b50337c9 --- /dev/null +++ b/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content @@ -0,0 +1,4 @@ +#id-1 { + text-align: right; } + #id-1 strong { + color: #00b1ff; } diff --git a/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json b/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json new file mode 100644 index 00000000..c8a10634 --- /dev/null +++ b/resources/_gen/assets/scss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json @@ -0,0 +1 @@ +{"Target":"style/7857d7858fcfb859deeb60f29672cffc/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content b/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content new file mode 100644 index 00000000..eeea1945 --- /dev/null +++ b/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content @@ -0,0 +1,2 @@ +#id-1 { + text-align: right; } diff --git a/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json b/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json new file mode 100644 index 00000000..43fa7765 --- /dev/null +++ b/resources/_gen/assets/scss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json @@ -0,0 +1 @@ +{"Target":"style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content b/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content new file mode 100644 index 00000000..4705b8a7 --- /dev/null +++ b/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content @@ -0,0 +1,2 @@ +#id-1 img { + height: 1.25rem; } diff --git a/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json b/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json new file mode 100644 index 00000000..7fc699b3 --- /dev/null +++ b/resources/_gen/assets/scss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json @@ -0,0 +1 @@ +{"Target":"style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content b/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content new file mode 100644 index 00000000..b50337c9 --- /dev/null +++ b/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content @@ -0,0 +1,4 @@ +#id-1 { + text-align: right; } + #id-1 strong { + color: #00b1ff; } diff --git a/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json b/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json new file mode 100644 index 00000000..6dba0aaa --- /dev/null +++ b/resources/_gen/assets/scss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json @@ -0,0 +1 @@ +{"Target":"style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file diff --git a/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json b/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json deleted file mode 100644 index 57e277fb..00000000 --- a/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json +++ /dev/null @@ -1 +0,0 @@ -{"Target":"stype/id-1.css","MediaType":"text/css","Data":{}} \ No newline at end of file