[#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 2e96c150901b1dcaf23d14de9dfe6ba219f1b18d..db97ccac21445183448f066ea2f2e6229d361921 100644 (file)
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -1,7 +1,8 @@
  <!DOCTYPE html>
  <html>
    <head>
-    <meta charset=utf-8 />
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
      <title>
      <%= Application.get_env(:pleroma, :instance)[:name] %>
      </title>
@@ -53,6 +54,10 @@
          border-bottom: 2px solid #4b8ed8;
        }
  
+      input[type="checkbox"] {
+        width: auto;
+      }
+
        button {
          box-sizing: border-box;
          width: 100%;
@@ -66,6 +71,32 @@
          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>