merge with master

2016-12-12 16:09:05 +01:00
parent fac652f377 21ca828f81
commit 2e8650c324
43 changed files with 381 additions and 254 deletions
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -75,7 +75,8 @@

            <% if comment.children.size > 0 %>
              <%= link_to "", class: "js-toggle-children relative", data:  {'id': "#{dom_id(comment)}"} do %>
-                <span class="sr-only"><%= t("shared.show") %></span>
+                <span class="sr-only js-child-toggle" style="display: none;"><%= t("shared.show") %></span>
+                <span class="sr-only js-child-toggle"><%= t("shared.hide") %></span>
                <span id="<%= dom_id(comment) %>_children_arrow" class="icon-arrow-down"></span> <%= t("comments.comment.responses", count: comment.children.size) %>
              <% end %>
            <% else %>