Merge remote-tracking branch 'upstream/develop' into admin-create-users

[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 8333bc9217fc7c15003141403849e389b5b3b353..85ec4d76cd1a706a52e185d094b8dc289a519c09 100644 (file)
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -4,7 +4,7 @@
      <meta charset="utf-8" />
      <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
      <title>
-    <%= Application.get_env(:pleroma, :instance)[:name] %>
+    <%= Pleroma.Config.get([:instance, :name]) %>
      </title>
      <style>
        body {
@@ -179,11 +179,22 @@
            flex-basis: 50%;
          }
        }
+      .form-row {
+        display: flex;
+      }
+      .form-row > label {
+        text-align: left;
+        line-height: 47px;
+        flex: 1;
+      }
+      .form-row > input {
+        flex: 2;
+      }
      </style>
    </head>
    <body>
      <div class="container">
-      <h1><%= Application.get_env(:pleroma, :instance)[:name] %></h1>
+      <h1><%= Pleroma.Config.get([:instance, :name]) %></h1>
        <%= render @view_module, @view_template, assigns %>
      </div>
    </body>