Merge pull request #2127 from pixelfed/staging

Update PostComponent.vue, fix load more comments button

CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Updated
 - Updated PostComponent, fix remote urls ([42716ccc](https://github.com/pixelfed/pixelfed/commit/42716ccc))
 - Updated PostComponent, fix missing like button on comments ([132c1dce](https://github.com/pixelfed/pixelfed/commit/132c1dce))
+- Updated PostComponent.vue, fix load more comments button ([847599ad](https://github.com/pixelfed/pixelfed/commit/847599ad))
 
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)

resources/assets/js/components/PostComponent.vue

@@ -143,7 +143,7 @@
                       </div>
                     </div>
                     <div class="postCommentsContainer d-none">
-                      <p v-if="status.reply_count > 10" class="mb-1 text-center load-more-link d-none my-3">
+                      <p class="mb-1 text-center load-more-link d-none my-3">
                         <a href="#" class="text-dark" v-on:click="loadMore" title="Load more comments" data-toggle="tooltip" data-placement="bottom">
                           <svg class="bi bi-plus-circle" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="font-size:2em;">  <path fill-rule="evenodd" d="M8 3.5a.5.5 0 01.5.5v4a.5.5 0 01-.5.5H4a.5.5 0 010-1h3.5V4a.5.5 0 01.5-.5z" clip-rule="evenodd"/>  <path fill-rule="evenodd" d="M7.5 8a.5.5 0 01.5-.5h4a.5.5 0 010 1H8.5V12a.5.5 0 01-1 0V8z" clip-rule="evenodd"/>  <path fill-rule="evenodd" d="M8 15A7 7 0 108 1a7 7 0 000 14zm0 1A8 8 0 108 0a8 8 0 000 16z" clip-rule="evenodd"/></svg>
                         </a>

resources/views/site/fediverse.blade.php

@@ -11,13 +11,7 @@
     <p class="lead font-weight-bold text-muted mt-4 mb-0">Supported Fediverse Projects</p>
     <p class="small text-muted">Some of the better known fediverse projects include:</p>
     <ul class="lead pl-4">
-      <li><a href="https://anfora.app/" rel="nofollow noopener">Anfora</a> – Self-hosted photo gallery social network.</li>
-      @if(\Illuminate\Support\Str::contains(config('pixelfed.media_types'), 'video/mp4'))
-      <li><a href="https://joinpeertube.org/" rel="nofollow noopener">PeerTube</a> – A federated video streaming network.</li>
-      @endif
-      <li><a href="https://pleroma.social/" rel="nofollow noopener">Pleroma</a> – A federated microblogging alternative.</li>
       <li><a href="https://joinmastodon.org" rel="nofollow noopener">Mastodon</a> – A federated microblogging alternative.</li>
-      <li><a href="https://github.com/syuilo/misskey" rel="nofollow noopener">Misskey</a> – A federated microblogging alternative.</li>
     </ul>
   </section>
 @endsection