about summary refs log tree commit diff
path: root/app/views/accounts
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-25 21:36:22 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-25 21:36:22 +0200
commit7e5691804d4f0019a89b8b8a3dad532bc9d940ea (patch)
tree84c2f4e4ac07bea3915639a50df84eb62b6c5768 /app/views/accounts
parent852acbd7385a640d9e00e462d58a847851744034 (diff)
parent7232cdf7e8249f79078005931b1165e54e413fa9 (diff)
Merge git://github.com/tootsuite/mastodon into tootsuite-master
Diffstat (limited to 'app/views/accounts')
-rw-r--r--app/views/accounts/show.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 7ed634e5d..150c14791 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -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'