diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-24 17:56:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 17:56:50 +0200 |
| commit | 1306d637a209393826cc5bf830864a281db71066 (patch) | |
| tree | ca5a56d5ab7bae5a9c09c5f5fc57d697396d62e6 | |
| parent | 462b3752e48c2cad8d61bd1c35ad94d6b660c8e7 (diff) | |
Fix oddities with public profile CSS (#4341)
* Fix oddities with public profile CSS
* Remove trailing whitespace
| -rw-r--r-- | app/javascript/styles/stream_entries.scss | 12 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/stream_entries.scss index e89cc3f0901..3856942e17f 100644 --- a/app/javascript/styles/stream_entries.scss +++ b/app/javascript/styles/stream_entries.scss @@ -36,6 +36,18 @@ } } + &.with-header { + .entry { + &:first-child { + &, + .detailed-status.light, + .status.light { + border-radius: 0; + } + } + } + } + .status.light { padding: 14px 14px 14px (48px + 14px * 2); position: relative; diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 7ed634e5d28..150c1479116 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' |