[#468] Merged `upstream/develop`, resolved conflicts.

[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 6cc3b7ac537846e8f370243945315d094d0a302e..db97ccac21445183448f066ea2f2e6229d361921 100644 (file)
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -1,11 +1,108 @@
  <!DOCTYPE html>
  <html>
    <head>
-    <meta charset=utf-8 />
-    <title>Pleroma</title>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
+    <title>
+    <%= Application.get_env(:pleroma, :instance)[:name] %>
+    </title>
+    <style>
+      body {
+        background-color: #282c37;
+        font-family: sans-serif;
+        color:white;
+        text-align: center;
+      }
+
+      .container {
+        margin: 50px auto;
+        max-width: 320px;
+        padding: 0;
+        padding: 40px 40px 40px 40px;
+        background-color: #313543;
+        border-radius: 4px;
+      }
+
+      h1 {
+        margin: 0;
+      }
+
+      h2 {
+        color: #9baec8;
+        font-weight: normal;
+        font-size: 20px;
+        margin-bottom: 40px;
+      }
+
+      form {
+        width: 100%;
+      }
+
+      input {
+        box-sizing: border-box;
+        width: 100%;
+        padding: 10px;
+        margin-top: 20px;
+        background-color: rgba(0,0,0,.1);
+        color: white;
+        border: 0;
+        border-bottom: 2px solid #9baec8;
+        font-size: 14px;
+      }
+
+      input:focus {
+        border-bottom: 2px solid #4b8ed8;
+      }
+
+      input[type="checkbox"] {
+        width: auto;
+      }
+
+      button {
+        box-sizing: border-box;
+        width: 100%;
+        color: white;
+        background-color: #419bdd;
+        border-radius: 4px;
+        border: none;
+        padding: 10px;
+        margin-top: 30px;
+        text-transform: uppercase;
+        font-weight: 500;
+        font-size: 16px;
+      }
+
+      .alert-danger {
+        box-sizing: border-box;
+        width: 100%;
+        color: #D8000C;
+        background-color: #FFD2D2;
+        border-radius: 4px;
+        border: none;
+        padding: 10px;
+        margin-top: 20px;
+        font-weight: 500;
+        font-size: 16px;
+      }
+
+      .alert-info {
+        box-sizing: border-box;
+        width: 100%;
+        color: #00529B;
+        background-color: #BDE5F8;
+        border-radius: 4px;
+        border: none;
+        padding: 10px;
+        margin-top: 20px;
+        font-weight: 500;
+        font-size: 16px;
+      }
+    </style>
    </head>
    <body>
-    <h1>Welcome to Pleroma</h1>
-    <%= render @view_module, @view_template, assigns %>
+    <div class="container">
+      <h1>Pleroma</h1>
+      <%= render @view_module, @view_template, assigns %>
+    </div>
    </body>
  </html>