From a6528fe5760bbff3b3d4682008d55ee1d983eec9 Mon Sep 17 00:00:00 2001
From: Forever <52264162+foreverxml@users.noreply.github.com>
Date: Fri, 8 Jul 2022 02:01:00 -0600
Subject: [PATCH] [bugfix] Various fixes (#699)

* [bugfix] Correctly style inputs and buttons

<input>, <textarea>, and <button> were incorrectly using the system-ui font previously; this commit fixes that. text-align: center; was added to <button> due to an inconsistency with .button where text-align would be off.

* [chore] Update binary installation instructions

This commit updates the example release mentioned in the docs, and mentions Caddy in the reverse proxy options.

* [bugfix] Remove redundant Caddyfile

Caddy automatically upgrades HTTP to HTTPS (see https://caddyserver.com/docs/automatic-https) so the upgrading part of the Caddyfile is redundant.
---
 docs/installation_guide/binary.md | 14 +++++---------
 docs/installation_guide/caddy.md  |  8 +-------
 web/source/css/base.css           |  3 +++
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/docs/installation_guide/binary.md b/docs/installation_guide/binary.md
index f8a38a01d..00e4be974 100644
--- a/docs/installation_guide/binary.md
+++ b/docs/installation_guide/binary.md
@@ -24,16 +24,16 @@ Now, download the latest GoToSocial release archive corresponding to the operati
 
 (You can find the list of releases [right here](https://github.com/superseriousbusiness/gotosocial/releases), arranged with the newest release at the top.)
 
-For example, to download version 0.3.1 for running on 64-bit Linux:
+For example, to download version 0.3.7 for running on 64-bit Linux:
 
 ```bash
-wget https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.1/gotosocial_0.3.1_linux_amd64.tar.gz
+wget https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_amd64.tar.gz
 ```
 
 Then extract it:
 
 ```bash
-tar -xzf gotosocial_0.3.1_linux_amd64.tar.gz
+tar -xzf gotosocial_0.3.7_linux_amd64.tar.gz
 ```
 
 This will put the `gotosocial` binary in your current directory, in addition to the `web` folder, which contains assets for the web frontend, and an `example` folder, which contains a sample configuration file.
@@ -136,10 +136,6 @@ After you're done enable the service.
 sudo systemctl enable --now gotosocial.service
 ```
 
-## 8. Install the Admin Control Panel (optional)
+## 8. Reverse proxy (optional)
 
-At some point you'll likely want to do things like change instance information, and block domains you don't want to interact with. See the [admin panel](../admin/admin_panel.md) instructions for this.
-
-## 9. Reverse proxy (optional)
-
-If you want to run other webservers on port 443 or want to add an additional layer of security you might want to use [nginx](./nginx.md) or [Apache httpd](./apache-httpd.md) as reverse proxy
+If you want to run other webservers on port 443 or want to add an additional layer of security you might want to use [nginx](./nginx.md), [Caddy](./caddy.md) or [Apache httpd](./apache-httpd.md) as reverse proxy
diff --git a/docs/installation_guide/caddy.md b/docs/installation_guide/caddy.md
index c1dd13977..0b1e91668 100644
--- a/docs/installation_guide/caddy.md
+++ b/docs/installation_guide/caddy.md
@@ -65,13 +65,7 @@ While editing the file above, you should replace 'example.org' with your domain.
 The file you're about to create should look like this:
 
 ```Caddyfile
-# Because we use a reverse proxy, Caddy won't redirect port 80 to 443 by default unless we tell it to.
-example.org:80 {
-	redir https://example.org/{uri}
-}
-
-# The actual host configuration
-example.org:443 {
+example.org {
 	# Optional, but recommended, compress the traffic using proper protocols
 	encode zstd gzip
 
diff --git a/web/source/css/base.css b/web/source/css/base.css
index 163eaf7b1..66dd8b838 100644
--- a/web/source/css/base.css
+++ b/web/source/css/base.css
@@ -145,6 +145,8 @@ main {
 	padding: 0.5rem;
 	border: none;
 	cursor: pointer;
+	text-align: center;
+	font-family: 'Noto Sans', sans-serif;
 
 	&:hover {
 		background: $button_hover_bg;
@@ -245,6 +247,7 @@ input, select, textarea {
 	color: $fg;
 	background: $bg;
 	width: 100%;
+	font-family: 'Noto Sans', sans-serif;
 }
 
 footer {