diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-26 21:11:52 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-26 21:11:52 +0100 |
| commit | fa29ef3a41816ee915c52707bcd9db6cc9cdf7d6 (patch) | |
| tree | 0a7353bb679e8885269077b6a8ef14847c2e966f /app/views | |
| parent | 24646d57690ad36cf4caecab2eec5774bca7f699 (diff) | |
Improving design
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/application.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profile/_status.html.haml | 7 | ||||
| -rw-r--r-- | app/views/profile/_status_footer.html.haml | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index c46fb0b33..e8a9329c3 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,3 +9,5 @@ %body .container = yield + .footer + = link_to 'Mastodon', 'https://github.com/Gargron/mastodon', class: 'mastodon-link' diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml index 39e70b69c..91c4fad26 100644 --- a/app/views/profile/_status.html.haml +++ b/app/views/profile/_status.html.haml @@ -1,4 +1,9 @@ -%div.entry +%div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' } + - if status.reblog? + .pre-header + %i.fa.fa-retweet + Shared by + = link_to status.account.display_name.blank? ? status.account.username : status.account.display_name, (status.account.local? ? profile_url(name: status.account.username) : status.account.url), class: 'name' .header = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status } .content diff --git a/app/views/profile/_status_footer.html.haml b/app/views/profile/_status_footer.html.haml index 0c47ade90..f29abf27b 100644 --- a/app/views/profile/_status_footer.html.haml +++ b/app/views/profile/_status_footer.html.haml @@ -5,3 +5,6 @@ .counter.counter-favourites %i.fa.fa-star %span.num= status.favourites.count + +- if status.reply? + = link_to 'View conversation', status.thread.local? ? status_url(name: status.thread.account.username, id: status.thread.id) : status.thread.url, class: 'conversation-link' |