Merge branch 'develop' into global-status-expiration

[akkoma] / lib / pleroma / web / templates / static_fe / static_fe / conversation.html.eex

diff --git a/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex b/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
index 35c3c17cdc00b65181b906f6acb510a1ef41565a..2acd84828f2056df5424fd4becd5bcea29c38268 100644 (file)
--- a/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
+++ b/lib/pleroma/web/templates/static_fe/static_fe/conversation.html.eex
@@ -1,5 +1,11 @@
-<div class="conversation">
-  <%= for notice <- @data do %>
-    <%= render("_notice.html", %{data: notice}) %>
-  <% end %>
-</div>
+<header>
+  <h1><%= link instance_name(), to: "/" %></h1>
+</header>
+
+<main>
+  <div class="conversation">
+    <%= for activity <- @activities do %>
+      <%= render("_notice.html", activity) %>
+    <% end %>
+  </div>
+</main>