Merge pull request #56 from zhaospei/master

fix pre-expand-blog

resources/blog.scss

@@ -228,6 +228,7 @@
 }
 
 .show-more {
+    display: flex;
     color: black;
     font-style: italic;
     font-size: 16px;
@@ -237,7 +238,6 @@
     position: absolute;
     inset: 50% 0px 0px;
     background: linear-gradient(transparent, white);
-    display: flex;
     -webkit-box-pack: end;
     justify-content: flex-end;
     align-items: flex-end;

templates/comments/feed.html

@@ -5,15 +5,15 @@
     </a>
   </h3>
   {% with author=comment.author %}
-    {% if author %}
-      <div class="problem-feed-info-entry">
-        <i class="fa fa-pencil-square-o fa-fw"></i>
-        <span class="pi-value">{{ link_user(author) }}</span>
-      </div>
-    {% endif %}
+  {% if author %}
+  <div class="problem-feed-info-entry">
+    <i class="fa fa-pencil-square-o fa-fw"></i>
+    <span class="pi-value">{{ link_user(author) }}</span>
+  </div>
+  {% endif %}
   {% endwith %}
   <div class='blog-description content-description'>
     {{ comment.body|markdown(lazy_load=True)|reference|str|safe }}
-    <div class="show-more"></div>
+    <div class="show-more"> {{_("...More")}} </div>
   </div>
 </div>

templates/three-column-content.html

@@ -42,10 +42,18 @@
         $blogbox.removeClass('pre-expand-blog');
         $(this).hide();
       }
-    })
+    });
+
     $('.blog-box').each(function () {
-      if ($(this).prop('scrollHeight') > $(this).height()) {
+      var $precontent = $(this).children('.blog-description').height();
+      var $content = $(this).children().children('.content-description').height();
+      if ($content == undefined) {
+        $content = $(this).children().children('.md-typeset').height()
+      }
+      if ($content > $precontent - 30) {
         $(this).addClass('pre-expand-blog');
+      } else {
+        $(this).children().children('.show-more').hide();
       }
     });
   }

templates/ticket/feed.html

@@ -8,12 +8,12 @@
     </a>
   </h3>
   {% with author=ticket.user %}
-    {% if author %}
-      <div class="problem-feed-info-entry">
-        <i class="fa fa-pencil-square-o fa-fw"></i>
-        <span class="pi-value">{{ link_user(author) }}</span>
-      </div>
-    {% endif %}
+  {% if author %}
+  <div class="problem-feed-info-entry">
+    <i class="fa fa-pencil-square-o fa-fw"></i>
+    <span class="pi-value">{{ link_user(author) }}</span>
+  </div>
+  {% endif %}
   {% endwith %}
   <div class="problem-feed-types">
     <i class="fa fa-tag"></i>
@@ -21,6 +21,6 @@
   </div>
   <div class='blog-description content-description'>
     {{ ticket.messages.last().body|markdown(lazy_load=True)|reference|str|safe }}
-    <div class="show-more"></div>
+    <div class="show-more"> {{_("...More")}} </div>
   </div>
 </div>