From 7e0e0b0520344ed84c488d1b6ccb657bd870c62c Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Fri, 31 Dec 2021 18:52:03 +0000 Subject: [PATCH] fix form layout --- css/base.css | 5 ----- html/admin.html | 16 ++++++++-------- html/crash.html | 6 +++--- html/form.html | 40 +++++++++++++++++++++------------------- ts/modules/accounts.ts | 4 ++-- ts/modules/invites.ts | 4 ++-- ts/modules/settings.ts | 6 +++--- ts/modules/update.ts | 4 ++-- 8 files changed, 41 insertions(+), 44 deletions(-) diff --git a/css/base.css b/css/base.css index 3caaac9..9db580d 100644 --- a/css/base.css +++ b/css/base.css @@ -186,11 +186,6 @@ span.sm:not(.heading) { } } -.monospace { - background-color: inherit; /* so we can use a17t code blocks */ - font-family: Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace; -} - sup.\~critical, .text-critical { color: var(--color-critical-normal-content); } diff --git a/html/admin.html b/html/admin.html index e3bfe67..f686537 100644 --- a/html/admin.html +++ b/html/admin.html @@ -46,8 +46,8 @@
× -

{{ .strings.version }} {{ .version }}

-

{{ .strings.commitNoun }} {{ .commit }}

+

{{ .strings.version }} {{ .version }}

+

{{ .strings.commitNoun }} {{ .commit }}

github wiki/docs @@ -68,7 +68,7 @@ discord

Available under the MIT License.

- 
{{ .license }}
+ 
{{ .license }}
{{ end }} - - - - - -
-
+
+ + + + + +
+
+
-
- + +
-
+
{{ if .passwordReset }} @@ -106,15 +108,15 @@ {{ if .userExpiry }} {{ end }} -
+ {{ if not .passwordReset }} - + {{ if .telegramEnabled }} {{ .strings.linkTelegram }} {{ end }} @@ -148,10 +150,10 @@ {{ end }} {{ end }} - + - +
-
+
{{ .strings.passwordRequirementsHeader }}
    {{ range $key, $value := .requirements }} @@ -176,7 +178,7 @@
{{ if .contactMessage }} - + {{ end }}
diff --git a/ts/modules/accounts.ts b/ts/modules/accounts.ts index 981b0b1..db7784d 100644 --- a/ts/modules/accounts.ts +++ b/ts/modules/accounts.ts @@ -904,7 +904,7 @@ export class accountsList { if (req.readyState == 4) { const preview = document.getElementById("announce-preview") as HTMLDivElement; if (req.status != 200) { - preview.innerHTML = `
`;
+                    preview.innerHTML = `
`;
                     window.modals.announce.show();
                     this._previewLoaded = false;
                     return;
@@ -912,7 +912,7 @@ export class accountsList {
                     
                 let templ = req.response as templateEmail;
                 if (!templ.html) {
-                    preview.innerHTML = `
`;
+                    preview.innerHTML = `
`;
                     this._previewLoaded = false;
                 } else {
                     preview.innerHTML = templ.html;
diff --git a/ts/modules/invites.ts b/ts/modules/invites.ts
index b52d8c9..80034ec 100644
--- a/ts/modules/invites.ts
+++ b/ts/modules/invites.ts
@@ -257,7 +257,7 @@ class DOMInvite implements Invite {
         this._header.appendChild(this._codeArea);
         this._codeArea.classList.add("inv-codearea");
         this._codeArea.innerHTML = `
-        
+        
         
         `;
         const copyButton = this._codeArea.querySelector("span.button") as HTMLSpanElement;
@@ -427,7 +427,7 @@ export class inviteList implements inviteList {
             

                 

                     

-                        ${window.lang.strings("inviteNoInvites")}
+                        ${window.lang.strings("inviteNoInvites")}
                     

                 

             

diff --git a/ts/modules/settings.ts b/ts/modules/settings.ts
index d6fe608..48b61df 100644
--- a/ts/modules/settings.ts
+++ b/ts/modules/settings.ts
@@ -797,7 +797,7 @@ class EmailEditor {
                 this._templ = req.response as templateEmail;
                 this._textArea.value = this._templ.content;
                 if (this._templ.html == "") {
-                    this._preview.innerHTML = `
`;
+                    this._preview.innerHTML = `
`;
                 } else {
                     this._preview.innerHTML = this._templ.html;
                 }
@@ -818,7 +818,7 @@ class EmailEditor {
                 this._variables.innerHTML = innerHTML
                 let buttons = this._variables.querySelectorAll("span.button") as NodeListOf;
                 for (let i = 0; i < this._templ.variables.length; i++) {
-                    buttons[i].innerHTML = `` + this._templ.variables[i] + ``;
+                    buttons[i].innerHTML = `` + this._templ.variables[i] + ``;
                     buttons[i].onclick = () => {
                         insertText(this._textArea, this._templ.variables[i]);
                         this.loadPreview();
@@ -838,7 +838,7 @@ class EmailEditor {
                     this._conditionals.innerHTML = innerHTML
                     buttons = this._conditionals.querySelectorAll("span.button") as NodeListOf;
                     for (let i = 0; i < this._templ.conditionals.length; i++) {
-                        buttons[i].innerHTML = `{if ` + this._templ.conditionals[i].slice(1) + ``;
+                        buttons[i].innerHTML = `{if ` + this._templ.conditionals[i].slice(1) + ``;
                         buttons[i].onclick = () => {
                             insertText(this._textArea, "{if " + this._templ.conditionals[i].slice(1) + "{endif}");
                             this.loadPreview();
diff --git a/ts/modules/update.ts b/ts/modules/update.ts
index e490e89..ba2c946 100644
--- a/ts/modules/update.ts
+++ b/ts/modules/update.ts
@@ -38,9 +38,9 @@ export class Updater implements updater {
         const el = document.getElementById("update-description") as HTMLParagraphElement;
         el.textContent = description;
         if (this.version == "git") {
-            el.classList.add("monospace");
+            el.classList.add("font-mono", "bg-inherit");
         } else {
-            el.classList.remove("monospace");
+            el.classList.remove("font-mono", "bg-inherit");
         }
     }