From 284312713cfb1ddabe3eebc7486fa87b09178b54 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Mon, 5 Aug 2024 21:18:32 +0100 Subject: [PATCH] web: css adjustments tailwind classes define what "page-container" previously did, with some changes. Logout button moved to top of screen. --- css/base.css | 11 ----- html/404.html | 2 +- html/admin.html | 98 ++++++++++++++++++++-------------------- html/crash.html | 2 +- html/create-success.html | 2 +- html/form.html | 4 +- html/invalidCode.html | 2 +- html/password-reset.html | 2 +- html/setup.html | 4 +- html/user.html | 6 +-- site/index.html | 2 +- 11 files changed, 61 insertions(+), 74 deletions(-) diff --git a/css/base.css b/css/base.css index f021e90..f8dbdfc 100644 --- a/css/base.css +++ b/css/base.css @@ -62,17 +62,6 @@ html:not(.dark) .card.\@low:not(.\~neutral):not(.\~positive):not(.\~urge):not(.\ display: initial; } -.page-container { - margin: 5% 20% 5% 20%; -} - -@media (max-width: 1024px) { - .page-container { - margin: 2%; - margin-top: 5rem; - } -} - @media screen and (max-width: 1024px) { :root { font-size: 0.9rem; diff --git a/html/404.html b/html/404.html index 18fad46..22b0cbb 100644 --- a/html/404.html +++ b/html/404.html @@ -6,7 +6,7 @@ 404 - jfa-go -
+

Page not found.

diff --git a/html/admin.html b/html/admin.html index ac07dfd..76894a8 100644 --- a/html/admin.html +++ b/html/admin.html @@ -535,58 +535,56 @@

-
- - - - - -
-
- - -
-
+
+
+
+ + + + + +
+
+ + +
+
+
+ +
- - -
- {{ if .userPageEnabled }} -
- {{ .strings.myAccount }} -
- {{ end }} -
-
-
-
- {{ .strings.invites }} - {{ .strings.accounts }} - {{ .strings.activity }} - {{ .strings.settings }} -
-
-
-
-
- {{ .strings.logout }} +
+ {{ .strings.logout }} + {{ if .userPageEnabled }} + + {{ end }}
-
-
+
+
+ {{ .strings.invites }} + {{ .strings.accounts }} + {{ .strings.activity }} + {{ .strings.settings }} +
+
+
+
{{ .strings.invites }} -
+
-
+
{{ .strings.create }} -
-
+
+
-
+
@@ -738,7 +736,7 @@
-
+
-
+
-
+
diff --git a/html/crash.html b/html/crash.html index 1a51371..42871b2 100644 --- a/html/crash.html +++ b/html/crash.html @@ -6,7 +6,7 @@ Crash report -
+
Crash report for jfa-go diff --git a/html/create-success.html b/html/create-success.html index c4e87d7..19b7660 100644 --- a/html/create-success.html +++ b/html/create-success.html @@ -6,7 +6,7 @@ {{ .strings.successHeader }} - jfa-go -
+
{{ .strings.successHeader }}

{{ .successMessage }}

diff --git a/html/form.html b/html/form.html index ff35807..2f9223d 100644 --- a/html/form.html +++ b/html/form.html @@ -35,7 +35,7 @@
{{ template "account-linking.html" . }} -
+
@@ -48,7 +48,7 @@
-
+
diff --git a/html/invalidCode.html b/html/invalidCode.html index 15d02f5..bc8de0f 100644 --- a/html/invalidCode.html +++ b/html/invalidCode.html @@ -6,7 +6,7 @@ Invalid Code - jfa-go -
+

Invalid invite code.

The code above was either incorrect, or has expired.

diff --git a/html/password-reset.html b/html/password-reset.html index 8970045..ebd75fd 100644 --- a/html/password-reset.html +++ b/html/password-reset.html @@ -11,7 +11,7 @@ {{ .strings.copied }}
{{ end }} -
+
{{ if .success }} diff --git a/html/setup.html b/html/setup.html index e768bfb..eab9fc5 100644 --- a/html/setup.html +++ b/html/setup.html @@ -7,7 +7,7 @@
-
+
@@ -19,7 +19,7 @@
-
+
diff --git a/html/user.html b/html/user.html index bcd5463..e13fab9 100644 --- a/html/user.html +++ b/html/user.html @@ -79,7 +79,7 @@ {{ template "login-modal.html" . }} {{ template "account-linking.html" . }}
-
+
@@ -102,10 +102,10 @@ {{ .strings.logout }}
-
+
{{ .strings.admin }}
-
+
diff --git a/site/index.html b/site/index.html index 8ab0903..93a93a5 100644 --- a/site/index.html +++ b/site/index.html @@ -52,7 +52,7 @@ sudo apt-get install jfa-go-tray
-
+
jellyfin-accounts (go)