Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

[akkoma] / lib / pleroma / web / templates / layout / app.html.eex
diff --git a/lib/pleroma/web/templates/layout/app.html.eex b/lib/pleroma/web/templates/layout/app.html.eex

index b3cf9ed1151a57cac52ee8d30ae76d39b31eedcb..3f28f1920a1816d760ec65e9173f559f084392e1 100644 (file)
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -36,6 +36,11 @@
          margin-bottom: 20px;
        }
  
+      a {
+        color: #d8a070;
+        text-decoration: none;
+      }
+
        form {
          width: 100%;
        }
@@ -223,7 +228,7 @@
    <body>
      <div class="container">
        <h1><%= Pleroma.Config.get([:instance, :name]) %></h1>
-      <%= render @view_module, @view_template, assigns %>
+      <%= @inner_content %>
      </div>
    </body>
  </html>