Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00
parent 852acbd738 7232cdf7e8
commit 7e5691804d
139 changed files with 1196 additions and 758 deletions
@@ -23,9 +23,9 @@
    .accounts-grid
      = render 'nothing_here'
  - else
-    .activity-stream
+    .activity-stream.with-header
      = render partial: 'stream_entries/status', collection: @statuses, as: :status

-  .pagination
-    - if @statuses.size == 20
+  - if @statuses.size == 20
+    .pagination
      = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), short_account_url(@account, max_id: @statuses.last.id), class: 'next', rel: 'next'