9 files changed, 73 insertions, 4 deletions
diff --git a/web/assets/base.css b/web/assets/base.css
index b28cf2533..e105707c2 100644
--- a/web/assets/base.css
+++ b/web/assets/base.css
@@ -165,6 +165,25 @@ section.login form button {
 			grid-column: 2;
 		}
 
+section.error {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+section.error span {
+  font-size: 2em;
+}
+section.error pre {
+  border: 1px solid #ff000080;
+  margin-left: 1em;
+  padding: 0 0.7em;
+  border-radius: 0.5em;
+  background-color: #ff000010;
+  font-size: 1.3em;
+  white-space: pre-wrap;
+}
+
+
 input, select, textarea {
 	border: 1px solid #fafaff;
 	color: #fafaff;
diff --git a/web/gotosocial-styling/templates/base.css b/web/gotosocial-styling/templates/base.css
index 8b2f14fbe..4ac639a38 100644
--- a/web/gotosocial-styling/templates/base.css
+++ b/web/gotosocial-styling/templates/base.css
@@ -165,6 +165,24 @@ section.login {
 	}
 }
 
+section.error {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+  span {
+    font-size: 2em;
+  }
+  pre {
+    border: 1px solid #ff000080;
+    margin-left: 1em;
+    padding: 0 0.7em;
+    border-radius: 0.5em;
+    background-color: #ff000010;
+    font-size: 1.3em;
+    white-space: pre-wrap;
+  }
+}
+
 input, select, textarea {
 	border: 1px solid $fg;
 	color: $fg;
diff --git a/web/gotosocial-styling/yarn.lock b/web/gotosocial-styling/yarn.lock
index 1d39d5fd7..6b7fe6e64 100644
--- a/web/gotosocial-styling/yarn.lock
+++ b/web/gotosocial-styling/yarn.lock
@@ -230,9 +230,9 @@ ms@^2.1.1:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.1.23:
-  version "3.1.25"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
-  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
diff --git a/web/template/authorize.tmpl b/web/template/authorize.tmpl
index b6eef9561..68a6a2f29 100644
--- a/web/template/authorize.tmpl
+++ b/web/template/authorize.tmpl
@@ -2,7 +2,13 @@
     <main>
         <form action="/oauth/authorize" method="POST">
             <h1>Hi {{.user}}!</h1>
-            <p>Application <b>{{.appname}}</b> {{if len .appwebsite | eq 0 | not}}({{.appwebsite}}) {{end}}would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.</p>
+            <p>
+              Application <b>{{.appname}}</b> 
+              {{if len .appwebsite | eq 0 | not}}
+                ({{.appwebsite}}) 
+              {{end}}
+              would like to perform actions on your behalf, with scope <em>{{.scope}}</em>.
+            </p>
             <p>The application will redirect to {{.redirect}} to continue.</p>
             <p>
                 <button
diff --git a/web/template/email_confirm.tmpl b/web/template/email_confirm_html.tmpl
index 0a9907921..0a9907921 100644
--- a/web/template/email_confirm.tmpl
+++ b/web/template/email_confirm_html.tmpl
diff --git a/web/template/email_confirm_text.tmpl b/web/template/email_confirm_text.tmpl
new file mode 100644
index 000000000..8682cc49c
--- /dev/null
+++ b/web/template/email_confirm_text.tmpl
@@ -0,0 +1,9 @@
+Hello {{.Username}}!
+
+You are receiving this mail because you've requested an account on {{.InstanceURL}}.
+
+We just need to confirm that this is your email address. To confirm your email, paste the following in your browser's address bar:
+
+{{.ConfirmLink}}
+
+If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceURL}}
diff --git a/web/template/email_reset.tmpl b/web/template/email_reset_html.tmpl
index 7318c6a45..7318c6a45 100644
--- a/web/template/email_reset.tmpl
+++ b/web/template/email_reset_html.tmpl
diff --git a/web/template/email_reset_text.tmpl b/web/template/email_reset_text.tmpl
new file mode 100644
index 000000000..ccac3bf75
--- /dev/null
+++ b/web/template/email_reset_text.tmpl
@@ -0,0 +1,9 @@
+Hello {{.Username}}!
+
+You are receiving this mail because a password reset has been requested for your account on {{.InstanceURL}}.
+
+To reset your password, paste the following in your browser's address bar:
+
+{{.ResetLink}}
+
+If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceURL}}.
diff --git a/web/template/error.tmpl b/web/template/error.tmpl
new file mode 100644
index 000000000..a8a72b062
--- /dev/null
+++ b/web/template/error.tmpl
@@ -0,0 +1,8 @@
+{{ template "header.tmpl" .}}
+    <main>
+        <section class="error">
+          <span>❌</span> <pre>{{.error}}</pre>
+        </section>
+        
+    </main>
+{{ template "footer.tmpl" .}}
+\ No newline at end of file