fix(music): fix music shortcode

pogor-dev · Feb 3, 2020 · 097473e · 097473e
1 parent d8854c7
commit 097473e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 26 deletions.
diff --git a/assets/css/_core/_media.scss b/assets/css/_core/_media.scss
@@ -70,6 +70,17 @@
     }
   }
 
+  .copyright {
+    .copyright-line {
+      .icp-splitter {
+        display: none;
+      }
+      .icp-br {
+        display: block;
+      }
+    }
+  }
+
   .dynamic-to-top {
     display: none !important;
   }

diff --git a/assets/css/_partial/_footer.scss b/assets/css/_partial/_footer.scss
@@ -4,6 +4,10 @@
 
   .copyright-line {
     width: 100%;
+
+    .icp-br {
+      display: none;
+    }
   }
 }
 

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
@@ -21,15 +21,16 @@
                 <span class="author" itemprop="copyrightHolder">&nbsp;<a href="{{ $.Site.Author.link | default $.Site.BaseURL }}" target="_blank">{{ . }}</a></span>
             {{- end -}}
 
-            {{- /* ICP */ -}}
-            {{- with .Site.Params.icp -}}
-                &nbsp;|&nbsp;<span class="icp">{{ . | safeHTML }}</span>
-            {{- end -}}
-
             {{- /* License */ -}}
             {{- with .Site.Params.license -}}
                 &nbsp;|&nbsp;<span class="license">{{ . | safeHTML }}</span>
             {{- end -}}
+
+            {{- /* ICP */ -}}
+            {{- with .Site.Params.icp -}}
+                <span class="icp-splitter">&nbsp;|&nbsp;</span><br class="icp-br"/>
+                <span class="icp">{{ . | safeHTML }}</span>
+            {{- end -}}
         </div>
     </div>
 </footer>
diff --git a/layouts/shortcodes/music.html b/layouts/shortcodes/music.html
@@ -1,22 +1,12 @@
 {{- .Page.Scratch.Set "music" "true" -}}
 {{- if .IsNamedParams -}}
-    <meting-js server={{ .Get "server" }} type={{ .Get "type" }} id={{ .Get "id" }}
-    {{- with .Get "autoplay" -}}
-        autoplay={{ . }}
-    {{- end -}}
-    {{- with .Get "mini" -}}
-        mini={{ . }}
-    {{- end -}}
-    {{- with .Get "fixed" -}}
-        fixed={{ . }}
-    {{- end -}}
-    {{- with .Get "list-folded" -}}
-        list-folded={{ . }}
-    {{- end -}}
-    {{- with .Get "list-max-height" -}}
-        list-max-height={{ . }}
-    {{- end -}}
-    theme="#A9A9B3"></meting-js>
+    <meting-js server="{{ .Get "server" }}" type="{{ .Get "type" }}" id="{{ .Get "id" }}" theme="#A9A9B3"
+    {{- with .Get "autoplay" }} autoplay="{{ . }}"{{ end -}}
+    {{- with .Get "mini" }} mini="{{ . }}"{{ end -}}
+    {{- with .Get "fixed" }} fixed="{{ . }}"{{ end -}}
+    {{- with .Get "list-folded" }} list-folded="{{ . }}"{{ end -}}
+    {{- with .Get "list-max-height" }} list-max-height="{{ . }}"{{ end -}}
+    ></meting-js>
 {{- else -}}
-    <meting-js server={{ .Get 0 }} type={{ .Get 1 }} id={{ .Get 2 }} theme="#A9A9B3"></meting-js>></meting-js>
-{{- end }}
+    <meting-js server="{{ .Get 0 }}" type="{{ .Get 1 }}" id="{{ .Get 2 }}" theme="#A9A9B3"></meting-js>
+{{- end -}}
diff --git a/resources/_gen/assets/scss/css/custom-style.scss_a707772b4d98a91469dad78dcf3d2e9a.content b/resources/_gen/assets/scss/css/custom-style.scss_a707772b4d98a91469dad78dcf3d2e9a.content
diff --git a/resources/_gen/assets/scss/css/style.scss_d75fd08668b4bae707167bbce4d8ca46.content b/resources/_gen/assets/scss/css/style.scss_d75fd08668b4bae707167bbce4d8ca46.content