jekyll-theme-mehdix-rtl 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee420e15fc9c3c187f347f9b3a086e2451ea10e7a2bfb8b1e9dea5b7818cbc6c
-  data.tar.gz: 7718fd4781b88bf5f1ce8558f4a1e4299b1dfbd3f082e311ee84586b4b3b0302
+  metadata.gz: 0424ae25ada914b8cf1283f68906d93604f531664bf88cabf63988560dc3957f
+  data.tar.gz: 55a7036099229f1340ebeb3f4ab2a61149c82d4cd4c3933b8d2f669bee57ca8c
 SHA512:
-  metadata.gz: 6cc9ec657805668b90233e4585d73c9e5ce4b7db9767ae56f5f2eab0fbceca16c02abfa817170cf6b9c38e6c2a57fccb1e1d5c292e5e9ba4f837d33d6e297522
-  data.tar.gz: 3214fea455bb5c85ba3f45b7e6d19241dbe5d585adebbc9bc855ee6a7fbf73bb989ece194dab13a8a6dafd0afde865a32b2d9a0c9b114b9b97fdd92ab65ef0ad
+  metadata.gz: 4d3cf21363b64a3ddf40fc80a6f547137abf03421328d552abfc437db8f3666cd555e15744be00da86d48aa60c88bfd14527f06f36aba4ddf865b6bd1d871552
+  data.tar.gz: 483f4b41fd78cae3bc52169b413d62a1f9d759ae4ff34f729628d82951d718c1ee704f2bb8a165bdb30d6117f62da0024ce7196b607c89080294f06140e7cd67

data/_includes/comment.html

@@ -0,0 +1,31 @@
+{% assign config=site.comments.static %}
+
+<article id="{{ include.comment.id }}">
+  {% if config.avatar.visible %}
+  <div class="comment-image-wrapper">
+    <img class="comment-avatar" src="https://www.gravatar.com/avatar/{{include.comment.email}}?s=200&d=robohash" />
+  </div>
+  {% endif %}
+  <div class="comment-body-wrapper">
+    <span class="comment-meta">
+      <small>
+        {% if include.comment.website != '' %}
+          <a href={{include.comment.website}} target="_"><span commenter>{{ include.comment.name }}</span></a>
+        {% else %}
+          <span commenter>{{ include.comment.name }}</span>
+        {% endif %}
+      </small>
+      <small> &nbsp; <a href="#{{ include.comment.id }}">{{ include.comment.created_at | jdate: "%d %b %Y" | habify }}</a></small>
+      <span style="display:none" commentId>{{ include.comment.id }}</span>
+    </span>
+    {{ include.comment.message | replace: "<p>", '' | replace: "</p>", newLine | replace: "<br>", newLine | strip_html | markdownify }}
+    <small class="comment-meta"> &nbsp; <a href="#comment-form" onclick="replyTo('{{ include.comment.id }}')">پاسخ</a></small>
+  </div>
+</article>
+<div class="reply">
+{% for cc in include.comments %}
+  {% if cc.reply_to == include.comment.id %}
+    {% include comment.html comment=cc %}
+  {% endif %}
+{% endfor %}
+</div>

data/_includes/static_comments.html

@@ -1,64 +1,22 @@
 {% capture newLine %}
 {% endcapture %}
+{% capture key %}{{ page.id | remove_first: "/" }}{% endcapture %}
+{% assign comments = site.data.comments[key] %}
+
 <section id="static-comments">
-  {% capture key %}{{ page.id | remove_first: "/" }}{% endcapture %}
-  {% assign comments = site.data.comments[key] %}
+
   {% if comments %}
   <h4 id="comments-header">دیدگاه‌ها</h4>
   <div id="comments">
-    {% for comment in comments %}
-    <div class="comment-chain">
-      <article id="{{ comment.id }}">
-        <div class="comment-image-wrapper">
-          <img class="comment-avatar" src="https://www.gravatar.com/avatar/{{comment.email}}?s=200&d=robohash" />
-        </div>
-        <div class="comment-body-wrapper">
-          <span class="comment-meta">
-            <small>
-              {% if comment.website != '' %}
-                <a href={{comment.website}} target="_"><span commenter>{{ comment.name }}</span></a>
-              {% else %}
-                <span commenter>{{ comment.name }}</span>
-              {% endif %}
-            </small>
-            <small> &nbsp; <a href="#{{ comment.id }}">{{ comment.created_at | jdate: "%d %b %Y" | habify }}</a></small>
-            <small> &nbsp; <a href="#comment-form" onclick="replyTo('{{ comment.id }}')">پاسخ</a></small>
-            <span style="display:none" commentId>{{ comment.id }}</span>
-          </span>
-          {{ comment.message | replace: "<p>", '' | replace: "</p>", newLine | replace: "<br>", newLine | strip_html | markdownify }}
-        </div>
-      </article>
-
-        {% if comment.reply_to %}
-          {% for cmt in comments %}
-            {% if cmt.id == comment.reply_to %}
-              <article class="sub-comment">
-
-                <div class="comment-image-wrapper">
-                  <img class="comment-avatar" src="https://www.gravatar.com/avatar/{{cmt.email}}?s=200&d=robohash" />
-                </div>
-                <div class="comment-body-wrapper">
-                  <span class="comment-meta">
-                    <small>
-                      {% if cmt.website != '' %}
-                        <a href={{cmt.website}} target="_"><span commenter>{{ cmt.name }}</span></a>
-                      {% else %}
-                        {{ cmt.name }}
-                      {% endif %}
-                    </small>
-                    <small> &nbsp; <a href="#{{ cmt.id }}">{{ cmt.created_at | jdate: "%d %b %Y" | habify }}</a></small>
-                  </span>
-                  {{ cmt.message | replace: "<p>", '' | replace: "</p>", newLine | replace: "<br>", newLine | strip_html | markdownify }}
-                </div>
 
-              </article>
-              {% break %}
-            {% endif %}
-          {% endfor %}
-        {% endif %}
-
-    </div>
+    {% for comment in comments %}
+      {% if comment.reply_to == nil %}
+      <div class="comment-chain">
+        {% include comment.html comment=comment comments=comments%}
+      </div>
+      {% endif %}
     {% endfor%}
+
   </div>
   {% endif %}
 

data/_sass/_base.scss

@@ -89,13 +89,11 @@ blockquote {
     font-style: italic;
     
     letter-spacing: -1px;
-    line-height: 1.45;
     color: $grey-color;
-    margin: 0;
 
     >  p {
         border-right: 4px solid lighten($brand-color, 30%);
-        padding: $spacing-unit / 2;
+        padding-right: $spacing-unit / 2
     }
 }
 

data/_sass/_post.scss

@@ -99,20 +99,22 @@
 
 #comments article {
     display: flex;
-    margin-top: 1em;
 
     p {
         white-space: pre-wrap;
-        margin-top: 0;
+        // margin-top: 0;
     }
 
     blockquote {
         font-size: inherit;
+        margin: 0;
     }
+
 }
 
 .comment-chain {
     border-bottom: 1px solid #f2f3f3;
+    margin-bottom: 5px;
     background-color: lighten($brand-color, 55%);//lighten($grey-color-light, 20%);
 
     .sub-comment {
@@ -150,18 +152,21 @@
 
 .comment-image-wrapper {
     box-sizing: border-box;
-    max-width: 65px;
-    min-width: 65px;
+    max-width: 55px;
+    min-width: 55px;
     margin: 0.5em;
     overflow: hidden;
     img {
-        clip-path: circle();
+        // clip-path: circle();
     }
 }
 
 .comment-body-wrapper {
     flex-grow: 1;
     padding: 5px;
+    p {
+        margin: 0;
+    }
 }
 
 .comment-meta {
@@ -173,6 +178,10 @@
     }
 }
 
+.reply {
+    margin-right: $spacing-unit;
+}
+
 #comment-form {
     background: lighten($brand-color, 55%);
     color: darken($brand-color, 30%);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-mehdix-rtl
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Mehdi Sadeghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -180,6 +180,7 @@ files:
 - LICENSE
 - README.md
 - _includes/analyticstracking.html
+- _includes/comment.html
 - _includes/disqus.html
 - _includes/footer.html
 - _includes/head.html