diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/stream_entries.scss | 7 | ||||
| -rw-r--r-- | app/views/stream_entries/_status.html.haml | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss index badae3841..5e4ef75c2 100644 --- a/app/assets/stylesheets/stream_entries.scss +++ b/app/assets/stylesheets/stream_entries.scss @@ -79,7 +79,8 @@ .avatar { width: 56px; - padding: 15px; + padding: 15px 10px; + padding-right: 5px; float: left; img { @@ -91,7 +92,7 @@ } .entry__container__container { - margin-left: 86px; + margin-left: 71px; } .header { @@ -197,7 +198,7 @@ display: block; overflow: hidden; padding-left: 10px; - margin-bottom: 21px; + margin-bottom: 15px; li { display: block; diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml index fc21e6c45..2edc8bc3f 100644 --- a/app/views/stream_entries/_status.html.haml +++ b/app/views/stream_entries/_status.html.haml @@ -31,9 +31,10 @@ .content= Formatter.instance.format(proper_status(status)) - %ul.media-attachments - - (status.reblog? ? status.reblog : status).media_attachments.each do |media| - %li.transparent-background= link_to '', media.file.url, style: "background-image: url(#{media.file.url(:small)})", target: '_blank' + - if (status.reblog? ? status.reblog : status).media_attachments.size > 0 + %ul.media-attachments + - (status.reblog? ? status.reblog : status).media_attachments.each do |media| + %li.transparent-background= link_to '', media.file.url, style: "background-image: url(#{media.file.url(:small)})", target: '_blank' - if include_threads = render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true } |