fix(shortcode): style shortcode scss file path (#327)

pogor-dev · May 6, 2020 · f4c9fe7 · f4c9fe7
1 parent 9bb56fd
commit f4c9fe7
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 4 deletions.
diff --git 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
@@ -4,7 +4,8 @@
 {{- printf `<%s id="%s">%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/..._ff2a8d7d59c25f259218399bceecc7ea.content → ..._3bfbc84092731480b8d374981b54d253.content b/..._ff2a8d7d59c25f259218399bceecc7ea.content → ..._3bfbc84092731480b8d374981b54d253.content
diff --git a/...ss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json b/...ss/style/06219b515bd3039bce88e4417e803b29/id-1.scss_3bfbc84092731480b8d374981b54d253.json
@@ -0,0 +1 @@
+{"Target":"style/06219b515bd3039bce88e4417e803b29/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content b/...style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.content
@@ -0,0 +1,2 @@
+#id-1 img {
+  height: 1.25rem; }
diff --git a/...ss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json b/...ss/style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.scss_e5494f82a408608c874431b5dcdb4f1e.json
@@ -0,0 +1 @@
+{"Target":"style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content b/...style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.content
@@ -0,0 +1,2 @@
+#id-1 {
+  text-align: right; }
diff --git a/...ss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json b/...ss/style/2f6a44c07cd36aed63db163b9f515d63/id-1.scss_4bcd2a22db7c9ce77fc96c1aa4d683bd.json
@@ -0,0 +1 @@
+{"Target":"style/2f6a44c07cd36aed63db163b9f515d63/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content b/...style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.content
@@ -0,0 +1,2 @@
+#id-1 {
+  text-align: right; }
diff --git a/...ss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json b/...ss/style/387e497be0b7dbdc903468dec88ce042/id-1.scss_66d6eb926874a089016353786f28e165.json
@@ -0,0 +1 @@
+{"Target":"style/387e497be0b7dbdc903468dec88ce042/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content b/...style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.content
@@ -0,0 +1,4 @@
+#id-1 {
+  text-align: right; }
+  #id-1 strong {
+    color: #00b1ff; }
diff --git a/...ss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json b/...ss/style/409594da26069e6252388311312abfd5/id-1.scss_78b750e0fe281aa9b91566ae181c2e40.json
@@ -0,0 +1 @@
+{"Target":"style/409594da26069e6252388311312abfd5/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content b/...style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.content
@@ -0,0 +1,4 @@
+#id-1 {
+  text-align: right; }
+  #id-1 strong {
+    color: #00b1ff; }
diff --git a/...ss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json b/...ss/style/7857d7858fcfb859deeb60f29672cffc/id-1.scss_0d902f60eb581fec9411dd1846631db7.json
@@ -0,0 +1 @@
+{"Target":"style/7857d7858fcfb859deeb60f29672cffc/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content b/...style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.content
@@ -0,0 +1,2 @@
+#id-1 {
+  text-align: right; }
diff --git a/...ss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json b/...ss/style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.scss_a7b5c907db9ad46c812c6b1bf9d871a7.json
@@ -0,0 +1 @@
+{"Target":"style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content b/...style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.content
@@ -0,0 +1,2 @@
+#id-1 img {
+  height: 1.25rem; }
diff --git a/...ss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json b/...ss/style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.scss_da37cb970ff275a236f7c8e80f90244b.json
@@ -0,0 +1 @@
+{"Target":"style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/...style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content b/...style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.content
@@ -0,0 +1,4 @@
+#id-1 {
+  text-align: right; }
+  #id-1 strong {
+    color: #00b1ff; }
diff --git a/...ss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json b/...ss/style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.scss_8bcb276b6f7024fb75f6398ae3519592.json
@@ -0,0 +1 @@
+{"Target":"style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.css","MediaType":"text/css","Data":{}}
diff --git a/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json b/resources/_gen/assets/scss/stype/id-1.scss_ff2a8d7d59c25f259218399bceecc7ea.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/06219b515bd3039bce88e4417e803b29/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/2d4250d7b4edf7b7647e94cfdc183b86/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/2f6a44c07cd36aed63db163b9f515d63/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/387e497be0b7dbdc903468dec88ce042/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/409594da26069e6252388311312abfd5/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/7857d7858fcfb859deeb60f29672cffc/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/c17d91e847fcfcd8e30a3c3f56b6af46/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/f34bb62f734d1cecaa4de6a8b8efab52/id-1.css","MediaType":"text/css","Data":{}}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Target":"style/fb3ada7a67e15e6dfbcd8e86e0e7fb61/id-1.css","MediaType":"text/css","Data":{}}