diff --git a/Changelog.md b/Changelog.md index 9bf3b87bc..0c922d728 100644 --- a/Changelog.md +++ b/Changelog.md @@ -23,6 +23,7 @@ * Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196) * Fix dynamic loading of asset_sync * Fix login for short passwords [#4123](https://github.com/diaspora/diaspora/issues/4123) +* Add loading indicator on tag pages, remove the second one from the profile page [#4041](https://github.com/diaspora/diaspora/issues/4041) ## Features diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 869f1316e..e6f3274fd 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -35,7 +35,6 @@ = t('.ignoring', :name => @person.first_name) #paginate - %span.loader.hidden %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"} ⇧ diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml index f810b3b16..84ec56b05 100644 --- a/app/views/tags/show.haml +++ b/app/views/tags/show.haml @@ -41,6 +41,7 @@ #main_stream.stream #paginate - + %span.loader.hidden + %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"} ⇧