From ff5d14874fdcebb0bedb22fa772a2a6d102bf5a0 Mon Sep 17 00:00:00 2001 From: Izuru Yakumo Date: Sat, 15 Apr 2023 13:22:51 -0300 Subject: [PATCH] Use a more consistent layout + styles Signed-off-by: Izuru Yakumo --- templates/account.html | 28 +++++------ templates/error.html | 6 +-- templates/error_login.html | 6 +-- templates/feedset.html | 6 +-- templates/index.html | 35 +++++-------- templates/info.html | 10 ++-- templates/list.html | 10 ++-- templates/nopwresetrequest.html | 8 +-- templates/nosignup.html | 8 +-- templates/partials.html | 50 +++++++++--------- templates/style.css | 89 +++++++++++---------------------- 11 files changed, 108 insertions(+), 148 deletions(-) diff --git a/templates/account.html b/templates/account.html index 19ddb81..17f62e3 100644 --- a/templates/account.html +++ b/templates/account.html @@ -1,18 +1,18 @@ {{ template "header" }} - - - + +
-

Account settings

+ + + - - -
+

Account settings

 - -
+ 		+ +
{{ template "footer" }} diff --git a/templates/error.html b/templates/error.html index b9145e6..aedf40d 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,9 +1,9 @@ {{ template "header" }} - +
-

Error

-

Something went wrong: {{ .Msg }}

+

Error

+

Something went wrong: {{ .Msg }}
diff --git a/templates/error_login.html b/templates/error_login.html index 79950b3..156682f 100644 --- a/templates/error_login.html +++ b/templates/error_login.html @@ -1,9 +1,9 @@ {{ template "header" }} - +
-

Error

-

Something went wrong: Bad login. (Have you forgotten your password? If you added a mail address to your login data, you might be able to reset it.)

+

Error

+

Something went wrong: Bad login. (Have you forgotten your password? If you added a mail address to your login data, you might be able to reset it.)
diff --git a/templates/feedset.html b/templates/feedset.html index 9e79035..87b3d93 100644 --- a/templates/feedset.html +++ b/templates/feedset.html @@ -1,9 +1,9 @@ {{ template "header" }} - +
-

Success

-

Your account has been set up.

+

Success

+

Your account has been set up.
diff --git a/templates/index.html b/templates/index.html index bdecd0b..94e396e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,27 +1,16 @@ {{ template "header" }} -
-
- Send twtxt + +

Send twtxt

+ + +

Max. 140 characters

-
- - -

Max. 140 characters

-
+ + + + +
-
- - -
- -
- - -
- -
- - -
-
+ + {{ template "footer" }} diff --git a/templates/info.html b/templates/info.html index ca0e2a9..8bdbc63 100644 --- a/templates/info.html +++ b/templates/info.html @@ -1,11 +1,11 @@ {{ template "header" }} - +
-

About this site

-

This site is a web server to host and grow twtxt feeds for users without trivial access to their own web space.

-

Its operator gives no guarantees regarding long-term availability of feeds, stability of their paths, or quality and integrity of their contents. If that does not satisfy your needs, consider hosting your own instance: The underlying server software htwtxt is freely available, and should not be too difficult to set up.

-

Site operator's contact info: {{ .Msg }}

+

About this site

+

This site is a web server to host and grow twtxt feeds for users without trivial access to their own web space.

+

Its operator gives no guarantees regarding long-term availability of feeds, stability of their paths, or quality and integrity of their contents. If that does not satisfy your needs, consider hosting your own instance: The underlying server software akyuu is freely available, and should not be too difficult to set up.

+

Site operator's contact info: {{ .Msg }}
diff --git a/templates/list.html b/templates/list.html index 7cf3127..823024b 100644 --- a/templates/list.html +++ b/templates/list.html @@ -1,13 +1,13 @@ {{ template "header" }} - +
-

Feeds

-
diff --git a/templates/nopwresetrequest.html b/templates/nopwresetrequest.html index f029809..d6a9d8e 100644 --- a/templates/nopwresetrequest.html +++ b/templates/nopwresetrequest.html @@ -1,11 +1,11 @@ {{ template "header" }} - +
-
-

Password reset inactive

-

The site operator has currently not activated automatic password resetting.

+

Password reset inactive

+

The site operator has currently not activated automatic password resetting.
+ {{ template "footer" }} diff --git a/templates/nosignup.html b/templates/nosignup.html index bdb8bba..85aa8f9 100644 --- a/templates/nosignup.html +++ b/templates/nosignup.html @@ -1,9 +1,9 @@ {{ template "header" }} - - +
+
-

Account creation closed

-

The site operator has not decided to currently open up account creation on this site to the public.

+

Account creation closed

+

The site operator has not decided to currently open up account creation on this site to the public.
diff --git a/templates/partials.html b/templates/partials.html index e78562a..820983a 100644 --- a/templates/partials.html +++ b/templates/partials.html @@ -1,30 +1,30 @@ {{ define "header" }} - - - - akyuu - - - -
-

akyuu

-
- - - -
- -
+ + + + akyuu + + + +
+

akyuu

+
+ + + +
+ +
{{ end }} {{ define "footer" }} -
-

Read more about this site.
Licensed under AGPLv3. Source code .

-
- - +
+

Read more about this site.
Licensed under AGPLv3. Source code .

+
+ + {{ end }} diff --git a/templates/style.css b/templates/style.css index 321a805..79416a4 100644 --- a/templates/style.css +++ b/templates/style.css @@ -1,89 +1,60 @@ body { - background-color: white; - color: black; - font: 1rem/1.5 -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Open Sans', 'Helvetica Neue', sans-serif; - word-wrap: break-word; - max-width: 30rem; - padding: 0 1rem; - margin: 0 auto; + background-color: white; + color: black; + font: 1rem/1.5 -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Open Sans', 'Helvetica Neue', sans-serif; + word-wrap: break-word; + max-width: 30rem; + padding: 0 1rem; + margin: 0 auto; } a { - color: #00c; + color: red; } a:hover { - background-color: #00c; - color: white; + color: gold; } a:focus { - outline: thin solid; + outline: thin solid; } -header, -nav, -footer { - text-align: center; +h2:first-child { + margin-top: 0; } -nav ul { - list-style: none; - padding-left: 0; -} - -nav li { - display: inline-block; - margin: 0 .5rem; -} - -section, -fieldset { - background-color: #eee; - padding: 1rem; - border: 1px solid black; -} - -section.success { - background-color: #cfc; -} - -section.error { - background-color: #fcc; -} - -section h2:first-child { - margin-top: 0; -} - -form div { - margin-bottom: 1rem; +form { + margin-bottom: 1rem; } form p, label span { - color: #444; - font-size: .8rem; + color: #444; + font-size: .8rem; } form p { - margin: 0; -} - -legend, -label { - font-weight: bold; + margin: 0; } label { - display: block; + font-weight: bold; + display: block; } - button, input { - font-size: 1rem; + font-size: 1rem; } - input#twt { - width: 100%; + width: 100%; +} +table { + border-color: purple; +} +tr { + border-color: lime; +} +td { + border-color: lightblue; }