nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix oddities with public profile CSS (#4341) 

* Fix oddities with public profile CSS

* Remove trailing whitespace
This commit is contained in:
Eugen Rochko 2017-07-24 17:56:50 +02:00 committed by GitHub
parent 462b3752e4
commit 1306d637a2
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/styles/stream_entries.scss
View File

@ -36,6 +36,18 @@
} }
} }
&.with-header {
.entry {
&:first-child {
&,
.detailed-status.light,
.status.light {
border-radius: 0;
}
}
}
}
.status.light { .status.light {
padding: 14px 14px 14px (48px + 14px * 2); padding: 14px 14px 14px (48px + 14px * 2);
position: relative; position: relative;

6
app/views/accounts/show.html.haml
View File

@ -23,9 +23,9 @@
.accounts-grid .accounts-grid
= render 'nothing_here' = render 'nothing_here'
- else - else
.activity-stream .activity-stream.with-header
= render partial: 'stream_entries/status', collection: @statuses, as: :status = 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' = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), short_account_url(@account, max_id: @statuses.last.id), class: 'next', rel: 'next'