From 7c87d55d266392e448c1950ff4ac79bb8617b049 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Sun, 27 Sep 2020 01:50:22 +0800
Subject: [PATCH] New element .post-content

---
 layout/_macro/post.njk                  | 22 ++++++++++++----------
 layout/_third-party/comments/valine.njk |  8 ++++----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk
index 12a2fdb..891be3e 100644
--- a/layout/_macro/post.njk
+++ b/layout/_macro/post.njk
@@ -1,7 +1,11 @@
-  {##################}
-  {### POST BLOCK ###}
-  {##################}
-  <article itemscope itemtype="http://schema.org/Article" class="post-block" lang="{{ post.lang or config.language }}">
+{##################}
+{### POST BLOCK ###}
+{##################}
+<div class="post-block">
+  {# Gallery support #}
+  {{ post_gallery(post.photos) }}
+
+  <article itemscope itemtype="http://schema.org/Article" class="post-content" lang="{{ post.lang or config.language }}">
     <link itemprop="mainEntityOfPage" href="{{ post.permalink }}">
 
     <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
@@ -14,9 +18,6 @@
       <meta itemprop="name" content="{{ title }}">
     </span>
 
-    {# Gallery support #}
-    {{ post_gallery(post.photos) }}
-
     {%- if post.header !== false %}
       <header class="post-header">
         <{%- if is_index %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">
@@ -149,6 +150,7 @@
       {%- endif %}
     </footer>
   </article>
-  {######################}
-  {### END POST BLOCK ###}
-  {######################}
+</div>
+{######################}
+{### END POST BLOCK ###}
+{######################}
diff --git a/layout/_third-party/comments/valine.njk b/layout/_third-party/comments/valine.njk
index 5474a7c..3e58901 100644
--- a/layout/_third-party/comments/valine.njk
+++ b/layout/_third-party/comments/valine.njk
@@ -1,12 +1,12 @@
+{%- set serverURLs = theme.valine.serverURLs or 'https://' + theme.valine.appId.slice(0, 8) | lower + '.api.lncldglobal.com' %}
 <script>
 NexT.utils.loadComments('#valine-comments', () => {
   NexT.utils.getScript('{{ theme.vendors.valine }}', () => {
-    new Valine(Object.assign({
+    new Valine(Object.assign({{ theme.valine | safedump }}, {
       el: '#valine-comments',
       path: {{ url_for(page.path) | replace(r/index\.html$/, '') | safedump }},
-      serverURLs: 'https://{{ theme.valine.appId.slice(0, 8) | lower }}.api.lncldglobal.com'
-    }, {{ theme.valine | safedump }}
-    ));
+      serverURLs: {{ serverURLs | safedump }}
+    }));
   }, window.Valine);
 });
 </script>