diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-01-17 14:06:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 14:06:08 +0100 |
| commit | 8b1990355974543542544e56d2046bc0c9c8716b (patch) | |
| tree | e70c0682e6a9a6c7132eb97c678f97f6e943d3b1 /app/views/tags | |
| parent | 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 (diff) | |
Improve the public hashtag page (#9831)
- Fix height not updating when clicking show more on public hashtag page - Add header to the public hashtag page - Change text size and margins on the public hashtag page
Diffstat (limited to 'app/views/tags')
| -rw-r--r-- | app/views/tags/_features.html.haml | 25 | ||||
| -rw-r--r-- | app/views/tags/show.html.haml | 6 |
2 files changed, 5 insertions, 26 deletions
diff --git a/app/views/tags/_features.html.haml b/app/views/tags/_features.html.haml deleted file mode 100644 index 8fbc6b760..000000000 --- a/app/views/tags/_features.html.haml +++ /dev/null @@ -1,25 +0,0 @@ -.features-list - .features-list__row - .text - %h6= t 'about.features.real_conversation_title' - = t 'about.features.real_conversation_body' - .visual - = fa_icon 'fw comments' - .features-list__row - .text - %h6= t 'about.features.not_a_product_title' - = t 'about.features.not_a_product_body' - .visual - = fa_icon 'fw users' - .features-list__row - .text - %h6= t 'about.features.within_reach_title' - = t 'about.features.within_reach_body' - .visual - = fa_icon 'fw mobile' - .features-list__row - .text - %h6= t 'about.features.humane_approach_title' - = t 'about.features.humane_approach_body' - .visual - = fa_icon 'fw leaf' diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml index 229fe958b..18de48eea 100644 --- a/app/views/tags/show.html.haml +++ b/app/views/tags/show.html.haml @@ -8,5 +8,9 @@ = javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous' = render 'og' -#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) } } +.page-header + %h1= "##{@tag.name}" + %p= t('about.about_hashtag_html', hashtag: @tag.name) + +#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) }} #modal-container |