Merge 70f6b85a21 into e892bc375d

Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.23.0 to 0.24.0.
- [Commits](https://github.com/golang/oauth2/compare/v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.drone.yml

@@ -57,7 +57,7 @@ steps:
           - pull_request
 
   - name: web-setup
-    image: node:18-alpine
+    image: node:20-alpine
     volumes:
       - name: yarn_cache
         path: /tmp/cache
@@ -72,7 +72,7 @@ steps:
           - pull_request
 
   - name: web-lint
-    image: node:18-alpine
+    image: node:20-alpine
     commands:
       - yarn --cwd ./web/source lint
     depends_on:
@@ -83,7 +83,7 @@ steps:
           - pull_request
 
   - name: web-build
-    image: node:18-alpine
+    image: node:20-alpine
     commands:
       - yarn --cwd ./web/source build
     depends_on:
@@ -114,7 +114,7 @@ steps:
       # Create a snapshot build with GoReleaser.
       - git fetch --tags
       - goreleaser release --clean --snapshot
-      
+
       # Login to Docker, push Docker image snapshots + manifests.
       - /go/dockerlogin.sh
       - docker push superseriousbusiness/gotosocial:snapshot-armv6
@@ -129,7 +129,7 @@ steps:
       - docker push superseriousbusiness/gotosocial:snapshot-amd64-moderncsqlite
       - docker manifest create superseriousbusiness/gotosocial:snapshot-moderncsqlite superseriousbusiness/gotosocial:snapshot-armv6-moderncsqlite superseriousbusiness/gotosocial:snapshot-armv7-moderncsqlite superseriousbusiness/gotosocial:snapshot-amd64-moderncsqlite superseriousbusiness/gotosocial:snapshot-arm64v8-moderncsqlite
       - docker manifest push superseriousbusiness/gotosocial:snapshot-moderncsqlite
-      
+
       # Publish binary .tar.gz snapshots to S3.
       - /go/snapshot_publish.sh
     when:
@@ -156,12 +156,12 @@ steps:
     commands:
       - git fetch --tags
       - /go/dockerlogin.sh
-      
+
       # When releasing, compare commits to the most recent tag that is not the
       # current one AND is not a release candidate tag (ie., no "rc" in the name).
       #
       # The DRONE_TAG env var should point to the tag that triggered this build.
-      # See: https://docs.drone.io/pipeline/environment/reference/drone-tag/ 
+      # See: https://docs.drone.io/pipeline/environment/reference/drone-tag/
       #
       # Note, this may cause annoyances when doing backport releases, for example,
       # releasing v0.10.1 when we've already released v0.15.0 or whatever, but
@@ -224,5 +224,3 @@ steps:
 ---
 kind: signature
 hmac: 1b89e3a538fbca72eb9a0b398cd82f09a774ba3649013e19d36012eda327e83f
-
-...

.vscode/settings.json

@@ -3,6 +3,9 @@
 	"go.lintFlags": [
 	  "--fast"
 	],
+	"go.testEnvVars": {
+		"WAZERO_COMPILATION_CACHE": "~/.cache/wazero"
+	},
 	"gopls": {
 		"analyses": {
 			"composites": false
@@ -19,5 +22,9 @@
 	],
 	"editor.codeActionsOnSave": {
 		"source.fixAll.eslint": "explicit"
-	}
+	},
+	"html.format.wrapLineLength": 0,
+	"html.format.wrapAttributes": "preserve",
+	"files.insertFinalNewline": true,
+	"files.trimFinalNewlines": true,
 }

Dockerfile

@@ -19,7 +19,7 @@ WORKDIR /go/src/github.com/superseriousbusiness/gotosocial
 RUN /go/bin/swagger generate spec -o /go/src/github.com/superseriousbusiness/gotosocial/swagger.yaml --scan-models
 
 # stage 2: generate the web/assets/dist bundles
-FROM --platform=${BUILDPLATFORM} node:18-alpine AS bundler
+FROM --platform=${BUILDPLATFORM} node:20-alpine AS bundler
 
 COPY web web
 RUN yarn --cwd ./web/source install && \

go.mod

@@ -91,7 +91,7 @@ require (
 	golang.org/x/crypto v0.29.0
 	golang.org/x/image v0.22.0
 	golang.org/x/net v0.31.0
-	golang.org/x/oauth2 v0.23.0
+	golang.org/x/oauth2 v0.24.0
 	golang.org/x/text v0.20.0
 	gopkg.in/mcuadros/go-syslog.v2 v2.3.0
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -747,8 +747,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

internal/typeutils/internaltofrontend_test.go

@@ -1780,7 +1780,7 @@ func (suite *InternalToFrontendTestSuite) TestStatusToAPIStatusPendingApproval()
   "muted": false,
   "bookmarked": false,
   "pinned": false,
-  "content": "<p>Hi <span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span>, can I reply?</p><hr><p><i lang=\"en\">ℹ️ Note from localhost:8080: This reply is pending your approval. You can quickly accept it by liking, boosting or replying to it. You can also accept or reject it at the following link: <a href=\"http://localhost:8080/settings/user/interaction_requests/01J5QVXCCEATJYSXM9H6MZT4JR\" rel=\"noreferrer noopener nofollow\" target=\"_blank\">http://localhost:8080/settings/user/interaction_requests/01J5QVXCCEATJYSXM9H6MZT4JR</a>.</i></p>",
+  "content": "<p>Hi <span class=\"h-card\"><a href=\"http://localhost:8080/@1happyturtle\" class=\"u-url mention\" rel=\"nofollow noreferrer noopener\" target=\"_blank\">@<span>1happyturtle</span></a></span>, can I reply?</p><hr><p><i lang=\"en\">ℹ️ Note from localhost:8080: This reply is pending your approval. You can quickly accept it by liking, boosting or replying to it. You can also accept or reject it at the following link: <a href=\"http://localhost:8080/settings/user/interaction-requests/01J5QVXCCEATJYSXM9H6MZT4JR\" rel=\"noreferrer noopener nofollow\" target=\"_blank\">http://localhost:8080/settings/user/interaction-requests/01J5QVXCCEATJYSXM9H6MZT4JR</a>.</i></p>",
   "reblog": null,
   "application": {
     "name": "superseriousbusiness",

internal/typeutils/util.go

@@ -214,8 +214,8 @@ func (c *Converter) pendingReplyNote(
 		// Build the settings panel URL at which the user
 		// can view + approve/reject the interaction request.
 		//
-		// Eg., https://example.org/settings/user/interaction_requests/01J5QVXCCEATJYSXM9H6MZT4JR
-		settingsURL = proto + "://" + host + "/settings/user/interaction_requests/" + intReq.ID
+		// Eg., https://example.org/settings/user/interaction-requests/01J5QVXCCEATJYSXM9H6MZT4JR
+		settingsURL = proto + "://" + host + "/settings/user/interaction-requests/" + intReq.ID
 	)
 
 	var note strings.Builder

internal/web/about.go

@@ -54,11 +54,12 @@ func (m *Module) aboutGETHandler(c *gin.Context) {
 		Template:    "about.tmpl",
 		Instance:    instance,
 		OGMeta:      apiutil.OGBase(instance),
-		Stylesheets: []string{cssAbout},
+		Stylesheets: []string{},
 		Extra: map[string]any{
 			"showStrap":        true,
 			"blocklistExposed": config.GetInstanceExposeSuspendedWeb(),
 			"languages":        config.GetInstanceLanguages().DisplayStrs(),
+			"pageType":         "with-sidebar",
 		},
 	}
 

internal/web/domain-blocklist.go

@@ -67,7 +67,7 @@ func (m *Module) domainBlockListGETHandler(c *gin.Context) {
 		Template:    "domain-blocklist.tmpl",
 		Instance:    instance,
 		OGMeta:      apiutil.OGBase(instance),
-		Stylesheets: []string{cssFA},
+		Stylesheets: []string{},
 		Javascript:  []string{jsFrontend},
 		Extra:       map[string]any{"blocklist": domainBlocks},
 	}

internal/web/index.go

@@ -59,8 +59,8 @@ func (m *Module) indexHandler(c *gin.Context) {
 		Template:    "index.tmpl",
 		Instance:    instance,
 		OGMeta:      apiutil.OGBase(instance),
-		Stylesheets: []string{cssAbout, cssIndex},
-		Extra:       map[string]any{"showStrap": true},
+		Stylesheets: []string{},
+		Extra:       map[string]any{"showStrap": true, "largeHeader": true},
 	}
 
 	apiutil.TemplateWebPage(c, page)

internal/web/profile.go

@@ -132,18 +132,7 @@ func (m *Module) profileGETHandler(c *gin.Context) {
 	}
 
 	// Prepare stylesheets for profile.
-	stylesheets := make([]string, 0, 6)
-
-	// Basic profile stylesheets.
-	stylesheets = append(
-		stylesheets,
-		[]string{
-			cssFA,
-			cssStatus,
-			cssThread,
-			cssProfile,
-		}...,
-	)
+	stylesheets := make([]string, 0, 2)
 
 	// User-selected theme if set.
 	if theme := targetAccount.Theme; theme != "" {
@@ -167,6 +156,7 @@ func (m *Module) profileGETHandler(c *gin.Context) {
 		Javascript:  []string{jsFrontend},
 		Extra: map[string]any{
 			"account":          targetAccount,
+			"pageType":         "wider",
 			"rssFeed":          rssFeed,
 			"robotsMeta":       robotsMeta,
 			"statuses":         statusResp.Items,

internal/web/settings-panel.go

@@ -49,9 +49,6 @@ func (m *Module) SettingsPanelHandler(c *gin.Context) {
 		Template: "settings.tmpl",
 		Instance: instance,
 		Stylesheets: []string{
-			cssFA,
-			cssProfile, // Used for rendering stub/fake profiles.
-			cssStatus,  // Used for rendering stub/fake statuses.
 			cssSettings,
 		},
 		Javascript: []string{jsSettings},

internal/web/tag.go

@@ -59,7 +59,7 @@ func (m *Module) tagGETHandler(c *gin.Context) {
 		Template:    "tag.tmpl",
 		Instance:    instance,
 		OGMeta:      apiutil.OGBase(instance),
-		Stylesheets: []string{cssFA, cssThread, cssTag},
+		Stylesheets: []string{},
 		Extra:       map[string]any{"tagName": tagName},
 	}
 

internal/web/thread.go

@@ -115,17 +115,7 @@ func (m *Module) threadGETHandler(c *gin.Context) {
 	}
 
 	// Prepare stylesheets for thread.
-	stylesheets := make([]string, 0, 5)
-
-	// Basic thread stylesheets.
-	stylesheets = append(
-		stylesheets,
-		[]string{
-			cssFA,
-			cssStatus,
-			cssThread,
-		}...,
-	)
+	stylesheets := make([]string, 0, 2)
 
 	// User-selected theme if set.
 	if theme := targetAccount.Theme; theme != "" {

internal/web/web.go

@@ -58,14 +58,7 @@
 	eTagHeader            = "ETag"              // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag
 	lastModifiedHeader    = "Last-Modified"     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified
 
-	cssFA       = assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css"
-	cssAbout    = distPathPrefix + "/about.css"
-	cssIndex    = distPathPrefix + "/index.css"
-	cssStatus   = distPathPrefix + "/status.css"
-	cssThread   = distPathPrefix + "/thread.css"
-	cssProfile  = distPathPrefix + "/profile.css"
 	cssSettings = distPathPrefix + "/settings-style.css"
-	cssTag      = distPathPrefix + "/tag.css"
 
 	jsFrontend = distPathPrefix + "/frontend.js" // Progressive enhancement frontend JS.
 	jsSettings = distPathPrefix + "/settings.js" // Settings panel React application.

vendor/golang.org/x/oauth2/README.md

@@ -5,15 +5,6 @@
 
 oauth2 package contains a client implementation for OAuth 2.0 spec.
 
-## Installation
-
-~~~~
-go get golang.org/x/oauth2
-~~~~
-
-Or you can manually git clone the repository to
-`$(go env GOPATH)/src/golang.org/x/oauth2`.
-
 See pkg.go.dev for further documentation and examples.
 
 * [pkg.go.dev/golang.org/x/oauth2](https://pkg.go.dev/golang.org/x/oauth2)
@@ -33,7 +24,11 @@ The main issue tracker for the oauth2 repository is located at
 https://github.com/golang/oauth2/issues.
 
 This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html. In particular:
+this repository, see https://go.dev/doc/contribute.
+
+The git repository is https://go.googlesource.com/oauth2.
+
+Note:
 
 * Excluding trivial changes, all contributions should be connected to an existing issue.
 * API changes must go through the [change proposal process](https://go.dev/s/proposal-process) before they can be accepted.

vendor/modules.txt

@@ -1116,7 +1116,7 @@ golang.org/x/net/ipv6
 golang.org/x/net/proxy
 golang.org/x/net/publicsuffix
 golang.org/x/net/trace
-# golang.org/x/oauth2 v0.23.0
+# golang.org/x/oauth2 v0.24.0
 ## explicit; go 1.18
 golang.org/x/oauth2
 golang.org/x/oauth2/internal

web/assets/Fork-Awesome/CONTRIBUTORS.md

@@ -1,195 +0,0 @@
-# ForkAwesome Community
-
-This is a list of people who made this project possible, whether they contributed to FontAwesome before or to ForkAwesome since. We are trying hard to recognize all types of contributions. So if you feel you have been left out and should be mentioned here, please accept our apology and [write us a message](https://github.com/ForkAwesome/Fork-Awesome/issues/new) about it. We'll fix this as soon as possible.
-
-## Contributors
-
-Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tr>
-    <td align="center"><a href="https://github.com/davegandy"><img src="https://avatars0.githubusercontent.com/u/1076721?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dave Gandy</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=davegandy" title="Code">💻</a> <a href="#design-davegandy" title="Design">🎨</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=davegandy" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://www.talbs.me"><img src="https://avatars3.githubusercontent.com/u/163763?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Brian Talbot</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=talbs" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/supercodepoet"><img src="https://avatars1.githubusercontent.com/u/249366?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Travis Chase</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=supercodepoet" title="Code">💻</a></td>
-    <td align="center"><a href="http://robmadole.com"><img src="https://avatars2.githubusercontent.com/u/132895?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Rob Madole</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=robmadole" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/tagliala"><img src="https://avatars2.githubusercontent.com/u/556268?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Geremia Taglialatela</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tagliala" title="Documentation">📖</a> <a href="#question-tagliala" title="Answering Questions">💬</a></td>
-    <td align="center"><a href="https://mathiasbynens.be/"><img src="https://avatars1.githubusercontent.com/u/81942?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Mathias Bynens</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=mathiasbynens" title="Code">💻</a></td>
-    <td align="center"><a href="https://redwill.se/"><img src="https://avatars0.githubusercontent.com/u/6705160?v=4?s=50" width="50px;" alt=""/><br /><sub><b>William Boman</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=williamboman" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://kretschmann.io"><img src="https://avatars1.githubusercontent.com/u/90316?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Matthias Kretschmann</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=kremalicious" title="Code">💻</a></td>
-    <td align="center"><a href="https://about.me/anahkiasen"><img src="https://avatars3.githubusercontent.com/u/1321596?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Maxime Fabre</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=Anahkiasen" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.splintered.co.uk"><img src="https://avatars1.githubusercontent.com/u/895831?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Patrick H. Lauke</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=patrickhlauke" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://danstroot.com"><img src="https://avatars1.githubusercontent.com/u/1438457?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dan Stroot</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=dstroot" title="Code">💻</a></td>
-    <td align="center"><a href="http://lightguard-jp.blogspot.com"><img src="https://avatars0.githubusercontent.com/u/29971?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jason Porter</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=LightGuard" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/tomByrer"><img src="https://avatars2.githubusercontent.com/u/1308419?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Tom Byrer</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tomByrer" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://readme.io"><img src="https://avatars3.githubusercontent.com/u/381393?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Gregory Koberger</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=gkoberger" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://kevinkirsche.com"><img src="https://avatars1.githubusercontent.com/u/947110?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Kevin Kirsche</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=kkirsche" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://marcus.bointon.com/"><img src="https://avatars2.githubusercontent.com/u/81561?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Marcus Bointon</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=Synchro" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/njb-said"><img src="https://avatars2.githubusercontent.com/u/2371386?v=4?s=50" width="50px;" alt=""/><br /><sub><b>njb_said</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=njb-said" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://ajacevedo.com"><img src="https://avatars1.githubusercontent.com/u/953092?v=4?s=50" width="50px;" alt=""/><br /><sub><b>AJ Acevedo</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=AJ-Acevedo" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://akx.github.io/"><img src="https://avatars2.githubusercontent.com/u/58669?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Aarni Koskela</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=akx" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/scudco"><img src="https://avatars1.githubusercontent.com/u/3806?v=4?s=50" width="50px;" alt=""/><br /><sub><b>scudco</b></sub></a><br /><a href="#tool-scudco" title="Tools">🔧</a></td>
-    <td align="center"><a href="https://alfioemanuele.io"><img src="https://avatars1.githubusercontent.com/u/621062?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Alfio Emanuele</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=AlfioEmanueleFresta" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://andy-carter.com"><img src="https://avatars3.githubusercontent.com/u/357623?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Andy Carter</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=drmonkeyninja" title="Code">💻</a></td>
-    <td align="center"><a href="https://andyfreeland.net"><img src="https://avatars2.githubusercontent.com/u/237005?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Andy Freeland</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Arouge8" title="Bug reports">🐛</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=rouge8" title="Code">💻</a></td>
-    <td align="center"><a href="http://owen.com.br"><img src="https://avatars1.githubusercontent.com/u/1490347?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Antério Vieira</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=anteriovieira" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/araratm"><img src="https://avatars1.githubusercontent.com/u/8832594?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ararat</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=araratm" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/bengadbois"><img src="https://avatars2.githubusercontent.com/u/1879785?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ben Gadbois</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=bengadbois" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/wazoo"><img src="https://avatars0.githubusercontent.com/u/216878?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ben Thomas</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=wazoo" title="Code">💻</a></td>
-    <td align="center"><a href="http://bradleycbuchanan.com"><img src="https://avatars0.githubusercontent.com/u/1615761?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Brad Buchanan</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=islemaster" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://bsara.pro"><img src="https://avatars0.githubusercontent.com/u/3743423?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Brandon Sarà</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=bsara" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://vuii.co.uk"><img src="https://avatars0.githubusercontent.com/u/4213522?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Bryan Channon</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=Vusys" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/cauethenorio"><img src="https://avatars3.githubusercontent.com/u/496987?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Cauê Thenório</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=cauethenorio" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/MacroChip"><img src="https://avatars1.githubusercontent.com/u/5069304?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Chip Thien</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=MacroChip" title="Code">💻</a></td>
-    <td align="center"><a href="http://hurtubise.me"><img src="https://avatars0.githubusercontent.com/u/610237?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dane Hurtubise</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=hurtubise" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://curiousdannii.github.io/"><img src="https://avatars2.githubusercontent.com/u/59074?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dannii Willis</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=curiousdannii" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/kant"><img src="https://avatars1.githubusercontent.com/u/32717?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Darío Hereñú</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=kant" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://davidcel.is/"><img src="https://avatars3.githubusercontent.com/u/36873?v=4?s=50" width="50px;" alt=""/><br /><sub><b>David Celis</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=davidcelis" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://derekmyers.com"><img src="https://avatars3.githubusercontent.com/u/207171?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Derek Myers</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Admyers" title="Bug reports">🐛</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=dmyers" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://preaction.me"><img src="https://avatars0.githubusercontent.com/u/53707?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Doug Bell</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=preaction" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://www.blokspeed.net"><img src="https://avatars0.githubusercontent.com/u/461752?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Eelke Blok</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=eelkeblok" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/glensc"><img src="https://avatars1.githubusercontent.com/u/199095?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Elan Ruusamäe</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=glensc" title="Code">💻</a></td>
-    <td align="center"><a href="https://ericwbailey.design/"><img src="https://avatars3.githubusercontent.com/u/634191?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Eric Bailey</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=ericwbailey" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://ferhat.elmasgunes.net"><img src="https://avatars0.githubusercontent.com/u/13179128?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ferhat Elmasgüneş</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=ferhate" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/fredj"><img src="https://avatars0.githubusercontent.com/u/100959?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Frédéric Junod</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Afredj" title="Bug reports">🐛</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=fredj" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://gjcampbell.co.uk/"><img src="https://avatars1.githubusercontent.com/u/2829600?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Graham Campbell</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=GrahamCampbell" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://grahamwalters.me"><img src="https://avatars2.githubusercontent.com/u/1072751?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Graham Walters</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=GrahamWalters" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://www.tripl.de"><img src="https://avatars2.githubusercontent.com/u/816859?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Hendrik Kleinwaechter</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=hendricius" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/ikourfaln"><img src="https://avatars3.githubusercontent.com/u/9744226?v=4?s=50" width="50px;" alt=""/><br /><sub><b>IKOURFALN Slimane</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Aikourfaln" title="Bug reports">🐛</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=ikourfaln" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jwilk"><img src="https://avatars2.githubusercontent.com/u/141546?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jakub Wilk</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jwilk" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/jjlharrison"><img src="https://avatars0.githubusercontent.com/u/242337?v=4?s=50" width="50px;" alt=""/><br /><sub><b>James Harrison</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jjlharrison" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/james-johnston-thumbtack"><img src="https://avatars3.githubusercontent.com/u/22308682?v=4?s=50" width="50px;" alt=""/><br /><sub><b>James Johnston</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=james-johnston-thumbtack" title="Code">💻</a></td>
-    <td align="center"><a href="http://honzi.cz"><img src="https://avatars2.githubusercontent.com/u/3666887?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jan Hořava</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=honzi" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://jaredforsyth.com"><img src="https://avatars3.githubusercontent.com/u/112170?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jared Forsyth</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jaredly" title="Code">💻</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jaredly" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://jerodsanto.net"><img src="https://avatars0.githubusercontent.com/u/8212?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jerod Santo</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jerodsanto" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://jina.me"><img src="https://avatars3.githubusercontent.com/u/53273?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jina Anne</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jina" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://jocelyn.delalande.fr"><img src="https://avatars0.githubusercontent.com/u/429633?v=4?s=50" width="50px;" alt=""/><br /><sub><b>JocelynDelalande</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=JocelynDelalande" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://jhope.ie"><img src="https://avatars0.githubusercontent.com/u/39089?v=4?s=50" width="50px;" alt=""/><br /><sub><b>John Hope</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=JonMidhir" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/josdea"><img src="https://avatars1.githubusercontent.com/u/13952477?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Josh Dean</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=josdea" title="Code">💻</a></td>
-    <td align="center"><a href="http://reactrocket.com"><img src="https://avatars1.githubusercontent.com/u/1188186?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Julian Krispel-Samsel</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=juliankrispel" title="Code">💻</a></td>
-    <td align="center"><a href="http://about.me/leeleathers"><img src="https://avatars3.githubusercontent.com/u/591833?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Lee Leathers</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=theoreticaLee" title="Code">💻</a></td>
-    <td align="center"><a href="http://leniel.net"><img src="https://avatars2.githubusercontent.com/u/764854?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Leniel Macaferi</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=leniel" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://macmladen.com"><img src="https://avatars2.githubusercontent.com/u/572289?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Mladen Đurić</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=macmladen" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://www.martinseeler.com"><img src="https://avatars0.githubusercontent.com/u/1043838?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Martin Seeler</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=MartinSeeler" title="Code">💻</a></td>
-    <td align="center"><a href="http://sigo.pl/"><img src="https://avatars2.githubusercontent.com/u/321881?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Mateusz Jagiełło</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Asigo" title="Bug reports">🐛</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://www.softwarebymatt.com"><img src="https://avatars3.githubusercontent.com/u/736870?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Matt Smith</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Amtscout6" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/gurisko"><img src="https://avatars2.githubusercontent.com/u/495549?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Matus Gura</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=gurisko" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/jibbajabba"><img src="https://avatars1.githubusercontent.com/u/117222?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Michael Angeles</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jibbajabba" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://nielsenramon.com/"><img src="https://avatars3.githubusercontent.com/u/1246672?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nielsen Ramon</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=nielsenramon" title="Code">💻</a></td>
-    <td align="center"><a href="https://hejnoah.com"><img src="https://avatars1.githubusercontent.com/u/1944410?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Noah Doersing</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=doersino" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/paulftw"><img src="https://avatars1.githubusercontent.com/u/769142?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Paul Korzhyk</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=paulftw" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://www.peterdavehello.org/"><img src="https://avatars3.githubusercontent.com/u/3691490?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Peter Dave Hello</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=PeterDaveHello" title="Documentation">📖</a> <a href="#platform-PeterDaveHello" title="Packaging/porting to new platform">📦</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://about.me/peterdehaan"><img src="https://avatars2.githubusercontent.com/u/557895?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Peter deHaan</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=pdehaan" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://www.StylifyYourBlog.com/"><img src="https://avatars2.githubusercontent.com/u/829526?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Prayag Verma </b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=pra85" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://twitter.com/ReadmeCritic"><img src="https://avatars3.githubusercontent.com/u/15367484?v=4?s=50" width="50px;" alt=""/><br /><sub><b>ReadmeCritic</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=ReadmeCritic" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://ricardopolo.co/"><img src="https://avatars3.githubusercontent.com/u/1263856?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ricardo Polo</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=ricardopolo" title="Code">💻</a></td>
-    <td align="center"><a href="http://ryan.mcgeary.org"><img src="https://avatars0.githubusercontent.com/u/740?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ryan McGeary</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=rmm5t" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/rriggin"><img src="https://avatars1.githubusercontent.com/u/125998?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ryan Riggin</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=rriggin" title="Code">💻</a></td>
-    <td align="center"><a href="http://ryansenkbeil.com"><img src="https://avatars2.githubusercontent.com/u/881590?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ryan Senkbeil</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=rsenk330" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://sarangjo.github.io"><img src="https://avatars1.githubusercontent.com/u/1961007?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Sarang Joshi</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=sarangjo" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://twitter.com/scott_ish"><img src="https://avatars3.githubusercontent.com/u/1044670?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Scott Cranfill</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=Scotchester" title="Code">💻</a></td>
-    <td align="center"><a href="http://TheJaredWilcurt.com"><img src="https://avatars1.githubusercontent.com/u/4629794?v=4?s=50" width="50px;" alt=""/><br /><sub><b>The Jared Wilcurt</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=TheJaredWilcurt" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/tagCincy"><img src="https://avatars0.githubusercontent.com/u/308290?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Tim Guibord</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tagCincy" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mazurva"><img src="https://avatars1.githubusercontent.com/u/1152567?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Vadim Mazur</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=mazurva" title="Code">💻</a></td>
-    <td align="center"><a href="https://vinsonchuong.net"><img src="https://avatars2.githubusercontent.com/u/382608?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Vinson Chuong</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=vinsonchuong" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/grvrg"><img src="https://avatars3.githubusercontent.com/u/34144858?v=4?s=50" width="50px;" alt=""/><br /><sub><b>grvrg</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=grvrg" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/luke83"><img src="https://avatars0.githubusercontent.com/u/77144?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Luca Trevisani</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=luke83" title="Code">💻</a></td>
-    <td align="center"><a href="http://alvarotrigo.com"><img src="https://avatars3.githubusercontent.com/u/1706326?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Álvaro</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=alvarotrigo" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://xuv.be"><img src="https://avatars3.githubusercontent.com/u/192539?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Julien Deswaef</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=xuv" title="Code">💻</a> <a href="#design-xuv" title="Design">🎨</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=xuv" title="Documentation">📖</a> <a href="#question-xuv" title="Answering Questions">💬</a></td>
-    <td align="center"><a href="https://github.com/n8willis"><img src="https://avatars0.githubusercontent.com/u/2192132?v=4?s=50" width="50px;" alt=""/><br /><sub><b>n8willis</b></sub></a><br /><a href="#ideas-n8willis" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://wintermute.org/brendan"><img src="https://avatars0.githubusercontent.com/u/1779453?v=4?s=50" width="50px;" alt=""/><br /><sub><b>B. Howell</b></sub></a><br /><a href="#ideas-brendanhowell" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://runeman.org"><img src="https://avatars2.githubusercontent.com/u/1197187?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Algot Runeman</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=algotruneman" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://micahilbery.com/"><img src="https://avatars0.githubusercontent.com/u/10608836?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Micah Ilbery</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=micahilbery" title="Documentation">📖</a> <a href="#design-micahilbery" title="Design">🎨</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://evermeet.cx"><img src="https://avatars3.githubusercontent.com/u/223439?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Helmut K. C. Tessarek</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tessus" title="Documentation">📖</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tessus" title="Code">💻</a> <a href="#design-tessus" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/jeromelebleu"><img src="https://avatars0.githubusercontent.com/u/3597194?v=4?s=50" width="50px;" alt=""/><br /><sub><b>jeromelebleu</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=jeromelebleu" title="Code">💻</a></td>
-    <td align="center"><a href="https://zick.kim/"><img src="https://avatars3.githubusercontent.com/u/630909?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Kimberly Zick</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=rummik" title="Documentation">📖</a></td>
-    <td align="center"><a href="http://blog.niqnutn.com/"><img src="https://avatars2.githubusercontent.com/u/13441278?v=4?s=50" width="50px;" alt=""/><br /><sub><b>nIQnutn</b></sub></a><br /><a href="#blog-nIQnutn" title="Blogposts">📝</a> <a href="#plugin-nIQnutn" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="https://github.com/leosuncin"><img src="https://avatars1.githubusercontent.com/u/4307697?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jaime Leonardo Suncin Cruz</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=leosuncin" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://www.enkisoftware.com"><img src="https://avatars0.githubusercontent.com/u/1770233?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Juliette Foucaut</b></sub></a><br /><a href="#plugin-juliettef" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="http://quad.moe/"><img src="https://avatars1.githubusercontent.com/u/6379091?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dominik V. Salonen</b></sub></a><br /><a href="#blog-QuadPiece" title="Blogposts">📝</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://alexandreviau.net"><img src="https://avatars2.githubusercontent.com/u/2706882?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Alexandre Viau</b></sub></a><br /><a href="#ideas-aviau" title="Ideas, Planning, & Feedback">🤔</a> <a href="#platform-aviau" title="Packaging/porting to new platform">📦</a></td>
-    <td align="center"><a href="http://xesau.eu/"><img src="https://avatars3.githubusercontent.com/u/7915413?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Xesau</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3AXesau" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://janhohner.de"><img src="https://avatars0.githubusercontent.com/u/649895?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jan Hohner</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Ajanhohner" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://fonts.google.com"><img src="https://avatars0.githubusercontent.com/u/261579?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Dave Crossland</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/pulls?q=is%3Apr+reviewed-by%3Adavelab6" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="http://maxcubing.wordpress.com"><img src="https://avatars0.githubusercontent.com/u/8260834?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Maximilian Berkmann</b></sub></a><br /><a href="#ideas-Berkmann18" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://heiber.im"><img src="https://avatars2.githubusercontent.com/u/616813?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Moritz Heiber</b></sub></a><br /><a href="#infra-moritzheiber" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-    <td align="center"><a href="http://www.wezm.net/"><img src="https://avatars1.githubusercontent.com/u/21787?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Wesley Moore</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=wezm" title="Documentation">📖</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://www.jerrykan.com/"><img src="https://avatars0.githubusercontent.com/u/377632?v=4?s=50" width="50px;" alt=""/><br /><sub><b>John Kristensen</b></sub></a><br /><a href="#design-jerrykan" title="Design">🎨</a></td>
-    <td align="center"><a href="https://amusewiki.org"><img src="https://avatars3.githubusercontent.com/u/130971?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Marco</b></sub></a><br /><a href="#design-melmothx" title="Design">🎨</a></td>
-    <td align="center"><a href="https://whitefusion.io"><img src="https://avatars1.githubusercontent.com/u/658496?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Jared White</b></sub></a><br /><a href="#content-jaredcwhite" title="Content">🖋</a></td>
-    <td align="center"><a href="http://waldyrious.github.io"><img src="https://avatars2.githubusercontent.com/u/478237?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Waldir Pimenta</b></sub></a><br /><a href="#content-waldyrious" title="Content">🖋</a></td>
-    <td align="center"><a href="https://vanokhin.com/"><img src="https://avatars3.githubusercontent.com/u/1898673?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Vladimir Anokhin</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=vanokhin" title="Code">💻</a></td>
-    <td align="center"><a href="http://maxlath.eu"><img src="https://avatars2.githubusercontent.com/u/1596934?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Maxime Lathuilière</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=maxlath" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/araratthehero"><img src="https://avatars1.githubusercontent.com/u/8832594?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ararat</b></sub></a><br /><a href="#content-araratthehero" title="Content">🖋</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="http://wake.st"><img src="https://avatars2.githubusercontent.com/u/7890201?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Liaizon Wakest</b></sub></a><br /><a href="#ideas-wakest" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="http://fedidat.com/"><img src="https://avatars2.githubusercontent.com/u/1108409?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Ben Fedidat</b></sub></a><br /><a href="#blog-fedidat" title="Blogposts">📝</a></td>
-    <td align="center"><a href="https://www.eidson.info"><img src="https://avatars0.githubusercontent.com/u/954092?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Todd Eidson</b></sub></a><br /><a href="#ideas-eidsonator" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=eidsonator" title="Documentation">📖</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Aeidsonator" title="Bug reports">🐛</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=eidsonator" title="Code">💻</a></td>
-    <td align="center"><a href="https://www.lucaspetter.com"><img src="https://avatars0.githubusercontent.com/u/13027535?v=4?s=50" width="50px;" alt=""/><br /><sub><b>lucaspetter</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=lucaspetter" title="Code">💻</a> <a href="#design-lucaspetter" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/dyamon"><img src="https://avatars0.githubusercontent.com/u/6771224?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Federico Igne</b></sub></a><br /><a href="#design-dyamon" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/qwazix"><img src="https://avatars0.githubusercontent.com/u/1202892?v=4?s=50" width="50px;" alt=""/><br /><sub><b>qwazix</b></sub></a><br /><a href="#design-qwazix" title="Design">🎨</a></td>
-    <td align="center"><a href="http://bthierry.pages.math.cnrs.fr/"><img src="https://avatars0.githubusercontent.com/u/5602767?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Bertrand Thierry</b></sub></a><br /><a href="#design-Bertbk" title="Design">🎨</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/xxsimoxx"><img src="https://avatars0.githubusercontent.com/u/29772709?v=4?s=50" width="50px;" alt=""/><br /><sub><b>SIMONE FIORAVANTI</b></sub></a><br /><a href="#design-xxsimoxx" title="Design">🎨</a></td>
-    <td align="center"><a href="http://samuelriversmoore.net"><img src="https://avatars0.githubusercontent.com/u/2640748?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Samuel Rivers-Moore</b></sub></a><br /><a href="#ideas-SamuelRiversMoore" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://github.com/pattishih"><img src="https://avatars1.githubusercontent.com/u/16858138?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Patti</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=pattishih" title="Code">💻</a></td>
-    <td align="center"><a href="https://blog.feld.me"><img src="https://avatars1.githubusercontent.com/u/40271278?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Mark Felder</b></sub></a><br /><a href="#ideas-feld" title="Ideas, Planning, & Feedback">🤔</a></td>
-    <td align="center"><a href="https://hugo.pro"><img src="https://avatars3.githubusercontent.com/u/180032?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Hugo Locurcio</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=Calinou" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/tintincastro"><img src="https://avatars0.githubusercontent.com/u/25725603?v=4?s=50" width="50px;" alt=""/><br /><sub><b>tintincastro</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tintincastro" title="Code">💻</a> <a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=tintincastro" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/diondresschers"><img src="https://avatars0.githubusercontent.com/u/3883936?v=4?s=50" width="50px;" alt=""/><br /><sub><b>diondresschers</b></sub></a><br /><a href="#design-diondresschers" title="Design">🎨</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/DougInAMug"><img src="https://avatars.githubusercontent.com/u/13798767?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Doug Webb</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/commits?author=DougInAMug" title="Documentation">📖</a> <a href="#ideas-DougInAMug" title="Ideas, Planning, & Feedback">🤔</a> <a href="#projectManagement-DougInAMug" title="Project Management">📆</a> <a href="#userTesting-DougInAMug" title="User Testing">📓</a></td>
-    <td align="center"><a href="https://nikospapagiannopoulos.com"><img src="https://avatars.githubusercontent.com/u/645895?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Nikos Papagiannopoulos</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/pulls?q=is%3Apr+reviewed-by%3Apanigrc" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://thomasbnt.dev"><img src="https://avatars.githubusercontent.com/u/14293805?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Thomasbnt.dev</b></sub></a><br /><a href="#design-thomasbnt" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/mrdrogdrog"><img src="https://avatars.githubusercontent.com/u/6124140?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Tilman Vatteroth</b></sub></a><br /><a href="#design-mrdrogdrog" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/seanking2919"><img src="https://avatars.githubusercontent.com/u/31253278?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Sean King</b></sub></a><br /><a href="#design-seanking2919" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/SlrG"><img src="https://avatars.githubusercontent.com/u/978967?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Michael Wehr</b></sub></a><br /><a href="#design-SlrG" title="Design">🎨</a></td>
-    <td align="center"><a href="https://github.com/aguragorn"><img src="https://avatars.githubusercontent.com/u/3759189?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Edward Remo</b></sub></a><br /><a href="#design-aguragorn" title="Design">🎨</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://codeberg.org"><img src="https://avatars.githubusercontent.com/u/67550725?v=4?s=50" width="50px;" alt=""/><br /><sub><b>n</b></sub></a><br /><a href="#design-n194" title="Design">🎨</a></td>
-    <td align="center"><a href="http://alexgleason.me"><img src="https://avatars.githubusercontent.com/u/3639540?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Alex Gleason</b></sub></a><br /><a href="https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Aalexgleason" title="Bug reports">🐛</a></td>
-  </tr>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

web/assets/Fork-Awesome/LICENSES

@@ -1,452 +0,0 @@
-/!\ The MIT License only applies to all CSS and LESS files in the following
-directories: fork-awesome/css/, fork-awesome/less/, and fork-awesome/scss/.
-
-MIT License
-
-Copyright (c) 2018 Dave Gandy & Fork Awesome
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-*******************************************************************************
-
-/!\ The Creative Commons Attribution 3.0 Unported License applies to all Fork
-Awesome project files that are not a part of the Font or Code licenses.
-
-Creative Commons Legal Code
-
-Attribution 3.0 Unported
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
-    DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(f) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work or Adaptation, as appropriate, through sale or
-    other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
-    including any translation in any medium, takes reasonable steps to
-    clearly label, demarcate or otherwise identify that changes were made
-    to the original Work. For example, a translation could be marked "The
-    original work was translated from English to Spanish," or a
-    modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
- e. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor waives the
-        exclusive right to collect such royalties for any exercise by You
-        of the rights granted under this License; and,
-   iii. Voluntary License Schemes. The Licensor waives the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(b), as requested. If You create an
-    Adaptation, upon notice from any Licensor You must, to the extent
-    practicable, remove from the Adaptation any credit as required by
-    Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or any Adaptations or
-    Collections, You must, unless a request has been made pursuant to
-    Section 4(a), keep intact all copyright notices for the Work and
-    provide, reasonable to the medium or means You are utilizing: (i) the
-    name of the Original Author (or pseudonym, if applicable) if supplied,
-    and/or if the Original Author and/or Licensor designate another party
-    or parties (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work;
-    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-    a credit identifying the use of the Work in the Adaptation (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay
-    based on original Work by Original Author"). The credit required by
-    this Section 4 (b) may be implemented in any reasonable manner;
-    provided, however, that in the case of a Adaptation or Collection, at
-    a minimum such credit will appear, if a credit for all contributing
-    authors of the Adaptation or Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Adaptations or Collections, You must not distort, mutilate, modify or
-    take other derogatory action in relation to the Work which would be
-    prejudicial to the Original Author's honor or reputation. Licensor
-    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-    of the right granted in Section 3(b) of this License (the right to
-    make Adaptations) would be deemed to be a distortion, mutilation,
-    modification or other derogatory action prejudicial to the Original
-    Author's honor and reputation, the Licensor will waive or not assert,
-    as appropriate, this Section, to the fullest extent permitted by the
-    applicable national law, to enable You to reasonably exercise Your
-    right under Section 3(b) of this License (right to make Adaptations)
-    but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Adaptations or Collections
-    from You under this License, however, will not have their licenses
-    terminated provided such individuals or entities remain in full
-    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-    survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    offers to the recipient a license to the original Work on the same
-    terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- d. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at https://creativecommons.org/.
-
-*******************************************************************************
-
-/!\ The SIL OPEN FONT LICENSE applies to all desktop and webfont files in the
-following directory: fonts/ and to all glyphs and SVG files in the following
-directory: src/icons/svg/.
-
-
-Copyright (c) 2018, Fork Awesome (https://forkawesome.github.io),
-with Reserved Font Name Fork Awesome.
-
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

web/assets/Fork-Awesome/css/v5-compat.css

@@ -1,446 +0,0 @@
-/*!
-Fork Awesome 1.2.0
-License - https://forkaweso.me/Fork-Awesome/license
-
-Copyright 2018 Dave Gandy & Fork Awesome
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-.fas,
-.fab,
-.far {
-  display: inline-block;
-  font: normal normal normal 14px/1 ForkAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.fas.fa-chart-area:before {
-  content: "\f1fe";
-}
-.fas.fa-arrows-alt:before {
-  content: "\f047";
-}
-.fas.fa-expand-arrows-alt:before {
-  content: "\f0b2";
-}
-.fas.fa-arrows-alt-h:before {
-  content: "\f07e";
-}
-.fas.fa-arrows-alt-v:before {
-  content: "\f07d";
-}
-.fas.fa-calendar-alt:before {
-  content: "\f073";
-}
-.fas.fa-circle-notch:before {
-  content: "\f1ce";
-}
-.fas.fa-cloud-download-alt:before {
-  content: "\f0ed";
-}
-.fas.fa-cloud-upload-alt:before {
-  content: "\f0ee";
-}
-.fas.fa-credit-card:before {
-  content: "\f283";
-}
-.fas.fa-dollar-sign:before {
-  content: "\f155";
-}
-.fas.fa-euro-sign:before {
-  content: "\f153";
-}
-.fas.fa-exchange-alt:before {
-  content: "\f0ec";
-}
-.fas.fa-external-link-alt:before {
-  content: "\f08e";
-}
-.fas.fa-external-link-square-alt:before {
-  content: "\f14c";
-}
-.fas.fa-eye-dropper:before {
-  content: "\f1fb";
-}
-.fas.fa-pound-sign:before {
-  content: "\f154";
-}
-.fas.fa-glass-martini:before {
-  content: "\f000";
-}
-.fas.fa-shekel-sign:before {
-  content: "\f20b";
-}
-.fas.fa-rupee-sign:before {
-  content: "\f156";
-}
-.fas.fa-won-sign:before {
-  content: "\f159";
-}
-.fas.fa-level-down-alt:before {
-  content: "\f149";
-}
-.fas.fa-level-up-alt:before {
-  content: "\f148";
-}
-.fas.fa-chart-line:before {
-  content: "\f201";
-}
-.fas.fa-long-arrow-alt-down:before {
-  content: "\f175";
-}
-.fas.fa-long-arrow-alt-left:before {
-  content: "\f177";
-}
-.fas.fa-long-arrow-alt-right:before {
-  content: "\f178";
-}
-.fas.fa-long-arrow-alt-up:before {
-  content: "\f176";
-}
-.fas.fa-map-marker-alt:before {
-  content: "\f041";
-}
-.fas.fa-mobile-alt:before {
-  content: "\f10b";
-}
-.fas.fa-pencil-alt:before {
-  content: "\f040";
-}
-.fas.fa-pen-square:before {
-  content: "\f14b";
-}
-.fas.fa-chart-pie:before {
-  content: "\f200";
-}
-.fas.fa-yen-sign:before {
-  content: "\f157";
-}
-.fas.fa-ruble-sign:before {
-  content: "\f158";
-}
-.fas.fa-shield-alt:before {
-  content: "\f132";
-}
-.fas.fa-sign-in-alt:before {
-  content: "\f090";
-}
-.fas.fa-sign-out-alt:before {
-  content: "\f08b";
-}
-.fas.fa-sliders-h:before {
-  content: "\f1de";
-}
-.fas.fa-tablet-alt:before {
-  content: "\f10a";
-}
-.fas.fa-tachometer-alt:before {
-  content: "\f0e4";
-}
-.fas.fa-thumbtack:before {
-  content: "\f08d";
-}
-.fas.fa-ticket-alt:before {
-  content: "\f145";
-}
-.fas.fa-trash-alt:before {
-  content: "\f1f8";
-}
-.fas.fa-lira-sign:before {
-  content: "\f195";
-}
-.fab.fa-linkedin-in:before {
-  content: "\fe01";
-}
-.fab.fa-linkedin:before {
-  content: "\f08c";
-}
-.far.fa-address-book:before {
-  content: "\f2ba";
-}
-.far.fa-address-card:before {
-  content: "\f2bc";
-}
-.far.fa-arrow-alt-circle-down:before {
-  content: "\f01a";
-}
-.far.fa-arrow-alt-circle-left:before {
-  content: "\f190";
-}
-.far.fa-arrow-alt-circle-right:before {
-  content: "\f18e";
-}
-.far.fa-arrow-alt-circle-up:before {
-  content: "\f01b";
-}
-.far.fa-bell:before {
-  content: "\f0f3";
-}
-.far.fa-bell-slash:before {
-  content: "\f1f7";
-}
-.far.fa-bookmark:before {
-  content: "\f097";
-}
-.far.fa-building:before {
-  content: "\f0f7";
-}
-.far.fa-calendar-check:before {
-  content: "\f274";
-}
-.far.fa-calendar-minus:before {
-  content: "\f272";
-}
-.far.fa-calendar:before {
-  content: "\f133";
-}
-.far.fa-calendar-plus:before {
-  content: "\f271";
-}
-.far.fa-calendar-times:before {
-  content: "\f273";
-}
-.far.fa-caret-square-down:before {
-  content: "\f150";
-}
-.far.fa-caret-square-left:before {
-  content: "\f191";
-}
-.far.fa-caret-square-right:before {
-  content: "\f152";
-}
-.far.fa-caret-square-up:before {
-  content: "\f151";
-}
-.far.fa-check-circle:before {
-  content: "\f05d";
-}
-.far.fa-check-square:before {
-  content: "\f046";
-}
-.far.fa-circle:before {
-  content: "\f10c";
-}
-.far.fa-clock:before {
-  content: "\f017";
-}
-.far.fa-comment:before {
-  content: "\f0e5";
-}
-.far.fa-comment-dots:before {
-  content: "\f27b";
-}
-.far.fa-comments:before {
-  content: "\f0e6";
-}
-.far.fa-dot-circle:before {
-  content: "\f192";
-}
-.far.fa-id-card:before {
-  content: "\f2c3";
-}
-.far.fa-envelope:before {
-  content: "\f003";
-}
-.far.fa-envelope-open:before {
-  content: "\f2b7";
-}
-.far.fa-file-archive:before {
-  content: "\f1c6";
-}
-.far.fa-file-audio:before {
-  content: "\f1c7";
-}
-.far.fa-file-code:before {
-  content: "\f1c9";
-}
-.far.fa-file-excel:before {
-  content: "\f1c3";
-}
-.far.fa-file-image:before {
-  content: "\f1c5";
-}
-.far.fa-file-video:before {
-  content: "\f1c8";
-}
-.far.fa-copy:before,
-.far.fa-file:before {
-  content: "\f016";
-}
-.far.fa-file-pdf:before {
-  content: "\f1c1";
-}
-.far.fa-file-powerpoint:before {
-  content: "\f1c4";
-}
-.far.fa-file-alt:before {
-  content: "\f0f6";
-}
-.far.fa-file-word:before {
-  content: "\f1c2";
-}
-.far.fa-flag:before {
-  content: "\f11d";
-}
-.far.fa-save:before {
-  content: "\f0c7";
-}
-.far.fa-folder:before {
-  content: "\f114";
-}
-.far.fa-folder-open:before {
-  content: "\f115";
-}
-.far.fa-frown:before {
-  content: "\f119";
-}
-.far.fa-futbol:before {
-  content: "\f1e3";
-}
-.far.fa-hand-rock:before {
-  content: "\f255";
-}
-.far.fa-hand-lizard:before {
-  content: "\f258";
-}
-.far.fa-hand-point-down:before {
-  content: "\f0a7";
-}
-.far.fa-hand-point-left:before {
-  content: "\f0a5";
-}
-.far.fa-hand-point-right:before {
-  content: "\f0a4";
-}
-.far.fa-hand-point-up:before {
-  content: "\f0a6";
-}
-.far.fa-hand-paper:before {
-  content: "\256";
-}
-.far.fa-hand-pointer:before {
-  content: "\f25a";
-}
-.far.fa-hand-scissors:before {
-  content: "\f257";
-}
-.far.fa-hand-spock:before {
-  content: "\f259";
-}
-.far.fa-handshake:before {
-  content: "\f2b5";
-}
-.far.fa-hdd:before {
-  content: "\f0a0";
-}
-.far.fa-heart:before {
-  content: "\f08a";
-}
-.far.fa-hospital:before {
-  content: "\f0f8";
-}
-.far.fa-hourglass:before {
-  content: "\f250";
-}
-.far.fa-id-card:before {
-  content: "\f2c3";
-}
-.far.fa-keyboard:before {
-  content: "\f11c";
-}
-.far.fa-lemon:before {
-  content: "\f094";
-}
-.far.fa-lightbulb:before {
-  content: "\f0eb";
-}
-.far.fa-meh:before {
-  content: "\f11a";
-}
-.far.fa-minus-square:before {
-  content: "\f147";
-}
-.far.fa-money-bill-alt:before {
-  content: "\f0d6";
-}
-.far.fa-moon:before {
-  content: "\f186";
-}
-.far.fa-newspaper:before {
-  content: "\f1ea";
-}
-.far.fa-paper-plane:before {
-  content: "\f1d9";
-}
-.far.fa-pause-circle:before {
-  content: "\f28c";
-}
-.far.fa-edit:before {
-  content: "\f044";
-}
-.far.fa-image:before {
-  content: "\f03e";
-}
-.far.fa-play-circle:before {
-  content: "\f01d";
-}
-.far.fa-plus-square:before {
-  content: "\f196";
-}
-.far.fa-question-circle:before {
-  content: "\f92c";
-}
-.far.fa-share-square:before {
-  content: "\f045";
-}
-.far.fa-smile:before {
-  content: "\f118";
-}
-.far.fa-snowflake:before {
-  content: "\f2dc";
-}
-.far.fa-futbol:before {
-  content: "\f1e3";
-}
-.far.fa-star-half:before {
-  content: "\f089";
-}
-.far.fa-star:before {
-  content: "\f006";
-}
-.far.fa-sticky-note:before {
-  content: "\f24a";
-}
-.far.fa-stop-circle:before {
-  content: "\f28e";
-}
-.far.fa-sun:before {
-  content: "\f185";
-}
-.far.fa-thumbs-down:before {
-  content: "\f088";
-}
-.far.fa-thumbs-up:before {
-  content: "\f087";
-}
-.far.fa-times-circle:before {
-  content: "\f05c";
-}
-.far.fa-window-close:before {
-  content: "\f2d4";
-}
-.far.fa-trash-alt:before {
-  content: "\f014";
-}
-.far.fa-user-circle:before {
-  content: "\f2be";
-}
-.far.fa-user:before {
-  content: "\f2c0";
-}

web/assets/Fork-Awesome/css/v5-compat.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":["v5-compat.css"],"names":[],"mappings":";;;;;;;;;;;AAaA,KACA,KAFA,KAGE,QAAA,aACA,KAAA,OAAA,OAAA,OAAA,KAAA,EAAA,YACA,UAAA,QACA,eAAA,KACA,uBAAA,YACA,wBAAA,UAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEuB,iCACvB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEwB,kCACxB,QAAA,QAEsB,gCACtB,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEkB,4BAClB,QAAA,QAEuB,iCACvB,QAAA,QAE8B,wCAC9B,QAAA,QAEiB,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEmB,6BACnB,QAAA,QAEiB,2BACjB,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAEoB,8BACpB,QAAA,QAEkB,4BAClB,QAAA,QAEgB,0BAChB,QAAA,QAEyB,mCACzB,QAAA,QAEyB,mCACzB,QAAA,QAE0B,oCAC1B,QAAA,QAEuB,iCACvB,QAAA,QAEoB,8BACpB,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEe,yBACf,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEe,yBACf,QAAA,QAEgB,0BAChB,QAAA,QAEoB,8BACpB,QAAA,QAEe,yBACf,QAAA,QAEgB,0BAChB,QAAA,QAEe,yBACf,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEc,wBACd,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAE2B,qCAC3B,QAAA,QAE2B,qCAC3B,QAAA,QAE4B,sCAC5B,QAAA,QAEyB,mCACzB,QAAA,QAEU,oBACV,QAAA,QAEgB,0BAChB,QAAA,QAEc,wBACd,QAAA,QAEc,wBACd,QAAA,QAEoB,8BACpB,QAAA,QAEoB,8BACpB,QAAA,QAEc,wBACd,QAAA,QAEmB,6BACnB,QAAA,QAEoB,8BACpB,QAAA,QAEuB,iCACvB,QAAA,QAEuB,iCACvB,QAAA,QAEwB,kCACxB,QAAA,QAEqB,+BACrB,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEY,sBACZ,QAAA,QAEW,qBACX,QAAA,QAEa,uBACb,QAAA,QAEkB,4BAClB,QAAA,QAEc,wBACd,QAAA,QAEgB,0BAChB,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEmB,6BACnB,QAAA,QAEkB,4BAClB,QAAA,QAEgB,0BAChB,QAAA,QAEe,yBACf,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEgB,0BAChB,QAAA,QAEU,oBACA,oBACV,QAAA,QAEc,wBACd,QAAA,QAEqB,+BACrB,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEU,oBACV,QAAA,QAEY,sBACZ,QAAA,QAEiB,2BACjB,QAAA,QAEW,qBACX,QAAA,QAEY,sBACZ,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEqB,+BACrB,QAAA,QAEqB,+BACrB,QAAA,QAEsB,gCACtB,QAAA,QAEmB,6BACnB,QAAA,QAEgB,0BAChB,QAAA,OAEkB,4BAClB,QAAA,QAEmB,6BACnB,QAAA,QAEgB,0BAChB,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEW,qBACX,QAAA,QAEc,wBACd,QAAA,QAEe,yBACf,QAAA,QAEa,uBACb,QAAA,QAEc,wBACd,QAAA,QAEW,qBACX,QAAA,QAEe,yBACf,QAAA,QAES,mBACT,QAAA,QAEkB,4BAClB,QAAA,QAEoB,8BACpB,QAAA,QAEU,oBACV,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEkB,4BAClB,QAAA,QAEU,oBACV,QAAA,QAEW,qBACX,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAEqB,+BACrB,QAAA,QAEkB,4BAClB,QAAA,QAEW,qBACX,QAAA,QAEe,yBACf,QAAA,QAEY,sBACZ,QAAA,QAEe,yBACf,QAAA,QAEU,oBACV,QAAA,QAEiB,2BACjB,QAAA,QAEiB,2BACjB,QAAA,QAES,mBACT,QAAA,QAEiB,2BACjB,QAAA,QAEe,yBACf,QAAA,QAEkB,4BAClB,QAAA,QAEkB,4BAClB,QAAA,QAEe,yBACf,QAAA,QAEiB,2BACjB,QAAA,QAEU,oBACV,QAAA"}

web/assets/fonts/forkawesome-webfont-LICENSE

@@ -0,0 +1,95 @@
+Copyright (c) 2018, Fork Awesome (https://forkawesome.github.io),
+with Reserved Font Name Fork Awesome.
+
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

web/source/.eslintignore

@@ -1,3 +0,0 @@
-node_modules
-prism.js
-prism.css

web/source/css/about.css

@@ -1,36 +0,0 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.about {
-	display: flex;
-	flex-direction: column;
-	gap: 2rem;
-	padding: 2rem;
-
-	background: $bg-accent;
-	box-shadow: $boxshadow;
-	border: $boxshadow-border;
-	border-radius: $br;
-
-	.about-section {	
-		h1, h2, h3, h4, h5 {
-			margin-top: 0;
-		}
-	}
-}

web/source/css/base.css

@@ -1,641 +0,0 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/***************************************
-***** SECTION 0: IMPORTS AND FONTS *****
-****************************************/
-
-@import "modern-normalize/modern-normalize.css";
-@import "./prism.css";
-
-/* noto-sans-regular - latin */
-@font-face {
-	font-family: "Noto Sans";
-	font-weight: 400;
-	font-display: swap;
-	font-style: normal;
-	src: url('../fonts/noto-sans-v27-latin-regular.woff2') format('woff2'),
-		 url('../fonts/noto-sans-v27-latin-regular.woff') format('woff');
-}
-
-/* noto-sans-700 - latin */
-@font-face {
-	font-family: "Noto Sans";
-	font-weight: 700;
-	font-display: swap;
-	font-style: normal;
-	src: url('../fonts/noto-sans-v27-latin-700.woff2') format('woff2'),
-		 url('../fonts/noto-sans-v27-latin-700.woff') format('woff');
-}
-
-/*************************************
-***** SECTION 1: HANDY VARIABLES *****
-**************************************/
-
-/*
-	Standard border radius
-	for nice squircles.
-*/
-$br: 0.4rem;
-
-/*
-	Border radius for items that
-	are framed/bordered inside
-	something with $br, eg avatar,
-	header img, etc.
-*/
-$br-inner: 0.2rem; 
-
-/*
-	Fork-Awesome 'fa-fw' fixed icon width;
-	keep in sync with https://github.com/ForkAwesome/Fork-Awesome/blob/a99579ae3e735ee70e51ed62dfcee3172b5b2db7/css/fork-awesome.css#L50
-*/
-$fa-fw: 1.28571429em;
-
-/******************************************
-***** SECTION 2: BASIC GLOBAL STYLING *****
-*******************************************/
-
-html, body {
-	padding: 0;
-	margin: 0;
-	background: $bg;
-	color: $fg;
-	font-family: "Noto Sans", sans-serif;
-	scrollbar-color: $orange1 $gray3;
-}
-
-body {
-	line-height: 1.5em;
-	position: relative;
-}
-
-a {
-	color: $link-fg;
-}
-
-/*
-	Normalize margins of first and last children.
-	We generally don't want to open a paragraph or
-	paragraph-like element with a top margin or
-	close it with a bottom margin.
-*/
-main {
-	p:first-child, ol:first-child, ul:first-child {
-		margin-top: 0;
-	}
-
-	p:last-child, ol:last-child, ul:last-child {
-		margin-bottom: 0;
-	}
-}
-
-.button, button {
-	border-radius: $br-inner;
-	color: $button-fg;
-	background: $button-bg;
-	box-shadow: $boxshadow;
-	border: $button-border;
-	text-decoration: none;
-	font-size: 1.2rem;
-	font-weight: bold;
-	padding: 0.5rem;
-	border: none;
-	cursor: pointer;
-	text-align: center;
-	font-family: 'Noto Sans', sans-serif;
-
-	&.danger {
-		color: $button-danger-fg;
-		background: $button-danger-bg;
-
-		&:hover {
-			background: $button-danger-hover-bg;
-		}
-	}
-
-	&:disabled,
-	&.disabled {
-		color: $white2;
-		background: $gray2;
-		cursor: not-allowed;
-
-		&:hover {
-			background: $gray3;
-		}
-	}
-
-	&:hover {
-		background: $button-hover-bg;
-	}
-}
-
-/*
-	Form styling - used in settings frontend as well.
-*/
-input, select, textarea, .input {
-	box-sizing: border-box;
-	border: 0.15rem solid $input-border;
-	border-radius: 0.1rem;
-	color: $fg;
-	background: $input-bg;
-	width: 100%;
-	font-family: 'Noto Sans', sans-serif;
-	font-size: 1rem;
-	padding: 0.3rem;
-
-	&:focus, &:active {
-		border-color: $input-focus-border;
-	}
-
-	&:invalid, .invalid & {
-		border-color: $input-error-border;
-	}
-
-	&:disabled {
-		background: transparent;
-	}
-
-	&::placeholder {
-		opacity: 1;
-		color: $fg-reduced
-	}
-}
-
-select {
-	/*
-		By default this looks awful on Gnome
-		Web so restyle a bit to try to make
-		it consistent with firefox + chrome.
-	*/
-	appearance: none;
-	line-height: 1.5rem;
-}
-
-/*
-	Squeeze emojis so they fit inline in text.
-*/
-.emoji {
-	width: 1.45em;
-	height: 1.45em;
-	margin: -0.2em 0.02em 0;
-	object-fit: contain;
-	vertical-align: middle;
-	
-	@media (prefers-reduced-motion: no-preference) {
-		/*
-			Enlarge emojis on hover to give
-			viewer a good look at them.
-		*/
-		transition: 0.1s;
-		&:hover, &:active {
-			transform: scale(2);
-			background-color: $bg;
-			box-shadow: $boxshadow;
-			border: $boxshadow-border;
-			border-radius: $br-inner;
-		}
-	}
-}
-
-/*
-	Restyle unordered lists; outdent
-	and replace dot with orange dot.
-*/
-ul {
-	padding-left: 2.5rem;
-	list-style: none;
-
-	li::before {
-		content: "\2022";
-		color: $border-accent;
-		font-weight: bold;
-		display: inline-block;
-		width: 1.5rem;
-		margin-left: -1.5rem;
-	}
-}
-
-/*
-	Mirror the same styling a little bit
-	for ordered lists by making marker bold.
-*/ 
-ol {
-	padding-left: 2.5rem;
-
-	li::marker {
-		font-weight: bold;
-	}
-}
-
-/*
-	Outdent block quotes a bit; use
-	orange strip for left border.
-*/
-blockquote {
-	padding: 0.5rem;
-	border-left: 0.2rem solid $border-accent;
-	margin: 0;
-	font-style: normal;
-
-	/*
-		Same background color we
-		use for code blocks
-	*/
-	background-color: $gray2;
-	border-radius: 0;
-}
-
-/*
-	Nice dashed orange line
-	for horizontal rules.
-*/
-hr {
-	border: 0;
-	border-top: 1px dashed $border-accent;
-}
-
-/*
-	Don't indent definition
-	lists and definitions.
-*/
-dl {
-	margin: 0;
-
-	dd {
-		margin-left: 0;
-	}
-}
-
-label {
-	cursor: pointer;
-}
-
-/*
-	Set our own nice background for
-	monospace code and pre blocks.
-*/
-pre, pre[class*="language-"],
-code, code[class*="language-"] {
-	background-color: $gray2;
-}
-
-/*
-	Just code on its own inside status
-	content, ie, `here is some code`.
-*/
-code {
-	padding: 0.25rem;
-	border-radius: $br-inner;
-	white-space: pre-wrap;
-}
-
-/*
-	Restyle Prism code highlighting toolbar
-	plugin buttons to our own button style.
-	
-	We have to use really specific selectors
-	because of how specific prism.css is.
-*/
-div.code-toolbar > div.toolbar {
-	margin-right: 0.5rem;
-	display: flex;
-	gap: 0.25rem;
-
-	> div.toolbar-item {
-		> span, > button {
-			color: $button-fg;
-			background: $button-bg;
-			font-weight: bold;
-			box-shadow: $boxshadow;
-
-			&:hover, &:focus {
-				color: $button-fg;
-			}
-		}
-
-		.copy-to-clipboard-button:hover {
-			background: $button-hover-bg;
-		}
-	}
-}
-
-pre, pre[class*="language-"] {
-	border-radius: $br;
-	padding: 0.5rem;
-	white-space: pre;
-	overflow-x: auto;
-
-	/* 
-		Code inside a pre block, ie.,
-		
-		```
-		here is some code
-		```
-	*/
-	code {
-		width: 100%;
-		padding: 0;
-		white-space: pre;
-		overflow-x: auto;
-		-webkit-overflow-scrolling: touch;
-	}
-}
-
-/*************************************
-***** SECTION 3: UTILITY CLASSES *****
-**************************************/
-
-/*
-	Column header that appears at the top
-	of threads, at the top of sections of
-	profiles (About, Pinned Posts, etc).
-*/
-.col-header {
-	display: grid;
-	grid-template-columns: auto 1fr;
-	gap: 1rem;
-
-	justify-content: start;
-	align-items: center; 
-
-	margin: 0;
-	background: $profile-bg;
-	border-top-left-radius: $br;
-	border-top-right-radius: $br;
-	padding: 0.75rem;
-
-	a {
-		justify-self: end;
-	}
-
-	h1, h2, h3, h4 {
-		font-size: 1.2rem;
-		line-height: 1.3rem;
-		margin: 0;
-	}
-}
-
-.hidden {
-	display: none;
-}
-
-.nounderline {
-	text-decoration: none;
-}
-
-.accent {
-	color: $acc1;
-}
-
-.text-cutoff {
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-/* 
-	Class for lists that don't
-	want the orange dot.
-*/
-.nodot {
-	li::before {
-		content: initial;
-	}
-}
-
-/*
-	Forms and sign-in / sign-up / confirm pages.
-*/
-section.with-form {
-	form {
-		display: flex;
-		flex-direction: column;
-		gap: 1rem;
-
-		padding-bottom: 1rem;
-		padding-top: 1rem;
-
-		p {
-			/*
-				We use gap so we don't
-				need top + bottom margins.
-			*/
-			margin-top: 0;
-			margin-bottom: 0;
-		}
-
-		label, input {
-			padding-left: 0.2rem;
-		}
-
-		.labelinput {
-			display: flex;
-			flex-direction: column;
-			gap: 0.4rem;
-		}
-
-		.checkbox {
-			display: flex;
-			flex-direction: row-reverse;
-			gap: 0.4rem;
-
-			& > input {
-				height: 100%;
-				width: 5%;
-				min-width: 1.2rem;
-				align-self: center;
-			}
-		}
-
-		.btn {
-			/* Visually separate buttons a bit */
-			margin-top: 1rem;
-		}
-	}
-}
-
-/***********************************
-***** SECTION 4: SHAMEFUL MESS *****
-************************************/
-
-/*
-	EVERYTHING BELOW THIS POINT:
-	Should be moved somewhere else
-	to avoid cluttering up this file.
-*/
-
-/*
-	Below section stylings are used
-	in transient pages + error templates.
-*/
-
-section.error {
-	word-break: break-word;
-	margin-bottom: 0.5rem;
-
-	pre {
-		border: 1px solid #ff000080;
-		padding: 0.5rem;
-		border-radius: 0.5em;
-		background-color: #ff000010;
-		font-size: 1.3em;
-		white-space: pre-wrap;
-	}
-}
-
-section.oob-token {
-	code {
-		background: $gray1;
-		padding: 0.5rem;
-		margin: 0;
-		border-radius: 0.3rem;
-	}
-}
-
-/*
-	TODO: list and blocklist are only used
-	in settings panel and on blocklist page;
-	consider moving them somewhere else.
-*/
-.list {
-	display: flex;
-	flex-direction: column;
-
-	.header, .entry {
-		padding: 0.5rem;
-	}
-
-	.header {
-		border: 0.1rem solid transparent !important; /* for alignment with .entry border padding */
-		background: $gray1 !important;
-		display: flex;
-		font-weight: bold;
-	}
-
-	.entries {
-		display: flex;
-		flex-direction: column;
-
-		&.scrolling {
-			height: 20rem;
-			max-height: 20rem;
-			overflow: auto;
-		}
-	}
-
-	input[type=checkbox] {
-		margin-left: 0.5rem;
-	}
-
-	.entry {
-		display: flex;
-		flex-wrap: wrap;
-		background: $list-entry-bg;
-		border: 0.1rem solid transparent;
-
-		&:nth-child(even) {
-			background: $list-entry-alternate-bg;
-		}
-	
-		&:hover {
-			background: $list-entry-hover-bg;
-		}
-	
-		&:active, &:focus, &:hover, &:target {
-			border-color: $fg-accent;
-		}
-	}
-}
-
-.domain-blocklist {
-	box-shadow: $boxshadow;
-
-	.entry {
-		display: grid;
-		grid-template-columns: max(30%, 10rem) 1fr;
-		gap: 0.5rem;
-		align-items: start;
-		border: $boxshadow-border;
-		border-top-color: transparent;
-
-		& > div {
-			display: flex;
-			align-items: center
-		}
-
-		.domain a {
-			font-weight: bold;
-			text-decoration: none;
-			display: inline-block; /* so it wraps properly */
-		}
-
-		.public_comment p {
-			margin: 0;
-		}
-	}
-
-	.header .domain {
-		color: $fg;
-	}
-}
-
-@media screen and (max-width: 30rem) {
-	.domain-blocklist .entry {
-		grid-template-columns: 1fr;
-		gap: 0;
-	}
-}
-
-/*
-	TODO: this is only used on About
-	page and in settings application;
-	consider moving it somewhere else.
-*/
-.account-card {
-	display: inline-grid;
-	grid-template-columns: auto 1fr;
-	grid-template-rows: auto auto;
-	text-decoration: none;
-	gap: 0.5rem 1rem;
-	border-radius: $br;
-	padding: 0.5rem;
-	min-width: 40%;
-	margin-bottom: 0.3rem;
-
-	background: $list-entry-bg;
-
-	&:hover {
-		background: $list-entry-alternate-bg;
-	}
-
-	h3 {
-		align-self: end;
-		margin: 0;
-		color: $fg;
-	}
-
-	img.avatar {
-		border-radius: 0.5rem;
-		width: 5rem;
-		height: 5rem;
-		object-fit: cover;
-		grid-row: 1 / span 2;
-	}
-}

web/source/css/base/_license.css

@@ -15,11 +15,4 @@
 
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.thread {
-    #tag-name {
-        /* Ensure ridiculous length tags get wrapped */
-        word-wrap: anywhere; 
-    }
-}
+*/

web/source/css/base/_normalize.css

@@ -0,0 +1 @@
+@import "modern-normalize/modern-normalize.css";

web/source/css/base/fonts.css

@@ -0,0 +1,19 @@
+/* noto-sans-regular - latin */
+@font-face {
+	font-family: "Noto Sans";
+	font-weight: 400;
+	font-display: swap;
+	font-style: normal;
+	src: url('/assets/fonts/noto-sans-v27-latin-regular.woff2') format('woff2'),
+		 url('/assets/fonts/noto-sans-v27-latin-regular.woff') format('woff');
+}
+
+/* noto-sans-700 - latin */
+@font-face {
+	font-family: "Noto Sans";
+	font-weight: 700;
+	font-display: swap;
+	font-style: normal;
+	src: url('/assets/fonts/noto-sans-v27-latin-700.woff2') format('woff2'),
+		 url('/assets/fonts/noto-sans-v27-latin-700.woff') format('woff');
+}

web/source/css/base/main.css

@@ -0,0 +1,69 @@
+/*
+	Standard border radius
+	for nice squircles.
+*/
+$br: 0.4rem;
+
+/*
+	Border radius for items that
+	are framed/bordered inside
+	something with $br, eg avatar,
+	header img, etc.
+*/
+$br-inner: 0.2rem; 
+
+/*
+	Fork-Awesome 'fa-fw' fixed icon width;
+	keep in sync with https://github.com/ForkAwesome/Fork-Awesome/blob/a99579ae3e735ee70e51ed62dfcee3172b5b2db7/css/fork-awesome.css#L50
+*/
+$fa-fw: 1.28571429em;
+
+html, body {
+	padding: 0;
+	margin: 0;
+	background: $bg;
+	color: $fg;
+	font-family: "Noto Sans", sans-serif;
+	scrollbar-color: $orange1 $gray3;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+	html {
+		scroll-behavior: smooth;
+	}
+}
+
+body {
+	line-height: 1.5em;
+	position: relative;
+}
+
+a {
+	color: $link-fg;
+}
+
+/*
+	Normalize margins of first and last children.
+	We generally don't want to open a paragraph or
+	paragraph-like element with a top margin or
+	close it with a bottom margin.
+*/
+main {
+	display: flex;
+	flex-direction: column;
+	padding: 0;
+
+	h1, h2, h3, h4, h5 {
+		& ~ p {
+			margin-top: 0;
+		}
+	}
+	
+	p:first-child, ol:first-child, ul:first-child {
+		margin-top: 0;
+	}
+
+	p:last-child, ol:last-child, ul:last-child {
+		margin-bottom: 0;
+	}
+}

web/source/css/components/account-card.css

@@ -0,0 +1,33 @@
+/* Displays account with displayname, username and avatar */
+.account-card {
+	display: inline-grid;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: auto auto;
+	text-decoration: none;
+	gap: 0.5rem 1rem;
+	border-radius: $br;
+	padding: 0.5rem;
+	min-width: 40%;
+	margin-bottom: 0.3rem;
+
+	background: $list-entry-bg;
+
+	&:hover {
+		background: $list-entry-alternate-bg;
+	}
+
+	b {
+		font-size: 1.25rem;
+		align-self: end;
+		margin: 0;
+		color: $fg;
+	}
+
+	img.avatar {
+		border-radius: 0.5rem;
+		width: 5rem;
+		height: 5rem;
+		object-fit: cover;
+		grid-row: 1 / span 2;
+	}
+}

web/source/css/components/column-header.css

@@ -0,0 +1,44 @@
+/*
+	Column header that appears at the top
+	of threads, at the top of sections of
+	profiles (About, Pinned Posts, etc).
+*/
+.col-header {
+	display: grid;
+	grid-template-columns: auto 1fr;
+	gap: 1rem;
+
+	justify-content: start;
+	align-items: center; 
+
+	margin: 0;
+	background: $profile-bg;
+	border-top-left-radius: $br;
+	border-top-right-radius: $br;
+	padding: 0.75rem;
+
+	a {
+		justify-self: end;
+	}
+
+	h1, h2, h3, h4 {
+		font-size: 1.2rem;
+		line-height: 1.3rem;
+		margin: 0;
+	}
+
+	&.wrap { /* for headers that can have a lot more text, like thread summary/reply info */
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		column-gap: 1rem;
+		row-gap: 0.5rem;
+
+		box-shadow: $boxshadow;
+		border: $boxshadow-border;
+
+		h2 {
+			margin-right: auto;
+		}
+	}
+}

web/source/css/components/emoji.css

@@ -0,0 +1,23 @@
+/* Style emoji to fit in-line with text */
+.emoji {
+	width: 1.45em;
+	height: 1.45em;
+	margin: -0.2em 0.02em 0;
+	object-fit: contain;
+	vertical-align: middle;
+	
+	@media (prefers-reduced-motion: no-preference) {
+		/*
+			Enlarge emojis on hover to give
+			viewer a good look at them.
+		*/
+		transition: 0.1s;
+		&:hover, &:active {
+			transform: scale(2);
+			background-color: $bg;
+			box-shadow: $boxshadow;
+			border: $boxshadow-border;
+			border-radius: $br-inner;
+		}
+	}
+}

web/source/css/components/forms.css

@@ -0,0 +1,68 @@
+input, select, textarea, .input {
+	box-sizing: border-box;
+	border: 0.15rem solid $input-border;
+	border-radius: 0.1rem;
+	color: $fg;
+	background: $input-bg;
+	width: 100%;
+	font-family: 'Noto Sans', sans-serif;
+	font-size: 1rem;
+	padding: 0.3rem;
+
+	&:focus, &:active {
+		border-color: $input-focus-border;
+	}
+
+	&:invalid, .invalid & {
+		border-color: $input-error-border;
+	}
+
+	&:disabled {
+		background: transparent;
+	}
+
+	&::placeholder {
+		opacity: 1;
+		color: $fg-reduced
+	}
+}
+
+.button, button {
+	border-radius: $br-inner;
+	color: $button-fg;
+	background: $button-bg;
+	box-shadow: $boxshadow;
+	border: $button-border;
+	text-decoration: none;
+	font-size: 1.2rem;
+	font-weight: bold;
+	padding: 0.5rem;
+	border: none;
+	cursor: pointer;
+	text-align: center;
+	font-family: 'Noto Sans', sans-serif;
+
+	&.danger {
+		color: $button-danger-fg;
+		background: $button-danger-bg;
+
+		&:hover {
+			background: $button-danger-hover-bg;
+		}
+	}
+
+	&:disabled,
+	&.disabled {
+		color: $white2;
+		background: $gray2;
+		cursor: not-allowed;
+
+		&:hover {
+			background: $gray3;
+		}
+	}
+
+	&:hover {
+		background: $button-hover-bg;
+	}
+}

web/source/css/components/html-elements.css

@@ -0,0 +1,71 @@
+/*
+	Outdent block quotes a bit; use
+	orange strip for left border.
+*/
+blockquote {
+	padding: 0.5rem;
+	border-left: 0.2rem solid $border-accent;
+	margin: 0;
+	font-style: normal;
+
+	/*
+		Same background color we
+		use for code blocks
+	*/
+	background-color: $gray2;
+	border-radius: 0;
+}
+
+/*
+	Nice dashed orange line
+	for horizontal rules.
+*/
+hr {
+	border: 0;
+	border-top: 1px dashed $border-accent;
+}
+
+/*
+	Don't indent definition
+	lists and definitions.
+*/
+dl {
+	margin: 0;
+
+	dd {
+		margin-left: 0;
+	}
+}
+
+label {
+	cursor: pointer;
+}
+
+/*
+	Set our own nice background for
+	monospace code and pre blocks.
+*/
+pre, pre[class*="language-"],
+code, code[class*="language-"] {
+	background-color: $gray2;
+}
+
+/*
+	Just code on its own inside status
+	content, ie, `here is some code`.
+*/
+code {
+	padding: 0.25rem;
+	border-radius: $br-inner;
+	white-space: pre-wrap;
+}
+
+select {
+	/*
+		By default this looks awful on Gnome
+		Web so restyle a bit to try to make
+		it consistent with firefox + chrome.
+	*/
+	appearance: none;
+	line-height: 1.5rem;
+}

web/source/css/components/lists.css

@@ -0,0 +1,128 @@
+/*
+	Restyle unordered lists; outdent
+	and replace dot with orange dot (unless .nodot class applied).
+*/
+
+ul {
+	padding-left: 2.5rem;
+	list-style: none;
+
+	li::before {
+		content: "\2022";
+		color: $border-accent;
+		font-weight: bold;
+		display: inline-block;
+		width: 1.5rem;
+		margin-left: -1.5rem;
+	}
+
+	&.nodot {
+		li::before {
+			content: initial;
+		}
+	}
+}
+
+/*
+	Mirror the same styling a little bit
+	for ordered lists by making marker bold.
+*/ 
+
+ol {
+	padding-left: 2.5rem;
+
+	li::marker {
+		font-weight: bold;
+	}
+}
+
+/* Tabulated list */
+.list {
+	display: flex;
+	flex-direction: column;
+
+	.header, .entry {
+		padding: 0.5rem;
+	}
+
+	.header {
+		border: 0.1rem solid transparent !important; /* for alignment with .entry border padding */
+		background: $gray1 !important;
+		display: flex;
+		font-weight: bold;
+	}
+
+	.entries {
+		display: flex;
+		flex-direction: column;
+
+		&.scrolling {
+			height: 20rem;
+			max-height: 20rem;
+			overflow: auto;
+		}
+	}
+
+	input[type=checkbox] {
+		margin-left: 0.5rem;
+	}
+
+	.entry {
+		display: flex;
+		flex-wrap: wrap;
+		background: $list-entry-bg;
+		border: 0.1rem solid transparent;
+
+		&:nth-child(even) {
+			background: $list-entry-alternate-bg;
+		}
+	
+		&:hover {
+			background: $list-entry-hover-bg;
+		}
+	
+		&:active, &:focus, &:hover, &:target {
+			border-color: $fg-accent;
+		}
+	}
+}
+
+/* Extends .list styling for domain-blocklist.tmpl */
+.domain-blocklist {
+	box-shadow: $boxshadow;
+
+	.entry {
+		display: grid;
+		grid-template-columns: max(30%, 10rem) 1fr;
+		gap: 0.5rem;
+		align-items: start;
+		border: $boxshadow-border;
+		border-top-color: transparent;
+
+		& > div {
+			display: flex;
+			align-items: center
+		}
+
+		.domain a {
+			font-weight: bold;
+			text-decoration: none;
+			display: inline-block; /* so it wraps properly */
+		}
+
+		.public_comment p {
+			margin: 0;
+		}
+	}
+
+	.header .domain {
+		color: $fg;
+	}
+}
+
+@media screen and (max-width: 30rem) {
+	.domain-blocklist .entry {
+		grid-template-columns: 1fr;
+		gap: 0;
+	}
+}

web/source/css/components/prism.css

@@ -0,0 +1,51 @@
+/*
+	Restyle Prism code highlighting toolbar
+	plugin buttons to our own button style.
+	
+	We have to use really specific selectors
+	because of how specific prism.css is.
+*/
+div.code-toolbar > div.toolbar {
+	margin-right: 0.5rem;
+	display: flex;
+	gap: 0.25rem;
+
+	> div.toolbar-item {
+		> span, > button {
+			color: $button-fg;
+			background: $button-bg;
+			font-weight: bold;
+			box-shadow: $boxshadow;
+
+			&:hover, &:focus {
+				color: $button-fg;
+			}
+		}
+
+		.copy-to-clipboard-button:hover {
+			background: $button-hover-bg;
+		}
+	}
+}
+
+pre, pre[class*="language-"] {
+	border-radius: $br;
+	padding: 0.5rem;
+	white-space: pre;
+	overflow-x: auto;
+
+	/* 
+		Code inside a pre block, ie.,
+		
+		```
+		here is some code
+		```
+	*/
+	code {
+		width: 100%;
+		padding: 0;
+		white-space: pre;
+		overflow-x: auto;
+		-webkit-overflow-scrolling: touch;
+	}
+}

web/source/css/components/status/header.css

@@ -0,0 +1,67 @@
+.status .status-header > address {
+	/*
+		Avoid stretching so wide that user
+		can't click on open thread link that's
+		behind the status header link.
+	*/
+	width: fit-content;
+
+	> a {
+		padding: 0 0.75rem;
+		display: grid;
+		grid-template-columns: 3.5rem 1fr auto;
+		grid-template-rows: auto auto;
+		grid-template-areas:
+			"avatar author-strapline author-strapline"
+			"avatar author-strapline author-strapline";
+		gap: 0 0.5rem;
+		font-style: normal;
+
+		.avatar {
+			grid-area: avatar;
+			height: 3.5rem;
+			width: 3.5rem;
+			object-fit: cover;
+
+			border: 0.15rem solid $avatar-border;
+			border-radius: $br;
+			overflow: hidden; /* hides corners from img overflowing */
+
+			img {
+				height: 100%;
+				width: 100%;
+				object-fit: cover;
+				background: $bg;
+			}
+		}
+
+		.author-strapline {
+			grid-area: author-strapline;
+			display: grid;
+			grid-template-columns: 1fr auto;
+			grid-template-rows: auto;
+			grid-template-areas:
+				"display display"
+				"user    user";
+			gap: 0 0.5rem;
+
+			.displayname, .username {
+				justify-self: start;
+				align-self: start;
+				max-width: 100%;
+				font-size: 1rem;
+				line-height: 1.3rem;
+			}
+		
+			.displayname {
+				grid-area: display;
+				font-weight: bold;
+			}
+	
+			.username {
+				grid-area: user;
+				color: $link-fg;
+			}
+		}
+	}
+}

web/source/css/components/status/indent.css

@@ -0,0 +1,43 @@
+.status {
+	&.indent-1 {
+		margin-left: 0.5rem;
+	}
+
+	&.indent-2 {
+		margin-left: 1rem;
+	}
+
+	&.indent-3 {
+		margin-left: 1.5rem;
+	}
+
+	&.indent-4 {
+		margin-left: 2rem;
+	}
+
+	&.indent-5 {
+		margin-left: 2.5rem;
+	}
+
+	&.indent-1,
+	&.indent-2,
+	&.indent-3,
+	&.indent-4,
+	&.indent-5 {
+		.status-link {
+			margin-left: -0.5rem;
+			border-left: 0.15rem dashed $border-accent;
+		}
+	}
+
+	border-radius: 0;
+	&:last-child {
+		border-bottom-left-radius: $br;
+		border-bottom-right-radius: $br;
+
+		.status-info {
+			border-bottom-left-radius: $br;
+			border-bottom-right-radius: $br;
+		}
+	}
+}

web/source/css/components/status/status.css

@@ -1,31 +1,7 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 @import "photoswipe/dist/photoswipe.css";
 @import "photoswipe-dynamic-caption-plugin/photoswipe-dynamic-caption-plugin.css";
 @import "plyr/dist/plyr.css";
 
-main {
-	background: transparent;
-	grid-auto-rows: auto;
-}
-
 .status {
 	background: $status-bg;
 	box-shadow: $boxshadow;
@@ -41,74 +17,6 @@ main {
 		text-decoration: none;
 	}
 
-	.status-header > address {
-		/*
-			Avoid stretching so wide that user
-			can't click on open thread link that's
-			behind the status header link.
-		*/
-		width: fit-content;
-
-		> a {
-			padding: 0 0.75rem;
-			display: grid;
-			grid-template-columns: 3.5rem 1fr auto;
-			grid-template-rows: auto auto;
-			grid-template-areas:
-				"avatar author-strap author-strap"
-				"avatar author-strap author-strap";
-			gap: 0 0.5rem;
-			font-style: normal;
-	
-			.avatar {
-				grid-area: avatar;
-				height: 3.5rem;
-				width: 3.5rem;
-				object-fit: cover;
-	
-				border: 0.15rem solid $avatar-border;
-				border-radius: $br;
-				overflow: hidden; /* hides corners from img overflowing */
-	
-				img {
-					height: 100%;
-					width: 100%;
-					object-fit: cover;
-					background: $bg;
-				}
-			}
-	
-			.author-strap {
-				grid-area: author-strap;
-				display: grid;
-				grid-template-columns: 1fr auto;
-				grid-template-rows: auto;
-				grid-template-areas:
-					"display display"
-					"user    user";
-				gap: 0 0.5rem;
-	
-				.displayname, .username {
-					justify-self: start;
-					align-self: start;
-					max-width: 100%;
-					font-size: 1rem;
-					line-height: 1.3rem;
-				}
-			
-				.displayname {
-					grid-area: display;
-					font-weight: bold;
-				}
-		
-				.username {
-					grid-area: user;
-					color: $link-fg;
-				}
-			}
-		}
-	}
-
 	.status-body {
 		padding: 0.5rem 0.75rem;
 		display: flex;

web/source/css/components/utility.css

@@ -0,0 +1,21 @@
+.hidden {
+	display: none;
+}
+
+.nounderline {
+	text-decoration: none;
+}
+
+.accent {
+	color: $acc1;
+}
+
+.text-cutoff {
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+.wrap-text {
+	word-wrap: anywhere; 
+}

web/source/css/index.css

@@ -1,127 +0,0 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-	Render instance title + image
-	a bit bigger on index page.
-
-	Overrides the css from page.css.
-*/
-.page-header {
-	& > a {
-		& > h1 {
-			font-size: 2rem;
-			line-height: 2rem;
-		}
-
-		img,
-		picture {
-			align-self: center;
-			max-height: 6rem;
-		}
-	}
-}
-
-/*
-	Reuse about styling, but rework it
-	to separate sections a bit more.
-*/
-.about {
-	display: flex;
-	flex-direction: column;
-	gap: 2rem;
-	padding: 0;
-	
-	background: initial;
-	box-shadow: initial;
-	border: initial;
-	border-radius: initial;
-
-	.about-section {
-		padding: 2rem;
-		background: $bg-accent;
-		box-shadow: $boxshadow;
-		border: $boxshadow-border;
-		border-radius: $br;
-	}
-}
-
-.what-is-this .about-section-contents .activitypub-logo-wrapper {
-	display: flex;
-	flex-direction: column;
-	max-width: fit-content;
-	gap: 0.5rem;
-
-	.activitypub-logo {
-		background: $fg;
-		box-shadow: $boxshadow;
-		border-radius: $br;	
-		max-width: 100%;
-	}
-}
-
-.apps {
-	align-self: start;
-
-	.applist {
-		margin: 0;
-		padding: 0;
-
-		display: grid;
-		grid-template-columns: 1fr 1fr;
-		grid-gap: 0.5rem;
-		align-content: start;
-
-		.applist-entry {
-			display: grid;
-			grid-template-columns: 25% 1fr;
-			grid-template-areas: "logo text";
-			gap: 1.5rem;
-			padding: 0.5rem;
-
-			.applist-logo {
-				grid-area: logo;
-				align-self: center;
-				justify-self: center;
-				width: 100%;
-				object-fit: contain;
-				flex: 1 1 auto;
-			}
-
-			.applist-logo.redraw {
-				fill: $fg;
-				stroke: $fg;
-			}
-
-			.applist-text {
-				grid-area: text;
-				
-				a {
-					font-weight: bold;
-				}
-			}
-		}
-	}
-}
-
-@media screen and (max-width: 600px) {
-	.apps .applist {
-		grid-template-columns: 1fr;
-	}
-}

web/source/css/layout/page.css

@@ -1,22 +1,3 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 .page {
 	display: grid;
 	min-height: 100vh;
@@ -24,23 +5,24 @@
 	grid-template-columns: 1fr minmax(auto, 50rem) 1fr;
 	grid-template-columns: 1fr min(92%, 50rem) 1fr;
 	grid-template-rows: auto 1fr auto;
+
+	&.wider { /* used on profile.tmpl, giving more space for it's own 2 column layout */
+		grid-template-columns: 1fr minmax(auto, 60rem) 1fr;
+		grid-template-columns: 1fr min(92%, 65rem) 1fr;
+	}
 }
 
 .page-header, .page-footer {
 	grid-column: 1 / span 3;
 }
 
-.page-content {
-	grid-column: 2;
-	align-self: start;
-}
-
 .page-header {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	padding: 1.5rem;
 	gap: 1rem;
+	margin: 0.5rem 0;
 
 	a {
 		display: flex;
@@ -87,8 +69,75 @@
 	}
 }
 
+.page-header.large {
+	margin: 2rem 0;
+	a {
+		img, picture {
+			max-height: 6rem;
+		}
+
+		h1 {
+			font-size: 2rem;
+			line-height: 2rem;
+		}
+	}
+}
+
+.page-content {
+	grid-column: 2;
+	align-self: start;
+}
+
+.page.with-sidebar .page-content {
+	grid-column: 1 / span 2;
+	display: grid;
+	grid-template-columns: 1fr minmax(auto, 50rem);
+	grid-template-columns: 1fr min(92%, 50rem);
+
+	.sidebar {
+		display: inline-block;
+		align-self: start;
+		justify-self: end;
+		position: sticky;
+		top: 0;
+		padding: 0 1.5rem;
+
+		ol {
+			margin-top: 0;
+		}
+
+		h2 {
+			margin-top: 1.5rem;
+		}
+	}
+}
+
+@media screen and (max-width: 80rem) {
+	.page.with-sidebar .page-content {
+		grid-column: 2;
+		display: flex;
+		flex-direction: column;
+		background: $bg-accent;
+		box-shadow: $boxshadow;
+		border: $boxshadow-border;
+		border-radius: $br;
+
+		.sidebar {
+			position: static;
+		}
+
+		main.single-page {
+			background: initial;
+			box-shadow: initial;
+			border: initial;
+			border-radius: initial;
+		}
+	}
+}
+
 .page-footer {
 	align-self: end;
+	margin-top: 3rem;
 
 	nav ul {
 		display: flex;
@@ -115,4 +164,4 @@
 	.page-header {
 		text-align: center;
 	}
-}
+}

web/source/css/layout/sectioned.css

@@ -0,0 +1,16 @@
+main.sectioned {
+	gap: 2rem;
+	
+	section {
+		padding: 1.5rem;
+		background: $bg-accent;
+		box-shadow: $boxshadow;
+		border: $boxshadow-border;
+		border-radius: $br;
+	}
+
+	h1, h2, h3, h4, h5 {
+		margin-top: 0;
+		margin-bottom: 0.75rem;
+	}
+}

web/source/css/layout/single-page.css

@@ -0,0 +1,14 @@
+main.single-page {
+	gap: 2rem;
+
+	padding: 1.5rem;
+
+	background: $bg-accent;
+	box-shadow: $boxshadow;
+	border: $boxshadow-border;
+	border-radius: $br;
+
+	h2:first-child {
+		margin-top: 0;
+	}
+}

web/source/css/layout/thread.css

@@ -0,0 +1,15 @@
+.thread,
+.thread-wrapper {
+	display: flex;
+	flex-direction: column;
+	gap: 0.4rem;
+
+	.col-header.replies.hidden-only {
+		/*
+			No visible replies below this column
+			header, so round off the bottom.
+		*/
+		border-bottom-left-radius: $br;
+		border-bottom-right-radius: $br;
+	}
+}

web/source/css/pages/error.css

@@ -0,0 +1,17 @@
+/* 
+	Error-only page, used by error.tmpl 
+	TODO: unify colors with theming
+*/
+section.error {
+	word-break: break-word;
+	margin-bottom: 0.5rem;
+
+	pre {
+		border: 1px solid #ff000080;
+		padding: 0.5rem;
+		border-radius: 0.5em;
+		background-color: #ff000010;
+		font-size: 1.3em;
+		white-space: pre-wrap;
+	}
+}

web/source/css/pages/form.css

@@ -0,0 +1,50 @@
+/*
+	Page with form, used for sign-in/sign-up/authorization flows
+*/
+section.with-form {
+	form {
+		display: flex;
+		flex-direction: column;
+		gap: 1rem;
+
+		padding-bottom: 1rem;
+		padding-top: 1rem;
+
+		p {
+			/*
+				We use gap so we don't
+				need top + bottom margins.
+			*/
+			margin-top: 0;
+			margin-bottom: 0;
+		}
+
+		label, input {
+			padding-left: 0.2rem;
+		}
+
+		.labelinput {
+			display: flex;
+			flex-direction: column;
+			gap: 0.4rem;
+		}
+
+		.checkbox {
+			display: flex;
+			flex-direction: row-reverse;
+			gap: 0.4rem;
+
+			& > input {
+				height: 100%;
+				width: 5%;
+				min-width: 1.2rem;
+				align-self: center;
+			}
+		}
+
+		.btn {
+			/* Visually separate buttons a bit */
+			margin-top: 1rem;
+		}
+	}
+}

web/source/css/pages/index.css

@@ -0,0 +1,65 @@
+.index-page {
+	.activitypub-logo-wrapper {
+		display: flex;
+		flex-direction: column;
+		max-width: fit-content;
+		gap: 0.5rem;
+
+		.activitypub-logo {
+			background: $fg;
+			box-shadow: $boxshadow;
+			border-radius: $br;	
+			max-width: 100%;
+		}
+	}
+
+	.apps {
+		align-self: start;
+
+		.applist {
+			margin: 0;
+			padding: 0;
+
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+			grid-gap: 0.5rem;
+			align-content: start;
+
+			.applist-entry {
+				display: grid;
+				grid-template-columns: 25% 1fr;
+				grid-template-areas: "logo text";
+				gap: 1.5rem;
+				padding: 0.5rem;
+
+				.applist-logo {
+					grid-area: logo;
+					align-self: center;
+					justify-self: center;
+					width: 100%;
+					object-fit: contain;
+					flex: 1 1 auto;
+				}
+
+				.applist-logo.redraw {
+					fill: $fg;
+					stroke: $fg;
+				}
+
+				.applist-text {
+					grid-area: text;
+				
+					a {
+						font-weight: bold;
+					}
+				}
+			}
+		}
+	}
+
+	@media screen and (max-width: 600px) {
+		.apps .applist {
+			grid-template-columns: 1fr;
+		}
+	}
+}

web/source/css/pages/oob-token.css

@@ -0,0 +1,8 @@
+section.oob-token {
+	code {
+		background: $gray1;
+		padding: 0.5rem;
+		margin: 0;
+		border-radius: 0.3rem;
+	}
+}

web/source/css/pages/profile.css

@@ -1,35 +1,102 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
+.profile {
+	.column-split {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 1rem;
+	}
 
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
+	.statuses-wrapper {
+		flex: 65 25rem; 
+		display: flex;
+		flex-direction: column;
+		gap: 0.4rem;
+		min-width: 0%;
+	}
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
+	.statuses {
+		display: flex;
+		flex-direction: column;
+		gap: 0.4rem;
 
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+		.rss-icon {
+			display: block;
+			margin: -0.25rem 0;
+		
+			.fa {
+				font-size: 2rem;
+				object-fit: contain;
+				vertical-align: middle;
+				color: $orange2;
+				/*
+					Can't size a single-color background, so we use
+					a linear-gradient that's effectively white.
+				*/
+				background: linear-gradient(to right, $white1 100%, transparent 0) no-repeat center center;
+				background-size: 1.2rem 1.4rem;
+			}
+		}
 
-.page {
-	/* 
-		Profile page can be a little wider than default
-		page, since we're using a side-by-side column view.
-	*/
-	grid-template-columns: 1fr minmax(auto, 60rem) 1fr;
-	grid-template-columns: 1fr min(92%, 65rem) 1fr;
-}
+		.backnextlinks {
+			display: flex;
+			justify-content: space-between;
 
-.profile .column-split {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 1rem;
+			.next {
+				margin-left: auto;
+			}
+		}
+	}
+
+	.about-user {
+		flex: 35 14rem;
+		border-radius: $br;
+		overflow: hidden;
+
+		.col-header {
+			margin-bottom: -0.25rem;
+		}
+
+		dt {
+			font-weight: bold;
+		}
+
+		.fields {
+			background: $profile-bg;
+			display: flex;
+			flex-direction: column;
+			padding: 0 0.5rem;
+			padding-top: 0.25rem;
+
+			.field {
+				padding: 0.25rem;
+				display: flex;
+				flex-direction: column;
+				border-bottom: 0.1rem solid $gray2;
+
+				> dt, > dd {
+					word-break: break-word;
+				}
+
+				&:first-child {
+					border-top: 0.1rem solid $gray2;
+				}
+			}
+		}
+
+		.bio {
+			background: $profile-bg;
+			padding: 1rem 0.75rem;
+			padding-bottom: 1.25rem;
+		}
+
+		.accountstats {
+			background: $bg-accent;
+			padding: 0.75rem;
+		
+			display: grid;
+			grid-template-columns: auto 1fr;
+			gap: 0.25rem 1rem;
+		}
+	}
 }
 
 .profile .profile-header {
@@ -361,4 +428,4 @@
 		grid-template-columns: auto 1fr;
 		gap: 0.25rem 1rem;
 	}
-}
+}

web/source/css/themes/default.css

@@ -41,48 +41,42 @@ $gray8: #696a75;
 $orange1: #fd6a00; /* Used for non-text accent colors, can be used as background: $gray1 for text color (contrast 4.6)*/
 $orange2: #ff853e; /* hover/selected accent to $orange1, can be used with $gray1 (5.7), $gray2 (4.6) */
 
+$blue0: #00336B; /* darkest blue, can be used for links in error alerts, on $error2 (6.00) */
 $blue1: #3a9fde; /* darker blue for smaller elements (borders), can only be used with $gray1 (4.7) */
 $blue2: #66befe; /* all-round accent color, can be used with $gray1 (6.8), $gray2 (5.5), $gray3 (4.9), $gray4 (4.5) */
 $blue3: #89caff; /* hover/selected accent to $blue2, can be used with $gray1 (7.9), $gray2 (6.3), $gray3 (5.6), $gray4 (5.2), $gray5 (4.7) */
+$blue4: #b3ddff; /* used as background for info alerts */
 
-$error1: #860000; /* Error border/foreground text, can be used with $error2 (5.0), $white1 (10), $white2 (5.1) */
-$error2: #ff9796; /* Error background text, can be used with $error1 (5.0), $gray1 (6.6), $gray2 (5.3), $gray3 (4.8) */
-$error3: #dd2c2c; /* Error button background text, can be used with $white1 (4.51) */
-$error-link: #01318C; /* Error link text, can be used with $error2 (5.56) */
+$red1: #860000; /* Error border/foreground text, can be used with $error2 (5.0), $white1 (10), $white2 (5.1) */
+$red2: #dd2c2c; /* Error button background text, can be used with $white1 (4.51) */
+$red3: #ff9796; /* Error background text, can be used with $error1 (5.0), $gray1 (6.6), $gray2 (5.3), $gray3 (4.8) */
 
 $green1: #94E749; /* Green for positive/confirmation, similar contrast (luminance) as $blue2 */
 
-$info-fg: $gray1;
-$info-bg: #b3ddff;
-$info-link: $error-link;
+$boxshadow: 0 0.4rem 1rem -0.1rem rgba(0,0,0,0.15);
+$boxshadow-border: 0.08rem solid $gray1;
 
+/* Color variables as used in a specific location */
+
+/* Base */
 $fg: $white1;
 $bg: $gray1;
 
-$bg-trans: rgba(77, 78, 86, 0.62);
-
 $bg-accent: $gray5;
 $fg-accent: $blue3;
 $fg-reduced: $white2;
 $border-accent: $orange2;
 
-/* Color variables as used in a specific location */
-
 $link-fg: $fg-accent;
 
+/* Profile */
+$profile-bg: $gray4;
+$avatar-border: $orange2;
+
 $role-admin: $orange2;
 $role-mod: $blue2;
 
-$profile-bg: $gray4;
-
-$button-bg: $blue2;
-$button-fg: $gray1;
-$button-hover-bg: $blue3;
-
-$button-danger-bg: $error3;
-$button-danger-fg: $white1;
-$button-danger-hover-bg: $error2;
-
+/* Status */
 $status-bg: $gray3;
 $status-info-bg: $gray2;
 
@@ -94,11 +88,7 @@ $no-img-desc-fg: $gray1;
 
 $bg-sensitive: $gray1;
 
-$boxshadow: 0 0.4rem 1rem -0.1rem rgba(0,0,0,0.15);
-$boxshadow-border: 0.08rem solid $gray1;
-
-$avatar-border: $orange2;
-
+/* Form inputs */
 $input-bg: $gray4;
 $input-disabled-bg: $gray2;
 $input-border: $blue1;
@@ -115,8 +105,23 @@ $settings-nav-bg-active: $blue3;
 $settings-nav-border-active: $info-bg;
 $settings-nav-fg-active: $gray2;
 
-$error-fg: $error1;
-$error-bg: $error2;
+/* Buttons */
+$button-bg: $blue2;
+$button-fg: $gray1;
+$button-hover-bg: $blue3;
+
+$button-danger-bg: $error3;
+$button-danger-fg: $white1;
+$button-danger-hover-bg: $error2;
+
+/* Alerts */
+$info-fg: $gray1;
+$info-bg: $blue4;
+$info-link: $blue0;
+
+$error-fg: $red1;
+$error-bg: $red3;
+$error-link: $blue0;
 
 $list-entry-bg: $gray2;
 $list-entry-alternate-bg: $gray3;

web/source/css/thread.css

@@ -1,99 +0,0 @@
-/*
-	GoToSocial
-	Copyright (C) GoToSocial Authors admin@gotosocial.org
-	SPDX-License-Identifier: AGPL-3.0-or-later
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-.thread,
-.thread-wrapper {
-	display: flex;
-	flex-direction: column;
-	gap: 0.4rem;
-}
-
-.thread {
-	/*
-		This column header might contain
-		quite some info, so let it wrap.
-	*/
-	.col-header {
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
-		column-gap: 1rem;
-		row-gap: 0.5rem;
-
-		box-shadow: $boxshadow;
-		border: $boxshadow-border;
-
-		h2 {
-			margin-right: auto;
-		}
-
-		&.replies.hidden-only {
-			/*
-				No visible replies below this column
-				header, so round off the bottom.
-			*/
-			border-bottom-left-radius: $br;
-			border-bottom-right-radius: $br;
-		}
-	}
-
-	.status {
-		&.indent-1 {
-			margin-left: 0.5rem;
-		}
-
-		&.indent-2 {
-			margin-left: 1rem;
-		}
-
-		&.indent-3 {
-			margin-left: 1.5rem;
-		}
-
-		&.indent-4 {
-			margin-left: 2rem;
-		}
-
-		&.indent-5 {
-			margin-left: 2.5rem;
-		}
-
-		&.indent-1,
-		&.indent-2,
-		&.indent-3,
-		&.indent-4,
-		&.indent-5 {
-			.status-link {
-				margin-left: -0.5rem;
-				border-left: 0.15rem dashed $border-accent;
-			}
-		}
-
-		border-radius: 0;
-		&:last-child {
-			border-bottom-left-radius: $br;
-			border-bottom-right-radius: $br;
-
-			.status-info {
-				border-bottom-left-radius: $br;
-				border-bottom-right-radius: $br;
-			}
-		}
-	}
-}

web/source/eslint.config.cjs

@@ -17,15 +17,24 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-module.exports = {
-	"extends": ["@joepie91/eslint-config/react"],
-	"parser": "@typescript-eslint/parser",
-	"plugins": ["@typescript-eslint", "license-header"],
-	"rules": {
-		"license-header/header": ["error", __dirname + "/.license-header.js"],
-		"no-console": 'error'
+module.exports = [
+	{
+		files: ["**/*.ts", "**/*.tsx"],
+		languageOptions: {
+			parserOptions: {
+				project: true,
+				ecmaFeatures: {
+					jsx: true
+				}
+			}
+		},
+		plugins: {
+			"license-header": require("eslint-plugin-license-header"),
+			"only-warn": require("eslint-plugin-only-warn")
+		},
+		rules: {
+			"license-header/header": ["error", __dirname + "/.license-header.js"]
+		}
 	},
-	"parserOptions": {
-		"sourceType": "module"
-	}
-};
+	...require("@f0x52/eslint-config")
+];

web/source/index.js

@@ -18,12 +18,12 @@
 */
 
 const skulk = require("skulk");
-const fs = require("fs");
 const path = require("path");
+const { globSync } = require("glob");
 
-let cssEntryFiles = fs.readdirSync(path.join(__dirname, "./css")).map((file) => {
-	return path.join(__dirname, "./css", file);
-});
+const cssDir = path.join(__dirname, "./css");
+const cssFiles = globSync(cssDir + "/**/*.css", { ignore: cssDir + "/themes/**" });
+const cssThemes = globSync(cssDir + "/themes/**/*.css");
 
 const prodCfg = {
 	transform: [
@@ -47,9 +47,13 @@ skulk({
 	},
 	servers: {
 		express: {
-			proxy: "http://127.0.0.1:8081",
-			assets: "/assets"
-		}
+			proxy: {
+				target: "http://127.0.0.1:8081",
+				onProxyRes: (proxyRes) => {
+					// CSP header prevents react-devtools and redux-devtools extensions from working
+					delete proxyRes.headers['content-security-policy'];
+				},
+			},
 	},
 	bundles: {
 		frontend: {
@@ -88,12 +92,19 @@ skulk({
 				}]
 			]
 		},
-		css: {
-			entryFiles: cssEntryFiles,
+		cssThemes: {
+			entryFiles: cssThemes,
 			outputFile: "_discard",
 			presets: [["postcss", {
 				output: "_split"
 			}]]
+		},
+		css: {
+			entryFiles: cssFiles,
+			outputFile: "_discard",
+			presets: [["postcss", {
+				output: "style.css"
+			}]]
 		}
 	}
 });

web/source/package.json

@@ -6,14 +6,16 @@
   "author": "f0x",
   "license": "AGPL-3.0",
   "scripts": {
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint": "eslint",
     "build": "node index.js",
-    "dev": "NODE_ENV=development node index.js"
+    "dev": "NODE_ENV=development node index.js",
+    "prepare": "ts-patch install"
   },
   "dependencies": {
     "@reduxjs/toolkit": "^1.8.6",
     "ariakit": "^2.0.0-next.41",
     "get-by-dot": "^1.0.2",
+    "glob": "^11.0.0",
     "html-to-text": "^9.0.5",
     "is-valid-domain": "^0.1.6",
     "js-file-download": "^0.4.12",
@@ -29,13 +31,13 @@
     "plyr": "^3.7.8",
     "psl": "^1.9.0",
     "re2js": "^0.4.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-redux": "^8.1.3",
     "redux": "^4.2.0",
     "redux-persist": "^6.0.0",
     "sanitize-html": "^2.13.0",
-    "skulk": "^0.0.8-fix",
+    "skulk": "^0.1.0",
     "wouter": "^3.1.0"
   },
   "devDependencies": {
@@ -45,35 +47,31 @@
     "@babel/preset-typescript": "^7.24.1",
     "@browserify/envify": "^6.0.0",
     "@browserify/uglifyify": "^6.0.0",
-    "@joepie91/eslint-config": "^1.1.1",
+    "@f0x52/eslint-config": "^2.0.11",
     "@types/html-to-text": "^9.0.4",
     "@types/is-valid-domain": "^0.0.2",
     "@types/papaparse": "^5.3.9",
     "@types/parse-link-header": "^2.0.3",
     "@types/psl": "^1.1.1",
-    "@types/react-dom": "^18.2.8",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
     "@types/sanitize-html": "^2.11.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@types/semver": "^7.5.8",
     "autoprefixer": "^10.4.19",
     "babelify": "^10.0.0",
     "css-extract": "^2.0.0",
-    "eslint": "^8.26.0",
+    "eslint": "^9.14.0",
     "eslint-plugin-license-header": "^0.6.0",
-    "eslint-plugin-react": "^7.31.10",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-only-warn": "^1.1.0",
     "factor-bundle": "^2.5.0",
     "icssify": "^2.0.0",
     "postcss": "^8.4.18",
     "postcss-custom-prop-vars": "^0.0.5",
     "postcss-import": "^15.0.0",
     "postcss-nested": "^6.0.0",
-    "source-map-loader": "^4.0.1",
-    "ts-loader": "^9.4.4",
-    "ts-node": "^10.9.1",
-    "ts-patch": "^3.0.2",
+    "ts-patch": "^3.2.1",
     "tsify": "^5.0.4",
-    "typescript": "^5.2.2",
-    "typia": "^5.1.6"
+    "typescript": "^5.6.3",
+    "typia": "^6.11.3"
   }
 }

web/source/settings/components/status.tsx

@@ -33,9 +33,9 @@ export function FakeStatus({ children }) {
 		<article className="status expanded">
 			<header className="status-header">
 				<address>
-					<a style={{margin: 0}}>
+					<a style={{ margin: 0 }}>
 						<img className="avatar" src={account.avatar} alt="" />
-						<dl className="author-strap">
+						<dl className="author-strapline">
 							<dt className="sr-only">Display name</dt>
 							<dd className="displayname text-cutoff">
 								{account.display_name.trim().length > 0 ? account.display_name : account.username}
@@ -82,7 +82,7 @@ export function Status({ status }: { status: StatusType }) {
 
 function StatusHeader({ status }: { status: StatusType }) {
 	const author = status.account;
-	
+
 	return (
 		<header className="status-header">
 			<address>
@@ -99,7 +99,7 @@ function StatusHeader({ status }: { status: StatusType }) {
 						alt={`Avatar for ${author.username}`}
 						title={`Avatar for ${author.username}`}
 					/>
-					<div className="author-strap">
+					<div className="author-strapline">
 						<span className="displayname text-cutoff">{author.display_name}</span>
 						<span className="sr-only">,</span>
 						<span className="username text-cutoff">@{author.acct}</span>
@@ -130,7 +130,7 @@ function StatusBody({ status }: { status: StatusType }) {
 						className="spoiler-text"
 						lang={status.language}
 					>
-						{ status.spoiler_text
+						{status.spoiler_text
 							? status.spoiler_text + " "
 							: "[no content warning set] "
 						}
@@ -146,7 +146,7 @@ function StatusBody({ status }: { status: StatusType }) {
 				</summary>
 				<div
 					className="text"
-					dangerouslySetInnerHTML={{__html: content}}
+					dangerouslySetInnerHTML={{ __html: content }}
 				/>
 			</details>
 			<StatusMedia status={status} />
@@ -170,7 +170,7 @@ function StatusMedia({ status }: { status: StatusType }) {
 			role="group"
 			aria-label={aria_label}
 		>
-			{ status.media_attachments.map((media) => {
+			{status.media_attachments.map((media) => {
 				return (
 					<StatusMediaEntry
 						key={media.id}
@@ -227,7 +227,7 @@ function StatusFooter({ status }: { status: StatusType }) {
 						<dt className="sr-only">Published</dt>
 						<dd>
 							<time dateTime={status.created_at}>
-								{ new Date(status.created_at).toLocaleString() }
+								{new Date(status.created_at).toLocaleString()}
 							</time>
 						</dd>
 					</div>

web/source/settings/components/user-logout-card.tsx

@@ -31,7 +31,7 @@ export default function UserLogoutCard() {
 	if (isLoading) {
 		return <Loading />;
 	}
-	
+
 	if (!profile) {
 		return <ErrorC error={new Error("account was undefined")} />;
 	}
@@ -39,9 +39,9 @@ export default function UserLogoutCard() {
 	return (
 		<div className="account-card">
 			<img className="avatar" src={profile.avatar} alt="" />
-			<h3 className="text-cutoff">{profile.display_name?.length > 0 ? profile.display_name : profile.acct}</h3>
+			<b className="text-cutoff">{profile.display_name.length > 0 ? profile.display_name : profile.acct}</b>
 			<span className="text-cutoff">@{profile.username}@{instance?.account_domain}</span>
-			<a onClick={logoutQuery} href="#" aria-label="Log out" title="Log out" className="logout">
+			<a onClick={() => void logoutQuery()} href="#" aria-label="Log out" title="Log out" className="logout">
 				<i className="fa fa-fw fa-sign-out" aria-hidden="true" />
 			</a>
 		</div>

web/source/settings/lib/query/oauth/index.ts

@@ -188,7 +188,7 @@ const extended = gtsApi.injectEndpoints({
 				return { data: null };
 			},
 		}),
-		logout: build.mutation({
+		logout: build.mutation<null, void>({
 			queryFn: (_arg, api) => {
 				api.dispatch(oauthRemove());
 				return { data: null };

web/source/settings/style.css

@@ -916,7 +916,7 @@ button.tab-button {
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
 	box-shadow: none;
-	background: $blue1;
+	background: $blue2;
 
 	&:hover {
 		background: $button-hover-bg;

web/source/settings/views/user/interactions/index.tsx

@@ -18,9 +18,13 @@
 */
 
 import React from "react";
+
+import { Redirect, Route, Router, Switch } from "wouter";
+import { BaseUrlContext, useBaseUrl } from "../../../lib/navigation/util";
+import InteractionRequestDetail from "./detail";
 import InteractionRequestsSearchForm from "./search";
 
-export default function InteractionRequests() {
+function InteractionRequests() {
 	return (
 		<div className="interaction-requests-view">
 			<div className="form-section-docs">
@@ -34,3 +38,25 @@ export default function InteractionRequests() {
 		</div>
 	);
 }
+
+/**
+ * - /settings/users/interaction-requests/search
+ * - /settings/users/interaction-requests/{reqId}
+ */
+export default function InteractionRequestsRouter() {
+	const parentUrl = useBaseUrl();
+	const thisBase = "/interaction-requests";
+	const absBase = parentUrl + thisBase;
+
+	return (
+		<BaseUrlContext.Provider value={absBase}>
+			<Router base={thisBase}>
+				<Switch>
+					<Route path="/search" component={InteractionRequests} />
+					<Route path="/:reqId" component={InteractionRequestDetail} />
+					<Redirect to="/search" />
+				</Switch>
+			</Router>
+		</BaseUrlContext.Provider>
+	);
+}

web/source/settings/views/user/menu.tsx

@@ -26,7 +26,7 @@ import React from "react";
  * - /settings/user/emailpassword
  * - /settings/user/migration
  */
-export default function UserMenu() {	
+export default function UserMenu() {
 	return (
 		<MenuItem
 			name="User"
@@ -45,7 +45,7 @@ export default function UserMenu() {
 			/>
 			<MenuItem
 				name="Interaction Requests"
-				itemUrl="interaction_requests"
+				itemUrl="interaction-requests"
 				icon="fa-commenting-o"
 			/>
 			<MenuItem

web/source/settings/views/user/router.tsx

@@ -26,8 +26,7 @@ import UserMigration from "./migration";
 import PostSettings from "./posts";
 import EmailPassword from "./emailpassword";
 import ExportImport from "./export-import";
-import InteractionRequests from "./interactions";
-import InteractionRequestDetail from "./interactions/detail";
+import InteractionRequestsRouter from "./interactions";
 
 /**
  * - /settings/user/profile
@@ -35,7 +34,7 @@ import InteractionRequestDetail from "./interactions/detail";
  * - /settings/user/emailpassword
  * - /settings/user/migration
  * - /settings/user/export-import
- * - /settings/users/interaction_requests
+ * - /settings/users/interaction-requests
  */
 export default function UserRouter() {
 	const baseUrl = useBaseUrl();
@@ -52,33 +51,11 @@ export default function UserRouter() {
 						<Route path="/emailpassword" component={EmailPassword} />
 						<Route path="/migration" component={UserMigration} />
 						<Route path="/export-import" component={ExportImport} />
-						<InteractionRequestsRouter />
-						<Route><Redirect to="/profile" /></Route>
+						<Route path="/interaction-requests/*?" component={InteractionRequestsRouter} />
+						<Redirect to="/profile" />
 					</Switch>
 				</ErrorBoundary>
 			</Router>
 		</BaseUrlContext.Provider>
 	);
-}
-
-/**
- * - /settings/users/interaction_requests/search
- * - /settings/users/interaction_requests/{reqId}
- */
-function InteractionRequestsRouter() {
-	const parentUrl = useBaseUrl();
-	const thisBase = "/interaction_requests";
-	const absBase = parentUrl + thisBase;
-
-	return (
-		<BaseUrlContext.Provider value={absBase}>
-			<Router base={thisBase}>
-				<Switch>
-					<Route path="/search" component={InteractionRequests} />
-					<Route path="/:reqId" component={InteractionRequestDetail} />
-					<Route><Redirect to="/search"/></Route>
-				</Switch>
-			</Router>
-		</BaseUrlContext.Provider>
-	);
-}
+}

web/source/tsconfig.json

@@ -25,9 +25,9 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "preserve",                                /* Specify what module code is generated. */
+    "module": "commonjs",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
-    "moduleResolution": "bundler",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */

web/template/404.tmpl

@@ -19,25 +19,25 @@
 
 {{- with . }}
 <main>
-    <section>
-        <h1>404: Not Found</h1>
-        <p>
-            GoToSocial only serves Public statuses via the web.
-        </p>
-        <p>
-            If you reached this page by clicking on a status link,
-            it's likely that the status is not Public. You can try
-            entering the status URL in your client's search bar,
-            to view the status from your account. If that doesn't
-            work, it's possible that the status has been deleted by
-            the author, you don't have permission to view it, or it
-            doesn't exist at all.
-        </p>
-        <p>
-            If you believe this 404 was an error, you can contact
-            the instance admin. Provide them with the following
-            request ID: <code>{{- .requestID -}}</code>.
-        </p>
-    </section>
+	<section>
+		<h1>404: Not Found</h1>
+		<p>
+			GoToSocial only serves Public statuses via the web.
+		</p>
+		<p>
+			If you reached this page by clicking on a status link,
+			it's likely that the status is not Public. You can try
+			entering the status URL in your client's search bar,
+			to view the status from your account. If that doesn't
+			work, it's possible that the status has been deleted by
+			the author, you don't have permission to view it, or it
+			doesn't exist at all.
+		</p>
+		<p>
+			If you believe this 404 was an error, you can contact
+			the instance admin. Provide them with the following
+			request ID: <code>{{- .requestID -}}</code>.
+		</p>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/about.tmpl

@@ -37,12 +37,12 @@
 {{- if .languages }}
 <p>This instance prefers the following languages:</p>
 <ol>
-    {{- range .languages }}
-    <li>{{- . -}}</li>
-    {{- end }}
+	{{- range .languages }}
+	<li>{{- . -}}</li>
+	{{- end }}
 </ol>
 {{- else }}
-<p>No preferred languages have yet been set for this instance.</p> 
+<p>No preferred languages have yet been set for this instance.</p>
 {{- end }}
 {{- end -}}
 
@@ -50,9 +50,9 @@
 {{- if .instance.Rules }}
 <p>This instance has the following rules:</p>
 <ol>
-    {{- range .instance.Rules }}
-    <li>{{- .Text -}}</li>
-    {{- end }}
+	{{- range .instance.Rules }}
+	<li>{{- .Text -}}</li>
+	{{- end }}
 </ol>
 {{- else }}
 <p>No rules have yet been set for this instance.</p>
@@ -60,7 +60,8 @@
 {{- end -}}
 
 {{- define "customCSSLimits" -}}
-<a href="https://docs.gotosocial.org/en/latest/user_guide/settings/#custom-css" target="_blank" rel="noopener noreferrer">Custom CSS</a> is&nbsp;
+<a href="https://docs.gotosocial.org/en/latest/user_guide/settings/#custom-css" target="_blank"
+	rel="noopener noreferrer">Custom CSS</a> is&nbsp;
 {{- if .instance.Configuration.Accounts.AllowCustomCSS -}}
 <b>enabled</b>
 {{- else -}}
@@ -82,112 +83,114 @@ Polls can have up to
 {{- end -}}
 
 {{- with . }}
-<main class="about">
-    <nav class="about-section" aria-labelledby="toc">
-        <h3 id="toc">Table of Contents</h3>
-        <div class="about-section-contents">
-            <ol>
-                <li><a href="#about">About {{ .instance.Title -}}</a></li>
-                <li><a href="#contact">Contact</a></li>
-                <li><a href="#features">Features</a></li>
-                <li><a href="#languages">Languages</a></li>
-                <li><a href="#signup">Register an Account on {{ .instance.Title -}}</a></li>
-                <li><a href="#rules">Rules</a></li>
-                <li><a href="#terms">Terms and Conditions</a></li>
-                <li><a href="#moderated-servers">Moderated Servers</a></li>
-            </ol>
-        </div>
-    </nav>
-    <section class="about-section" role="region" aria-labelledby="about">
-        <h3 id="about">About {{ .instance.Title -}}</h3>
-        <div class="about-section-contents">
-            {{- with . }}
-            {{- include "description" . | indent 3 }}
-            {{- end }}
-        </div>
-    </section>
-    <section class="about-section" role="region" aria-labelledby="contact">
-        <h3 id="contact">Admin Contact</h3>
-        <div class="about-section-contents">
-            {{- if .instance.ContactAccount }}
-            <a href="{{- .instance.ContactAccount.URL -}}" class="account-card">
-                <img class="avatar" src="{{- .instance.ContactAccount.Avatar -}}" alt=""/>
-                <h3>
-                    {{- if .instance.ContactAccount.DisplayName -}}
-                    {{- emojify .instance.ContactAccount.Emojis (escape .instance.ContactAccount.DisplayName) -}}
-                    {{- else -}}
-                    {{- .instance.ContactAccount.Username -}}
-                    {{- end -}}
-                </h3>
-                <span>@{{- .instance.ContactAccount.Username -}}</span>
-            </a>
-            {{- else }}
-            <p>This instance has not yet set a contact account.</p>
-            {{- end }}
-            {{- if .instance.Email }}
-            <p>Email: <a href="mailto:{{- .instance.Email -}}">{{- .instance.Email -}}</a></p>
-            {{- else }}
-            <p>This instance has not yet set a contact email address.</p>
-            {{- end }}
-        </div>
-    </section>
-    <section class="about-section" role="region" aria-labelledby="features">
-        <h3 id="features">Instance Features</h3>
-        <div class="about-section-contents">
-            <ul>
-                <li>{{- template "statusLimits" . -}}</li>
-                <li>{{- template "pollLimits" . -}}</li>
-                <li>{{- template "customCSSLimits" . -}}</li>
-            </ul>
-        </div>
-    </section>
-    <section class="about-section" role="region" aria-labelledby="languages">
-        <h3 id="languages">Languages</h3>
-        <div class="about-section-contents">
-            {{- with . }}
-            {{- include "languages" . | indent 3 }}
-            {{- end }}
-        </div>
-    </section>
-    {{- include "index_register.tmpl" . | indent 1 }}
-    <section class="about-section" role="region" aria-labelledby="rules">
-        <h3 id="rules">Instance Rules</h3>
-        <div class="about-section-contents">
-            {{- with . }}
-            {{- include "rules" . | indent 3 }}
-            {{- end }}
-        </div>
-    </section>
-    <section class="about-section" role="region" aria-labelledby="terms">
-        <h3 id="terms">Terms and Conditions</h3>
-        <div class="about-section-contents">
-            {{- with . }}
-            {{- include "termsAndConditions" . | indent 3 }}
-            {{- end }}
-        </div>
-    </section>
-    <section class="about-section" role="region" aria-labelledby="moderated-servers">
-        <h3 id="moderated-servers">Moderated servers</h3>
-        <div class="about-section-contents">
-            <p>
-                ActivityPub instances federate with other instances by exchanging data with them over the network.
-                Exchanged data includes things like accounts, statuses, likes, boosts, and media attachments.
-                This exchange of data can be prevented for instances on specific domains via a domain block created
-                by an instance admin. When an instance is domain blocked by another instance:
-            </p>
-            <ul>
-                <li>Any existing data from the blocked instance is deleted from the storage of the instance doing the blocking.</li>
-                <li>Interaction between the two instances is cut off in both directions; neither instance can interact with the other.</li>
-                <li>No new data from the blocked instance will be created on the instance that blocks it.</li>
-            </ul>
-            <p>
-                {{- if .blocklistExposed }}
-                <a href="/about/suspended">View the list of domains blocked by this instance</a>
-                {{- else }}
-                This instance does not publically share their list of blocked domains.
-                {{- end }}
-            </p>
-        </div>
-    </section>
+<nav class="sidebar" aria-labelledby="toc">
+	<h2 id="toc">Table of Contents</h2>
+	<div>
+		<ol>
+			<li><a href="#about">About</a></li>
+			<li><a href="#contact">Contact</a></li>
+			<li><a href="#features">Features</a></li>
+			<li><a href="#languages">Languages</a></li>
+			<li><a href="#signup">Register an Account</a></li>
+			<li><a href="#rules">Rules</a></li>
+			<li><a href="#terms">Terms and Conditions</a></li>
+			<li><a href="#moderated-servers">Moderated Servers</a></li>
+		</ol>
+	</div>
+</nav>
+<main class="single-page">
+	<section role="region" aria-labelledby="about">
+		<h2 id="about">About {{ .instance.Title -}}</h2>
+		<div>
+			{{- with . }}
+			{{- include "description" . | indent 3 }}
+			{{- end }}
+		</div>
+	</section>
+	<section role="region" aria-labelledby="contact">
+		<h2 id="contact">Admin Contact</h2>
+		<div>
+			{{- if .instance.ContactAccount }}
+			<a href="{{- .instance.ContactAccount.URL -}}" class="account-card">
+				<img class="avatar" src="{{- .instance.ContactAccount.Avatar -}}" alt="" />
+				<b>
+					{{- if .instance.ContactAccount.DisplayName -}}
+					{{- emojify .instance.ContactAccount.Emojis (escape .instance.ContactAccount.DisplayName) -}}
+					{{- else -}}
+					{{- .instance.ContactAccount.Username -}}
+					{{- end -}}
+				</b>
+				<span>@{{- .instance.ContactAccount.Username -}}</span>
+			</a>
+			{{- else }}
+			<p>This instance has not yet set a contact account.</p>
+			{{- end }}
+			{{- if .instance.Email }}
+			<p>Email: <a href="mailto:{{- .instance.Email -}}">{{- .instance.Email -}}</a></p>
+			{{- else }}
+			<p>This instance has not yet set a contact email address.</p>
+			{{- end }}
+		</div>
+	</section>
+	<section role="region" aria-labelledby="features">
+		<h2 id="features">Instance Features</h2>
+		<div>
+			<ul>
+				<li>{{- template "statusLimits" . -}}</li>
+				<li>{{- template "pollLimits" . -}}</li>
+				<li>{{- template "customCSSLimits" . -}}</li>
+			</ul>
+		</div>
+	</section>
+	<section role="region" aria-labelledby="languages">
+		<h2 id="languages">Languages</h2>
+		<div>
+			{{- with . }}
+			{{- include "languages" . | indent 3 }}
+			{{- end }}
+		</div>
+	</section>
+	{{- include "index_register.tmpl" . | indent 1 }}
+	<section role="region" aria-labelledby="rules">
+		<h2 id="rules">Instance Rules</h2>
+		<div>
+			{{- with . }}
+			{{- include "rules" . | indent 3 }}
+			{{- end }}
+		</div>
+	</section>
+	<section role="region" aria-labelledby="terms">
+		<h2 id="terms">Terms and Conditions</h2>
+		<div>
+			{{- with . }}
+			{{- include "termsAndConditions" . | indent 3 }}
+			{{- end }}
+		</div>
+	</section>
+	<section role="region" aria-labelledby="moderated-servers">
+		<h2 id="moderated-servers">Moderated servers</h2>
+		<div>
+			<p>
+				ActivityPub instances federate with other instances by exchanging data with them over the network.
+				Exchanged data includes things like accounts, statuses, likes, boosts, and media attachments.
+				This exchange of data can be prevented for instances on specific domains via a domain block created
+				by an instance admin. When an instance is domain blocked by another instance:
+			</p>
+			<ul>
+				<li>Any existing data from the blocked instance is deleted from the storage of the instance doing the
+					blocking.</li>
+				<li>Interaction between the two instances is cut off in both directions; neither instance can interact
+					with the other.</li>
+				<li>No new data from the blocked instance will be created on the instance that blocks it.</li>
+			</ul>
+			<p>
+				{{- if .blocklistExposed }}
+				<a href="/about/suspended">View the list of domains blocked by this instance</a>
+				{{- else }}
+				This instance does not publically share their list of blocked domains.
+				{{- end }}
+			</p>
+		</div>
+	</section>
 </main>
 {{- end }}

web/template/authorize.tmpl

@@ -19,25 +19,25 @@
 
 {{- with . }}
 <main>
-    <section class="with-form" aria-labelledby="authorize">
-        <h2 id="authorize">Authorize app</h2>
-        <form action="/oauth/authorize" method="POST">
-            <p>Hi <b>{{- .user -}}</b>!</p>
-            <p>
-                Application
-                {{- if .appwebsite }}
-                <a href="{{- .appwebsite -}}" rel="nofollow noreferrer noopener" target="_blank">{{- .appname -}}</a>
-                {{- else }}
-                <b>{{- .appname -}}</b>
-                {{- end }}
-                would like to perform actions on your behalf, with scope
-                <em>{{- .scope -}}</em>.
-            </p>
-            <p>
-                To continue, the application will redirect to: <code>{{- .redirect -}}</code>
-            </p>
-            <button type="submit" class="btn btn-success">Allow</button>
-        </form>
-    </section>
+	<section class="with-form" aria-labelledby="authorize">
+		<h2 id="authorize">Authorize app</h2>
+		<form action="/oauth/authorize" method="POST">
+			<p>Hi <b>{{- .user -}}</b>!</p>
+			<p>
+				Application
+				{{- if .appwebsite }}
+				<a href="{{- .appwebsite -}}" rel="nofollow noreferrer noopener" target="_blank">{{- .appname -}}</a>
+				{{- else }}
+				<b>{{- .appname -}}</b>
+				{{- end }}
+				would like to perform actions on your behalf, with scope
+				<em>{{- .scope -}}</em>.
+			</p>
+			<p>
+				To continue, the application will redirect to: <code>{{- .redirect -}}</code>
+			</p>
+			<button type="submit" class="btn btn-success">Allow</button>
+		</form>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/confirm_email.tmpl

@@ -19,15 +19,15 @@
 
 {{- with . }}
 <main>
-    <section class="with-form" aria-labelledby="confirm">
-        <h2 id="confirm">Confirm email address</h2>
-        <form action="/confirm_email?token={{ .token }}" method="POST">
-            <p>
-                Hi <b>{{- .username -}}</b>!
-                Please click the button to confirm your email address <b>{{- .email -}}</b>.
-            </p>
-            <button type="submit" class="btn btn-success">Confirm</button>
-        </form>
-    </section>
+	<section class="with-form" aria-labelledby="confirm">
+		<h2 id="confirm">Confirm email address</h2>
+		<form action="/confirm_email?token={{ .token }}" method="POST">
+			<p>
+				Hi <b>{{- .username -}}</b>!
+				Please click the button to confirm your email address <b>{{- .email -}}</b>.
+			</p>
+			<button type="submit" class="btn btn-success">Confirm</button>
+		</form>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/confirmed_email.tmpl

@@ -19,12 +19,12 @@
 
 {{- with . }}
 <main>
-    <section aria-labelledby="confirmed">
-        <h2 id="confirmed">Email address confirmed</h2>
-        <p>Email address <b>{{- .email -}}</b> is now confirmed!</p>
-        {{- if not .approved }}
-        <p>Once an admin has approved your sign-up, you will be able to log in and use your account.</p>
-        {{- end }}
-    </section>
+	<section aria-labelledby="confirmed">
+		<h2 id="confirmed">Email address confirmed</h2>
+		<p>Email address <b>{{- .email -}}</b> is now confirmed!</p>
+		{{- if not .approved }}
+		<p>Once an admin has approved your sign-up, you will be able to log in and use your account.</p>
+		{{- end }}
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/domain-blocklist.tmpl

@@ -19,34 +19,34 @@
 
 {{- with . }}
 <main>
-    <section>
-        <h1>Suspended Instances</h1>
-        <p>
-            The following list of domains have been suspended
-            by the administrator(s) of this server.
-        </p>
-        <p>
-            All current and future accounts on these instances are
-            blocked, and no more data is federated to the remote servers.
-            This extends to subdomains, so an entry for 'example.com'
-            includes 'social.example.com' as well.
-        </p>
-        <div class="list domain-blocklist">
-            <div class="header entry">
-                <div class="domain">Domain</div>
-                <div class="public_comment">Public comment</div>
-            </div>
-            {{- range .blocklist }}
-            <div class="entry" id="{{- .Domain -}}">
-                <div class="domain">
-                    <a class="text-cutoff" href="#{{- .Domain -}}" title="{{- .Domain -}}">{{- .Domain -}}</a>
-                </div>
-                <div class="public_comment">
-                    <p>{{- .PublicComment -}}</p>
-                </div>
-            </div>
-            {{- end }}
-        </div>
-    </section>
+	<section>
+		<h1>Suspended Instances</h1>
+		<p>
+			The following list of domains have been suspended
+			by the administrator(s) of this server.
+		</p>
+		<p>
+			All current and future accounts on these instances are
+			blocked, and no more data is federated to the remote servers.
+			This extends to subdomains, so an entry for 'example.com'
+			includes 'social.example.com' as well.
+		</p>
+		<div class="list domain-blocklist">
+			<div class="header entry">
+				<div class="domain">Domain</div>
+				<div class="public_comment">Public comment</div>
+			</div>
+			{{- range .blocklist }}
+			<div class="entry" id="{{- .Domain -}}">
+				<div class="domain">
+					<a class="text-cutoff" href="#{{- .Domain -}}" title="{{- .Domain -}}">{{- .Domain -}}</a>
+				</div>
+				<div class="public_comment">
+					<p>{{- .PublicComment -}}</p>
+				</div>
+			</div>
+			{{- end }}
+		</div>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/email_new_signup.tmpl

@@ -23,10 +23,13 @@ Someone has submitted a new account sign-up to your instance.
 
 They provided the following details:
 
-Email address: {{ .SignupEmail }}
-Username:      {{ .SignupUsername }}
+Email address:
+{{ .SignupEmail }}
+Username:
+{{ .SignupUsername }}
 {{- if .SignupReason }}
-Reason:        {{ .SignupReason }}
+Reason:
+{{ .SignupReason }}
 {{- end }}
 
 To view the sign-up, paste the following link into your browser: {{ .SignupURL }}

web/template/email_test.tmpl

@@ -28,4 +28,4 @@ The following message was included by the admin user:
 
 {{ .Message }}
 {{- else }}
-{{- end }}
+{{- end }}

web/template/error.tmpl

@@ -19,14 +19,14 @@
 
 {{- with . }}
 <main>
-    <section class="error">
-        <h1>An error occured:</h1>
-        <pre>{{- .error -}}</pre>
-        {{- if .requestID }}
-        <div>
-            <span>Request ID:</span> <code>{{- .requestID -}}</code>
-        </div>
-        {{- end }}
-    </section>
+	<section class="error">
+		<h1>An error occured:</h1>
+		<pre>{{- .error -}}</pre>
+		{{- if .requestID }}
+		<div>
+			<span>Request ID:</span> <code>{{- .requestID -}}</code>
+		</div>
+		{{- end }}
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/finalize.tmpl

@@ -19,35 +19,30 @@
 
 {{- with . }}
 <main>
-    <section class="with-form" aria-labelledby="finalize">
-        <h2 id="finalize">Finalize sign-in to {{ .instance.Title -}}</h2>
-        <form action="/oauth/finalize" method="POST">
-            <p>
-                Hi <b>{{- .name -}}</b>!
-            </p>
-            <p>
-                You are about to create an account on <b>{{- .instance.Title -}}</b>.
-                To finish the process, you must select your username.
-            </p>
-            <div class="labelinput">
-                <label for="username">
-                    Username (lowercase a-z, numbers, and underscores; max 64 characters).<br/>
-                    <small>Your username will be part of your fediverse handle, and cannot be changed later, so choose thoughtfully!</small>
-                </label>
-                <input 
-                    id="username"
-                    type="text"
-                    name="username"
-                    required
-                    placeholder="Please enter your desired username"
-                    pattern="^[a-z0-9_]{1,64}$"
-                    title="lowercase a-z, numbers, and underscores; max 64 characters"
-                    value="{{- .preferredUsername -}}"
-                >
-            </div>
-            <input type="hidden" name="name" value="{{- .name -}}">
-            <button type="submit" class="btn btn-success">Submit</button>
-        </form>
-    </section>
+	<section class="with-form" aria-labelledby="finalize">
+		<h2 id="finalize">Finalize sign-in to {{ .instance.Title -}}</h2>
+		<form action="/oauth/finalize" method="POST">
+			<p>
+				Hi <b>{{- .name -}}</b>!
+			</p>
+			<p>
+				You are about to create an account on <b>{{- .instance.Title -}}</b>.
+				To finish the process, you must select your username.
+			</p>
+			<div class="labelinput">
+				<label for="username">
+					Username (lowercase a-z, numbers, and underscores; max 64 characters).<br />
+					<small>Your username will be part of your fediverse handle, and cannot be changed later, so choose
+						thoughtfully!</small>
+				</label>
+				<input id="username" type="text" name="username" required
+					placeholder="Please enter your desired username" pattern="^[a-z0-9_]{1,64}$"
+					title="lowercase a-z, numbers, and underscores; max 64 characters"
+					value="{{- .preferredUsername -}}">
+			</div>
+			<input type="hidden" name="name" value="{{- .name -}}">
+			<button type="submit" class="btn btn-success">Submit</button>
+		</form>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/index.tmpl

@@ -26,16 +26,16 @@
 {{- end -}}
 
 {{- with . }}
-<main class="about">
-    <section class="about-section" role="region" aria-labelledby="about">
-        <h3 id="about">About this instance</h3>
-        <div class="about-section-contents">
-            {{- include "shortDescription" . | indent 3 }}
-            <a href="/about">See more details</a>
-        </div>
-    </section>
-    {{- include "index_what_is_this.tmpl" . | indent 1 }}
-    {{- include "index_register.tmpl" . | indent 1 }}
-    {{- include "index_apps.tmpl" . | indent 1 }}
+<main class="index-page sectioned">
+	<section role="region" aria-labelledby="about">
+		<h2 id="about">About this instance</h2>
+		<div>
+			{{- include "shortDescription" . | indent 3 }}
+			<a href="/about">See more details</a>
+		</div>
+	</section>
+	{{- include "index_what_is_this.tmpl" . | indent 1 }}
+	{{- include "index_register.tmpl" . | indent 1 }}
+	{{- include "index_apps.tmpl" . | indent 1 }}
 </main>
-{{- end }}
+{{- end }}

web/template/index_apps.tmpl

@@ -18,101 +18,65 @@
 */ -}}
 
 {{- with . }}
-<section role="region" class="about-section apps" aria-labelledby="apps">
-    <h3 id="apps">Client applications</h3>
-    <div class="about-section-contents">
-        <p>
-            Have an account on this instance and want to log in? 
-            GoToSocial does not provide its own webclient, but implements the Mastodon client API.
-            You can use a variety of clients to log in to your account here:
-        </p>
-        <ul class="applist nodot" role="group">
-            <li class="applist-entry">
-                <div class="applist-text">
-                    <p><strong>Semaphore</strong> is a web client designed for speed and simplicity.</p>
-                    <a
-                        href="https://semaphore.social/"
-                        rel="nofollow noreferrer noopener"
-                        target="_blank"
-                    >
-                        Use Semaphore
-                    </a>
-                </div>
-                <svg
-                    role="img"
-                    aria-labelledby="semaphore-title semaphore-desc"
-                    class="applist-logo redraw"
-                    xmlns="http://www.w3.org/2000/svg"
-                    viewBox="0 0 146 120"
-                    width="100"
-                    height="100"
-                >
-                    <title id="semaphore-title">The Semaphore logo</title>
-                    <desc id="semaphore-desc">A waving flag</desc>
-                    <path d="M68.13 0C53.94 0 42.81 20 13.9 27.1l-2.23-5.29a6.5 6.5 0 0 0-5.17-10.4 6.5 6.5 0 0 0-.81 12.95L46.2 120l5.99-2.5-14.42-33.33c22.8-6.86 32.51-22.16 49.83-20.58 9.9.9 4.87 19.56 8.11 17.93 16.22-8.15 32.44-11.41 50.29-11.41-7.96-9.78-17.38-20.55-22.71-31.74L120.8 32c-2.32-7.33-2.56-14.75.87-22.22-9.74-3.26-21.1 0-32.45 4.9C82.2 9.77 79.5 0 68.13 0zM15.26 30.42c8.95 6.63 13.63 13.86 16.07 20.94l1.62 6.32c1.24 6.58 1.07 12.8 1.27 18.03z"></path>
-                </svg>
-            </li>
-            <li class="applist-entry">
-                <div class="applist-text">
-                    <p><strong>Tusky</strong> is a lightweight mobile client for Android.</p>
-                    <a
-                        href="https://tusky.app"
-                        rel="nofollow noreferrer noopener"
-                        target="_blank"
-                    >
-                        Get Tusky
-                    </a>
-                </div>
-                <img
-                    class="applist-logo"
-                    src="/assets/tusky.svg"
-                    alt="The Tusky mascot, a cartoon elephant tooting happily"
-                    title="The Tusky mascot, a cartoon elephant tooting happily"
-                    width="100"
-                    height="100"
-                />
-            </li>
-            <li class="applist-entry">
-                <div class="applist-text">
-                    <p><strong>Feditext</strong> (beta) is a beautiful client for iOS, iPadOS and macOS.</p>
-                    <a
-                        href="https://github.com/feditext/feditext"
-                        rel="nofollow noreferrer noopener"
-                        target="_blank"
-                    >
-                        Get Feditext
-                    </a>
-                </div>
-                <img
-                    class="applist-logo"
-                    src="/assets/feditext.svg"
-                    alt="The Feditext logo, the characters 'ft' at a slight angle"
-                    title="The Feditext logo, the characters 'ft' at a slight angle"
-                    width="100"
-                    height="100"
-                />
-            </li>
-            <li class="applist-entry">
-                <div class="applist-text">
-                    <p>Or try one of the <strong>Mastodon clients</strong> listed on the official Mastodon page.</p>
-                    <a
-                        href="https://joinmastodon.org/apps"
-                        rel="nofollow noreferrer noopener"
-                        target="_blank"
-                    >
-                        Get Mastodon apps
-                    </a>
-                </div>
-                <img
-                    class="applist-logo"
-                    src="/assets/mastodon.svg"
-                    alt="The Mastodon logo, the character 'M' in a speech bubble"
-                    title="The Mastodon logo, the character 'M' in a speech bubble"
-                    width="100"
-                    height="100"
-                />
-            </li>
-        </ul>
-    </div>
+<section role="region" class="apps" aria-labelledby="apps">
+	<h2 id="apps">Client applications</h2>
+	<div>
+		<p>
+			Have an account on this instance and want to log in?
+			GoToSocial does not provide its own webclient, but implements the Mastodon client API.
+			You can use a variety of clients to log in to your account here:
+		</p>
+		<ul class="applist nodot" role="group">
+			<li class="applist-entry">
+				<div class="applist-text">
+					<p><strong>Semaphore</strong> is a web client designed for speed and simplicity.</p>
+					<a href="https://semaphore.social/" rel="nofollow noreferrer noopener" target="_blank">
+						Use Semaphore
+					</a>
+				</div>
+				<svg role="img" aria-labelledby="semaphore-title semaphore-desc" class="applist-logo redraw"
+					xmlns="http://www.w3.org/2000/svg" viewBox="0 0 146 120" width="100" height="100">
+					<title id="semaphore-title">The Semaphore logo</title>
+					<desc id="semaphore-desc">A waving flag</desc>
+					<path
+						d="M68.13 0C53.94 0 42.81 20 13.9 27.1l-2.23-5.29a6.5 6.5 0 0 0-5.17-10.4 6.5 6.5 0 0 0-.81 12.95L46.2 120l5.99-2.5-14.42-33.33c22.8-6.86 32.51-22.16 49.83-20.58 9.9.9 4.87 19.56 8.11 17.93 16.22-8.15 32.44-11.41 50.29-11.41-7.96-9.78-17.38-20.55-22.71-31.74L120.8 32c-2.32-7.33-2.56-14.75.87-22.22-9.74-3.26-21.1 0-32.45 4.9C82.2 9.77 79.5 0 68.13 0zM15.26 30.42c8.95 6.63 13.63 13.86 16.07 20.94l1.62 6.32c1.24 6.58 1.07 12.8 1.27 18.03z">
+					</path>
+				</svg>
+			</li>
+			<li class="applist-entry">
+				<div class="applist-text">
+					<p><strong>Tusky</strong> is a lightweight mobile client for Android.</p>
+					<a href="https://tusky.app" rel="nofollow noreferrer noopener" target="_blank">
+						Get Tusky
+					</a>
+				</div>
+				<img class="applist-logo" src="/assets/tusky.svg"
+					alt="The Tusky mascot, a cartoon elephant tooting happily"
+					title="The Tusky mascot, a cartoon elephant tooting happily" width="100" height="100" />
+			</li>
+			<li class="applist-entry">
+				<div class="applist-text">
+					<p><strong>Feditext</strong> (beta) is a beautiful client for iOS, iPadOS and macOS.</p>
+					<a href="https://github.com/feditext/feditext" rel="nofollow noreferrer noopener" target="_blank">
+						Get Feditext
+					</a>
+				</div>
+				<img class="applist-logo" src="/assets/feditext.svg"
+					alt="The Feditext logo, the characters 'ft' at a slight angle"
+					title="The Feditext logo, the characters 'ft' at a slight angle" width="100" height="100" />
+			</li>
+			<li class="applist-entry">
+				<div class="applist-text">
+					<p>Or try one of the <strong>Mastodon clients</strong> listed on the official Mastodon page.</p>
+					<a href="https://joinmastodon.org/apps" rel="nofollow noreferrer noopener" target="_blank">
+						Get Mastodon apps
+					</a>
+				</div>
+				<img class="applist-logo" src="/assets/mastodon.svg"
+					alt="The Mastodon logo, the character 'M' in a speech bubble"
+					title="The Mastodon logo, the character 'M' in a speech bubble" width="100" height="100" />
+			</li>
+		</ul>
+	</div>
 </section>
-{{- end }}
+{{- end }}

web/template/index_register.tmpl

@@ -20,22 +20,23 @@
 {{- define "registrationLimits" -}}
 New account registration is currently 
 {{- if .instance.Registrations -}}
-    <b>open</b>.
+<b>open</b>.
 {{- else -}}
-    <b>closed</b>.
+<b>closed</b>.
 {{- end -}}
 {{- end -}}
 
 {{- with . }}
-<section class="about-section" role="region" aria-labelledby="signup">
-    <h3 id="signup">Register an Account on {{ .instance.Title -}}</h3>
-    <div class="about-section-contents">
-        <p>{{- template "registrationLimits" . -}}</p>
-        {{- if .instance.Registrations }}
-        <p>To register a new account, please first read the <a href="/about#rules">rules</a> and <a href="/about#terms">terms</a>.</p>
-        <p>Then, use the <a href="/signup">sign-up page</a> to register an account.</p>
-        <p>Manual admin approval is <b>required</b> for new accounts.</p>
-        {{- end }}
-    </div>
+<section role="region" aria-labelledby="signup">
+	<h2 id="signup">Register an Account on {{ .instance.Title -}}</h2>
+	<div>
+		<p>{{- template "registrationLimits" . -}}</p>
+		{{- if .instance.Registrations }}
+		<p>To register a new account, please first read the <a href="/about#rules">rules</a> and <a
+				href="/about#terms">terms</a>.</p>
+		<p>Then, use the <a href="/signup">sign-up page</a> to register an account.</p>
+		<p>Manual admin approval is <b>required</b> for new accounts.</p>
+		{{- end }}
+	</div>
 </section>
-{{- end }}
+{{- end }}

web/template/index_what_is_this.tmpl

@@ -18,59 +18,51 @@
 */ -}}
 
 {{- with . }}
-<section role="region" class="about-section what-is-this" aria-labelledby="what-is-this">
-    <h3 id="what-is-this">What is this?</h3>
-    <div class="about-section-contents">
-        <p>
-            The web page you're reading right now is served by an instance of GoToSocial,
-            a federated, distributed, open-source microblogging software which connects
-            to other instances across a network known as the "fediverse".
-        </p>
-        <h4 id="what-is-an-instance">What is an "instance"?</h4>
-        <p>
-            "Instance" is a term commonly used for one node in the fediverse. Each instance
-            has its own web address, user(s), culture, rules, and settings. Instances exchange
-            data by "talking" to each other over the internet using a protocol called ActivityPub.
-        </p>
-        <a
-            class="activitypub-logo-wrapper"
-            href="https://activitypub.rocks/"
-            rel="nofollow noreferrer noopener"
-            target="_blank"
-        >
-            <img
-                class="activitypub-logo"
-                src="/assets/activitypub_light.svg"
-                alt="ActivityPub logo by mray, CC0 1.0"
-                title="ActivityPub logo by mray, CC0 1.0"
-                width="250"
-                height="65"
-            />
-            Learn more about ActivityPub (opens in a new tab).
-        </a>
-        <p>
-            Each instance can, in theory, talk to each other instance, allowing people to talk
-            to one another across a decentralized network that has no single authority in charge.
-        </p>
-        <p>
-            There are thousands of fediverse instances, connecting millions of people together.
-        </p>
-        <h4 id="how-do-i-join-the-fediverse">How do I join the fediverse?</h4>
-        <p>
-            You can join the fediverse by running your own instance of an ActivityPub software,
-            or by finding an existing instance that aligns with your values and expectations,
-            and registering an account.
-        </p>
-        <p>
-            To help you find an instance that suits you, you can try one of the following tools:
-        </p>
-        <ul>
-            <li><a href="https://fediverse.observer" rel="nofollow noreferrer noopener" target="_blank">Fediverse Observer (opens in a new tab)</a></li>
-            <li><a href="https://fedidb.org/network" rel="nofollow noreferrer noopener" target="_blank">FediDB (opens in a new tab)</a></li>
-        </ul>
-        {{- if .instance.Registrations }}
-        <p>Or, just <a href="signup">register for an account on this instance</a>!</p>
-        {{- end }}
-    </div>
+<section role="region" class="what-is-this" aria-labelledby="what-is-this">
+	<h2 id="what-is-this">What is this?</h2>
+	<div>
+		<p>
+			The web page you're reading right now is served by an instance of GoToSocial,
+			a federated, distributed, open-source microblogging software which connects
+			to other instances across a network known as the "fediverse".
+		</p>
+		<h3 id="what-is-an-instance">What is an "instance"?</h3>
+		<p>
+			"Instance" is a term commonly used for one node in the fediverse. Each instance
+			has its own web address, user(s), culture, rules, and settings. Instances exchange
+			data by "talking" to each other over the internet using a protocol called ActivityPub.
+		</p>
+		<a class="activitypub-logo-wrapper" href="https://activitypub.rocks/" rel="nofollow noreferrer noopener"
+			target="_blank">
+			<img class="activitypub-logo" src="/assets/activitypub_light.svg" alt="ActivityPub logo by mray, CC0 1.0"
+				title="ActivityPub logo by mray, CC0 1.0" width="250" height="65" />
+			Learn more about ActivityPub (opens in a new tab).
+		</a>
+		<p>
+			Each instance can, in theory, talk to each other instance, allowing people to talk
+			to one another across a decentralized network that has no single authority in charge.
+		</p>
+		<p>
+			There are thousands of fediverse instances, connecting millions of people together.
+		</p>
+		<h3 id="how-do-i-join-the-fediverse">How do I join the fediverse?</h3>
+		<p>
+			You can join the fediverse by running your own instance of an ActivityPub software,
+			or by finding an existing instance that aligns with your values and expectations,
+			and registering an account.
+		</p>
+		<p>
+			To help you find an instance that suits you, you can try one of the following tools:
+		</p>
+		<ul>
+			<li><a href="https://fediverse.observer" rel="nofollow noreferrer noopener" target="_blank">Fediverse
+					Observer (opens in a new tab)</a></li>
+			<li><a href="https://fedidb.org/network" rel="nofollow noreferrer noopener" target="_blank">FediDB (opens in
+					a new tab)</a></li>
+		</ul>
+		{{- if .instance.Registrations }}
+		<p>Or, just <a href="signup">register for an account on this instance</a>!</p>
+		{{- end }}
+	</div>
 </section>
-{{- end }}
+{{- end }}

web/template/oob.tmpl

@@ -19,10 +19,10 @@
 
 {{- with . }}
 <main>
-    <section class="oob-token">
-        <h1>Hi <b>{{- .user -}}</b>!</h1>
-        <p>Here's your out-of-band token with scope "<em>{{- .scope -}}</em>", use it wisely:</p>
-        <code>{{- .oobToken -}}</code>
-    </section>
+	<section class="oob-token">
+		<h1>Hi <b>{{- .user -}}</b>!</h1>
+		<p>Here's your out-of-band token with scope "<em>{{- .scope -}}</em>", use it wisely:</p>
+		<code>{{- .oobToken -}}</code>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/page.tmpl

@@ -22,7 +22,7 @@
         If some if/else macro is used multiple times, declare it once here instead.
         When invoking these nested templates, remember to pass in the values passed
         to the executing template, ie., use '{{ template "example" . }}' not
-        '{{ template "example" }}', otherwise you'll end up with empty variables.
+'{{ template "example" }}', otherwise you'll end up with empty variables.
 */ -}}
 
 {{- define "thumbnailType" -}}
@@ -43,43 +43,47 @@ image/webp
 
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="robots" content="{{- if .robotsMeta -}}{{- .robotsMeta -}}{{- else -}}noindex, nofollow{{- end -}}">
-        {{- if .ogMeta }}
-        {{- include "page_ogmeta.tmpl" . | indent 2 }}
-        {{- else }}
-        {{- end }}
-        {{- if .rssFeed }}
-        <link rel="alternate" type="application/rss+xml" href="{{- .rssFeed -}}" title="{{- template "instanceTitle" . -}}">
-        {{- else }}
-        {{- end }}
-        {{- if .account }}
-        <link rel="alternate" type="application/activity+json" href="/users/{{- .account.Username -}}">
-        {{- else if .status }}
-        <link rel="alternate" type="application/activity+json" href="/users/{{- .status.Account.Username -}}/statuses/{{- .status.ID -}}">
-        {{- else }}
-        {{- end }}
-        <link rel="icon" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
-        <link rel="apple-touch-icon" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
-        <link rel="apple-touch-startup-image" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
-        {{- include "page_stylesheets.tmpl" . | indent 2 }}
-        {{- range .javascript }}
-        <script type="text/javascript" src="{{- . -}}" async="" defer=""></script>
-        {{- end }}
-        <title>{{- template "instanceTitle" . -}}</title>
-    </head>
-    <body class="page">
-        <header class="page-header">
-            {{- include "page_header.tmpl" . | indent 3 }}
-        </header>
-        <div class="page-content">
-            {{- include .pageContent . | indent 3 | outdentPre }}
-        </div>
-        <footer class="page-footer">
-            {{- include "page_footer.tmpl" . | indent 3 }}
-        </footer>
-    </body>
-</html>
+
+<head>
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta name="robots" content="{{- if .robotsMeta -}}{{- .robotsMeta -}}{{- else -}}noindex, nofollow{{- end -}}">
+	{{- if .ogMeta }}
+	{{- include "page_ogmeta.tmpl" . | indent 2 }}
+	{{- else }}
+	{{- end }}
+	{{- if .rssFeed }}
+	<link rel="alternate" type="application/rss+xml" href="{{- .rssFeed -}}" title="{{- template "instanceTitle" . -}}">
+	{{- else }}
+	{{- end }}
+	{{- if .account }}
+	<link rel="alternate" type="application/activity+json" href="/users/{{- .account.Username -}}">
+	{{- else if .status }}
+	<link rel="alternate" type="application/activity+json"
+		href="/users/{{- .status.Account.Username -}}/statuses/{{- .status.ID -}}">
+	{{- else }}
+	{{- end }}
+	<link rel="icon" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
+	<link rel="apple-touch-icon" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
+	<link rel="apple-touch-startup-image" href="{{- .instance.Thumbnail -}}" type="{{- template "thumbnailType" . -}}">
+	{{- include "page_stylesheets.tmpl" . | indent 2 }}
+	{{- range .javascript }}
+	<script type="text/javascript" src="{{- . -}}" async="" defer=""></script>
+	{{- end }}
+	<title>{{- template "instanceTitle" . -}}</title>
+</head>
+
+<body class="page{{if .pageType}} {{.pageType}}{{end}}">
+	<header class="page-header{{if .largeHeader}} large{{end}}">
+		{{- include "page_header.tmpl" . | indent 3 }}
+	</header>
+	<div class="page-content">
+		{{- include .pageContent . | indent 3 | outdentPre }}
+	</div>
+	<footer class="page-footer">
+		{{- include "page_footer.tmpl" . | indent 3 }}
+	</footer>
+</body>
+
+</html>

web/template/page_footer.tmpl

@@ -19,49 +19,35 @@
 
 {{- with . }}
 <nav>
-    <ul class="nodot">
-        <li id="about">
-            <a
-                href="/about"
-                class="nounderline"
-            >
-                About {{ .instance.Title }}
-            </a>
-        </li>
-        <li id="version">
-            <a
-                href="https://github.com/superseriousbusiness/gotosocial"
-                class="nounderline"
-                rel="nofollow noreferrer noopener"
-                target="_blank"
-            >
-                <span aria-hidden="true">🦥</span>
-                Source - GoToSocial {{ .instance.Version }}
-                <span aria-hidden="true">🦥</span>
-            </a>
-        </li>
-        {{- if .instance.ContactAccount }} 
-        <li id="contact">
-            <a
-                href="/@{{- .instance.ContactAccount.Username -}}"
-                class="nounderline"
-            >
-                Contact account - {{ .instance.ContactAccount.Username }}
-            </a>
-        </li>
-        {{- end }}
-        {{- if .instance.Email }} 
-        <li id="email">
-            <a
-                href="mailto:{{- .instance.Email -}}"
-                class="nounderline"
-                rel="nofollow noreferrer noopener"
-                target="_blank"
-            >
-                Email - {{ .instance.Email }}
-            </a>
-        </li>
-        {{- end }}
-    </ul>
+	<ul class="nodot">
+		<li id="about">
+			<a href="/about" class="nounderline">
+				About {{ .instance.Title }}
+			</a>
+		</li>
+		<li id="version">
+			<a href="https://github.com/superseriousbusiness/gotosocial" class="nounderline"
+				rel="nofollow noreferrer noopener" target="_blank">
+				<span aria-hidden="true">🦥</span>
+				Source - GoToSocial {{ .instance.Version }}
+				<span aria-hidden="true">🦥</span>
+			</a>
+		</li>
+		{{- if .instance.ContactAccount }}
+		<li id="contact">
+			<a href="/@{{- .instance.ContactAccount.Username -}}" class="nounderline">
+				Contact account - {{ .instance.ContactAccount.Username }}
+			</a>
+		</li>
+		{{- end }}
+		{{- if .instance.Email }}
+		<li id="email">
+			<a href="mailto:{{- .instance.Email -}}" class="nounderline" rel="nofollow noreferrer noopener"
+				target="_blank">
+				Email - {{ .instance.Email }}
+			</a>
+		</li>
+		{{- end }}
+	</ul>
 </nav>
-{{- end }}
+{{- end }}

web/template/page_header.tmpl

@@ -27,53 +27,48 @@ Instance Logo
 
 {{- define "strapUsers" -}}
 {{- with deref .instance.Stats.user_count -}}
-    {{- if eq . 1 -}}
-        <span class="count">{{- . -}}</span> user
-    {{- else -}}
-        <span class="count">{{- . -}}</span> users
-    {{- end -}}
+{{- if eq . 1 -}}
+<span class="count">{{- . -}}</span> user
+{{- else -}}
+<span class="count">{{- . -}}</span> users
+{{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "strapPosts" -}}
 {{- with deref .instance.Stats.status_count -}}
-    {{- if eq . 1 -}}
-        <span class="count">{{- . -}}</span> post
-    {{- else -}}
-        <span class="count">{{- . -}}</span> posts
-    {{- end -}}
+{{- if eq . 1 -}}
+<span class="count">{{- . -}}</span> post
+{{- else -}}
+<span class="count">{{- . -}}</span> posts
+{{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "strapInstances" -}}
 {{- with deref .instance.Stats.domain_count -}}
-    {{- if eq . 1 -}}
-        <span class="count">{{- . -}}</span> other instance
-    {{- else -}}
-        <span class="count">{{- . -}}</span> other instances
-    {{- end -}}
+{{- if eq . 1 -}}
+<span class="count">{{- . -}}</span> other instance
+{{- else -}}
+<span class="count">{{- . -}}</span> other instances
+{{- end -}}
 {{- end -}}
 {{- end -}}
 
 {{- with . }}
 <a aria-label="{{- .instance.Title -}}. Go to instance homepage" href="/" class="nounderline">
-    <picture>
-        {{- if .instance.ThumbnailStatic }}
-        <source
-            srcset="{{- .instance.ThumbnailStatic -}}"
-            type="{{- .instance.ThumbnailStaticType -}}"
-            media="(prefers-reduced-motion: reduce)"
-        />
-        {{- end }}
-        <img
-            src="{{- .instance.Thumbnail -}}"
-            alt="{{- template "thumbnailDescription" . -}}"
-            title="{{- template "thumbnailDescription" . -}}"
-        />
-    </picture>
-    <h1>{{- .instance.Title -}}</h1>
+	<picture>
+		{{- if .instance.ThumbnailStatic }}
+		<source srcset="{{- .instance.ThumbnailStatic -}}" type="{{- .instance.ThumbnailStaticType -}}"
+			media="(prefers-reduced-motion: reduce)" />
+		{{- end }}
+		<img src="{{- .instance.Thumbnail -}}" alt="{{- template "thumbnailDescription" . -}}"
+			title="{{- template "thumbnailDescription" . -}}" />
+	</picture>
+	<h1>{{- .instance.Title -}}</h1>
 </a>
 {{- if .showStrap }}
-<aside>home to {{ template "strapUsers" . }} who wrote {{ template "strapPosts" . }}, federating with {{ template "strapInstances" . }}</aside>
+<aside>home to {{ template "strapUsers" . }} who wrote {{ template "strapPosts" . }}, federating with
+	{{ template "strapInstances" . }}</aside>
+{{- end }}
 {{- end }}
-{{- end }}

web/template/page_ogmeta.tmpl

@@ -54,4 +54,4 @@
 <meta property="og:image:height" content="{{ .ImageHeight }}">
 {{- else }}
 {{- end }}
-{{- end }}
+{{- end }}

web/template/page_stylesheets.tmpl

@@ -25,17 +25,15 @@
     See: https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/preload.
 */ -}}
 
+<link rel="preload" href="/assets/fonts/noto-sans-v27-latin-regular.woff2" as="font" type="font/woff2" crossorigin>
+<link rel="preload" href="/assets/fonts/noto-sans-v27-latin-700.woff2" as="font" type="font/woff2" crossorigin>
 {{- with . }}
-<link rel="preload" href="/assets/dist/_colors.css" as="style">
-<link rel="preload" href="/assets/dist/base.css" as="style">
-<link rel="preload" href="/assets/dist/page.css" as="style">
 {{- range .stylesheets }}
 <link rel="preload" href="{{- . -}}" as="style">
 {{- end }}
-<link rel="stylesheet" href="/assets/dist/_colors.css">
-<link rel="stylesheet" href="/assets/dist/base.css">
-<link rel="stylesheet" href="/assets/dist/page.css">
+<link rel="stylesheet" href="/assets/dist/default.css">
+<link rel="stylesheet" href="/assets/dist/style.css">
 {{- range .stylesheets }}
 <link rel="stylesheet" href="{{- . -}}">
 {{- end }}
-{{- end }}
+{{- end }}

web/template/profile.tmpl

@@ -20,17 +20,16 @@
 {{- define "profileMovedTo" -}}
 {{- with .account.Moved }}
 <div class="moved-to">
-    <b>
-        ℹ️ This account has permanently moved to
-        <a
-            href="{{ .URL }}"
-            class="nounderline"
-            rel="nofollow noreferrer noopener"
-            target="_blank"
-        >
-            @{{ .Username }}
-        </a>
-    </b>
+	<b>
+		ℹ️ This account has permanently moved to
+		<a
+			href="{{ .URL }}"
+			class="nounderline"
+			rel="nofollow noreferrer noopener"
+			target="_blank">
+			@{{ .Username }}
+		</a>
+	</b>
 </div>
 {{- end }}
 {{- end -}}
@@ -42,226 +41,216 @@
 
 {{- define "avatarWidth" -}}
 {{- with .account }}
-    {{- if isNil .AvatarAttachment -}}
-        {{- template "defaultAvatarDimension" . -}}
-    {{- else -}}
-        {{- /* Use the avatar's proper dimensions. */ -}}
-        {{- .AvatarAttachment.Meta.Original.Width -}}
-    {{- end -}}
+{{- if isNil .AvatarAttachment -}}
+{{- template "defaultAvatarDimension" . -}}
+{{- else -}}
+{{- /* Use the avatar's proper dimensions. */ -}}
+{{- .AvatarAttachment.Meta.Original.Width -}}
+{{- end -}}
 {{- end }}
 {{- end -}}
 
 {{- define "avatarHeight" -}}
 {{- with .account }}
-    {{- if isNil .AvatarAttachment -}}
-        {{- template "defaultAvatarDimension" . -}}
-    {{- else -}}
-        {{- /* Use the avatar's proper dimensions. */ -}}
-        {{- .AvatarAttachment.Meta.Original.Height -}}
-    {{- end -}}
+{{- if isNil .AvatarAttachment -}}
+{{- template "defaultAvatarDimension" . -}}
+{{- else -}}
+{{- /* Use the avatar's proper dimensions. */ -}}
+{{- .AvatarAttachment.Meta.Original.Height -}}
+{{- end -}}
 {{- end }}
 {{- end -}}
 
 {{- define "avatarAlt" -}}
-    Avatar for {{ .account.Username -}}
-    {{- if .account.AvatarDescription }}
-        {{- /* Add the avatar's image description. */ -}}
-        : {{ .account.AvatarDescription -}}
-    {{- end -}}
+Avatar for {{ .account.Username -}}
+{{- if .account.AvatarDescription }}
+{{- /* Add the avatar's image description. */ -}}
+: {{ .account.AvatarDescription -}}
+{{- end -}}
 {{- end -}}
 
 {{- define "headerAlt" -}}
-    Header for {{ .account.Username -}}
-    {{- if .account.HeaderDescription }}
-        {{- /* Add the header's image description. */ -}}
-        : {{ .account.HeaderDescription -}}
-    {{- end -}}
+Header for {{ .account.Username -}}
+{{- if .account.HeaderDescription }}
+{{- /* Add the header's image description. */ -}}
+: {{ .account.HeaderDescription -}}
+{{- end -}}
 {{- end -}}
 
 {{- define "avatar" -}}
 {{- with . }}
 <div
-    class="media photoswipe-gallery odd single avatar-image-wrapper"
-    role="group"
->
-    <a
-        class="photoswipe-slide"
-        href="{{- .account.Avatar -}}"
-        target="_blank"
-        data-pswp-width="{{- template "avatarWidth" . -}}px"
-        data-pswp-height="{{- template "avatarHeight" . -}}px"
-        data-cropped="true"
-        alt="{{- template "avatarAlt" . -}}"
-        title="{{- template "avatarAlt" . -}}"
-    >
-        <picture
-            aria-hidden="true"
-        >
-            {{- if .account.AvatarAttachment }}
-            <source
-                class="avatar"
-                srcset="{{- .account.AvatarStatic -}}"
-                type="{{- .account.AvatarAttachment.PreviewMIMEType -}}"
-                media="(prefers-reduced-motion: reduce)"
-            />
-            {{- end }}
-            <img
-                class="avatar"
-                src="{{- .account.Avatar -}}"
-                alt="{{- template "avatarAlt" . -}}"
-                title="{{- template "avatarAlt" . -}}"
-                width="{{- template "avatarWidth" . -}}"
-                height="{{- template "avatarHeight" . -}}"
-            />
-        </picture>
-    </a>
+	class="media photoswipe-gallery odd single avatar-image-wrapper"
+	role="group">
+	<a
+		class="photoswipe-slide"
+		href="{{- .account.Avatar -}}"
+		target="_blank"
+		data-pswp-width="{{- template "avatarWidth" . -}}px"
+		data-pswp-height="{{- template "avatarHeight" . -}}px"
+		data-cropped="true"
+		alt="{{- template "avatarAlt" . -}}"
+		title="{{- template "avatarAlt" . -}}">
+		<picture
+			aria-hidden="true">
+			{{- if .account.AvatarAttachment }}
+			<source
+				class="avatar"
+				srcset="{{- .account.AvatarStatic -}}"
+				type="{{- .account.AvatarAttachment.PreviewMIMEType -}}"
+				media="(prefers-reduced-motion: reduce)" />
+			{{- end }}
+			<img
+				class="avatar"
+				src="{{- .account.Avatar -}}"
+				alt="{{- template "avatarAlt" . -}}"
+				title="{{- template "avatarAlt" . -}}"
+				width="{{- template "avatarWidth" . -}}"
+				height="{{- template "avatarHeight" . -}}" />
+		</picture>
+	</a>
 </div>
 {{- end }}
 {{- end -}}
 
 {{- with . }}
 <main class="profile">
-    <h2 class="sr-only">Profile for {{ .account.Username -}}</h2>
-    <section class="profile-header" role="region" aria-label="Basic info">
-        {{- if .account.Moved }}
-        {{- include "profileMovedTo" . | indent 2 }}
-        {{- end }}
-        <div class="header-image-wrapper">
-            <picture>
-                {{- if .account.HeaderAttachment }}
-                <source
-                    srcset="{{- .account.HeaderStatic -}}"
-                    type="{{- .account.HeaderAttachment.PreviewMIMEType -}}"
-                    media="(prefers-reduced-motion: reduce)"
-                />
-                {{- end }}
-                <img
-                    src="{{- .account.Header -}}"
-                    alt="{{- template "headerAlt" . -}}"
-                    title="{{- template "headerAlt" . -}}"
-                />
-            </picture>
-        </div>
-        <div class="basic-info">
-            {{- with . }}
-            {{- include "avatar" . | indent 3 }}
-            {{- end }}
-            <dl class="namerole">
-                <dt class="sr-only">Display name</dt>
-                <dd class="displayname text-cutoff">
-                    {{- if .account.DisplayName -}}
-                    {{- emojify .account.Emojis (escape .account.DisplayName) -}}
-                    {{- else -}}
-                    {{- .account.Username -}}
-                    {{- end -}}
-                </dd>
-                <div class="bot-username-wrapper">
-                    {{- if .account.Bot }}
-                    <dt class="sr-only">Bot account</dt>
-                    <dd>
-                        <span class="sr-only">true</span>
-                        <div
-                            class="bot-legend-wrapper"
-                            aria-hidden="true"
-                            title="This is a bot account."
-                        >
-                            <i class="bot-icon fa fa-microchip"></i>
-                            <span class="bot-legend">bot</span>
-                        </div>
-                    </dd>
-                    {{- end }}
-                    <dt class="sr-only">Username</dt>
-                    <dd class="username text-cutoff">@{{- .account.Username -}}@{{- .instance.AccountDomain -}}</dd>
-                </div>
-                {{- if .account.Roles }}
-                <dt class="sr-only">Role</dt>
-                {{- range .account.Roles }}
-                <dd class="role {{ .Name -}}">{{- .Name -}}</dd>
-                {{- end }}
-                {{- end }}
-            </dl>
-        </div>
-    </section>
-    <div class="column-split">
-        <section class="about-user" role="region" aria-labelledby="about-header">
-            <div class="col-header">
-                <h3 id="about-header">About<span class="sr-only">&nbsp;{{- .account.Username -}}</span></h3>
-            </div>
-            {{- if .account.Fields }}
-            {{- include "profile_fields.tmpl" . | indent 3 }}
-            {{- end }}
-            <h4 class="sr-only">Bio</h4>
-            <div class="bio">
-                {{- if .account.Note }}
-                {{ emojify .account.Emojis (noescape .account.Note) }}
-                {{- else }}
-                <p>This GoToSocial user hasn't written a bio yet!</p>
-                {{- end }}
-            </div>
-            <h4 class="sr-only">Stats</h4>
-            <dl class="accountstats">
-                <dt>Joined</dt>
-                <dd><time datetime="{{- .account.CreatedAt -}}">{{- .account.CreatedAt | timestampVague -}}</time></dd>
-                <dt>Posts</dt>
-                <dd>{{- .account.StatusesCount -}}</dd>
-                <dt>Followed by</dt>
-                <dd>{{- if .account.HideCollections -}}<i>hidden</i>{{- else -}}{{- .account.FollowersCount -}}{{- end -}}</dd>
-                <dt>Following</dt>
-                <dd>{{- if .account.HideCollections -}}<i>hidden</i>{{- else -}}{{- .account.FollowingCount -}}{{- end -}}</dd>
-            </dl>
-        </section>
-        <div class="statuses-wrapper" role="region" aria-label="Posts by {{ .account.Username -}}">
-            {{- if .pinned_statuses }}
-            <section class="pinned statuses" aria-labelledby="pinned">
-                <div class="col-header">
-                    <h3 id="pinned">Pinned posts</h3>
-                    <a href="#recent">jump to recent</a>
-                </div>
-                <div class="thread">
-                    {{- range .pinned_statuses }}
-                    <article
-                        class="status expanded"
-                        {{- includeAttr "status_attributes.tmpl" . | indentAttr 6  }}
-                    >
-                        {{- include "status.tmpl" . | indent 6 }}
-                    </article>
-                    {{- end }}
-                </div>
-            </section>
-            {{- end }}
-            <section class="recent statuses" aria-labelledby="recent">
-                <div class="col-header">
-                    <h3 id="recent" tabindex="-1">Recent posts</h3>
-                    {{- if .rssFeed }}
-                    <a href="{{- .rssFeed -}}" class="rss-icon" aria-label="RSS feed">
-                        <i class="fa fa-rss-square" aria-hidden="true"></i>
-                    </a>
-                    {{- end }}
-                </div>
-                <div class="thread">
-                    {{- if not .statuses }}
-                    <div data-nosnippet class="nothinghere">Nothing here!</div>
-                    {{- else }}
-                    {{- range .statuses }}
-                    <article
-                        class="status expanded"
-                        {{- includeAttr "status_attributes.tmpl" . | indentAttr 6  }}
-                    >
-                        {{- include "status.tmpl" . | indent 6 }}
-                    </article>
-                    {{- end }}
-                    {{- end }}
-                </div>
-                <nav class="backnextlinks">
-                    {{- if .show_back_to_top }}
-                    <a href="/@{{- .account.Username -}}">Back to top</a>
-                    {{- end }}
-                    {{- if .statuses_next }}
-                    <a href="{{- .statuses_next -}}" class="next">Show older</a>
-                    {{- end }}
-                </nav>
-            </section>
-        </div>
-    </div>
+	<h2 class="sr-only">Profile for {{ .account.Username -}}</h2>
+	<section class="profile-header" role="region" aria-label="Basic info">
+		{{- if .account.Moved }}
+		{{- include "profileMovedTo" . | indent 2 }}
+		{{- end }}
+		<div class="header-image-wrapper">
+			<picture>
+				{{- if .account.HeaderAttachment }}
+				<source
+					srcset="{{- .account.HeaderStatic -}}"
+					type="{{- .account.HeaderAttachment.PreviewMIMEType -}}"
+					media="(prefers-reduced-motion: reduce)" />
+				{{- end }}
+				<img
+					src="{{- .account.Header -}}"
+					alt="{{- template "headerAlt" . -}}"
+					title="{{- template "headerAlt" . -}}" />
+			</picture>
+		</div>
+		<div class="basic-info">
+			{{- with . }}
+			{{- include "avatar" . | indent 3 }}
+			{{- end }}
+			<dl class="namerole">
+				<dt class="sr-only">Display name</dt>
+				<dd class="displayname text-cutoff">
+					{{- if .account.DisplayName -}}
+					{{- emojify .account.Emojis (escape .account.DisplayName) -}}
+					{{- else -}}
+					{{- .account.Username -}}
+					{{- end -}}
+				</dd>
+				<div class="bot-username-wrapper">
+					{{- if .account.Bot }}
+					<dt class="sr-only">Bot account</dt>
+					<dd>
+						<span class="sr-only">true</span>
+						<div
+							class="bot-legend-wrapper"
+							aria-hidden="true"
+							title="This is a bot account.">
+							<i class="bot-icon fa fa-microchip"></i>
+							<span class="bot-legend">bot</span>
+						</div>
+					</dd>
+					{{- end }}
+					<dt class="sr-only">Username</dt>
+					<dd class="username text-cutoff">@{{- .account.Username -}}@{{- .instance.AccountDomain -}}</dd>
+				</div>
+				{{- if .account.Roles }}
+				<dt class="sr-only">Role</dt>
+				{{- range .account.Roles }}
+				<dd class="role {{ .Name -}}">{{- .Name -}}</dd>
+				{{- end }}
+				{{- end }}
+			</dl>
+		</div>
+	</section>
+	<div class="column-split">
+		<section class="about-user" role="region" aria-labelledby="about-header">
+			<div class="col-header">
+				<h3 id="about-header">About<span class="sr-only">&nbsp;{{- .account.Username -}}</span></h3>
+			</div>
+			{{- if .account.Fields }}
+			{{- include "profile_fields.tmpl" . | indent 3 }}
+			{{- end }}
+			<h4 class="sr-only">Bio</h4>
+			<div class="bio">
+				{{- if .account.Note }}
+				{{ emojify .account.Emojis (noescape .account.Note) }}
+				{{- else }}
+				<p>This GoToSocial user hasn't written a bio yet!</p>
+				{{- end }}
+			</div>
+			<h4 class="sr-only">Stats</h4>
+			<dl class="accountstats">
+				<dt>Joined</dt>
+				<dd><time datetime="{{- .account.CreatedAt -}}">{{- .account.CreatedAt | timestampVague -}}</time></dd>
+				<dt>Posts</dt>
+				<dd>{{- .account.StatusesCount -}}</dd>
+				<dt>Followed by</dt>
+				<dd>{{- if .account.HideCollections -}}<i>hidden</i>{{- else -}}{{- .account.FollowersCount -}}{{- end -}}</dd>
+				<dt>Following</dt>
+				<dd>{{- if .account.HideCollections -}}<i>hidden</i>{{- else -}}{{- .account.FollowingCount -}}{{- end -}}</dd>
+			</dl>
+		</section>
+		<div class="statuses-wrapper" role="region" aria-label="Posts by {{ .account.Username -}}">
+			{{- if .pinned_statuses }}
+			<section class="pinned statuses" aria-labelledby="pinned">
+				<div class="col-header">
+					<h3 id="pinned">Pinned posts</h3>
+					<a href="#recent">jump to recent</a>
+				</div>
+				<div class="thread">
+					{{- range .pinned_statuses }}
+					<article
+						class="status expanded"
+						{{- includeAttr "status_attributes.tmpl" . | indentAttr 6  }}>
+						{{- include "status.tmpl" . | indent 6 }}
+					</article>
+					{{- end }}
+				</div>
+			</section>
+			{{- end }}
+			<section class="recent statuses" aria-labelledby="recent">
+				<div class="col-header">
+					<h3 id="recent" tabindex="-1">Recent posts</h3>
+					{{- if .rssFeed }}
+					<a href="{{- .rssFeed -}}" class="rss-icon" aria-label="RSS feed">
+						<i class="fa fa-rss-square" aria-hidden="true"></i>
+					</a>
+					{{- end }}
+				</div>
+				<div class="thread">
+					{{- if not .statuses }}
+					<div data-nosnippet class="nothinghere">Nothing here!</div>
+					{{- else }}
+					{{- range .statuses }}
+					<article
+						class="status expanded"
+						{{- includeAttr "status_attributes.tmpl" . | indentAttr 6  }}>
+						{{- include "status.tmpl" . | indent 6 }}
+					</article>
+					{{- end }}
+					{{- end }}
+				</div>
+				<nav class="backnextlinks">
+					{{- if .show_back_to_top }}
+					<a href="/@{{- .account.Username -}}">Back to top</a>
+					{{- end }}
+					{{- if .statuses_next }}
+					<a href="{{- .statuses_next -}}" class="next">Show older</a>
+					{{- end }}
+				</nav>
+			</section>
+		</div>
+	</div>
 </main>
-{{- end }}
+{{- end }}

web/template/profile_fields.tmpl

@@ -19,14 +19,14 @@
 
 {{- with . }}
 <div class="fields">
-    <h4 class="sr-only">Fields</h4>
-    <dl>
-        {{- range .account.Fields }}
-        <div class="field">
-            <dt>{{- emojify $.account.Emojis (noescape .Name) -}}</dt>
-            <dd>{{- emojify $.account.Emojis (noescape .Value) -}}</dd>
-        </div>
-        {{- end }}
-    </dl>
+	<h4 class="sr-only">Fields</h4>
+	<dl>
+		{{- range .account.Fields }}
+		<div class="field">
+			<dt>{{- emojify $.account.Emojis (noescape .Name) -}}</dt>
+			<dd>{{- emojify $.account.Emojis (noescape .Value) -}}</dd>
+		</div>
+		{{- end }}
+	</dl>
 </div>
-{{- end }}
+{{- end }}

web/template/settings.tmpl

@@ -19,6 +19,6 @@
 
 {{- with . }}
 <main class="settings">
-    <div id="root"></div>
+	<div id="root"></div>
 </main>
-{{- end }}
+{{- end }}

web/template/sign-in.tmpl

@@ -19,19 +19,19 @@
 
 {{- with . }}
 <main>
-    <section class="with-form" aria-labelledby="sign-in">
-        <h2 id="sign-in">Sign in</h2>
-        <form action="/auth/sign_in" method="POST">
-            <div class="labelinput">
-                <label for="email">Email</label>
-                <input type="email" name="username" required placeholder="Please enter your email address">
-            </div>
-            <div class="labelinput">
-                <label for="password">Password</label>
-                <input type="password" name="password" required placeholder="Please enter your password">
-            </div>
-            <button type="submit" class="btn btn-success">Sign in</button>
-        </form>
-    </section>
+	<section class="with-form" aria-labelledby="sign-in">
+		<h2 id="sign-in">Sign in</h2>
+		<form action="/auth/sign_in" method="POST">
+			<div class="labelinput">
+				<label for="email">Email</label>
+				<input type="email" name="username" required placeholder="Please enter your email address">
+			</div>
+			<div class="labelinput">
+				<label for="password">Password</label>
+				<input type="password" name="password" required placeholder="Please enter your password">
+			</div>
+			<button type="submit" class="btn btn-success">Sign in</button>
+		</form>
+	</section>
 </main>
-{{- end }}
+{{- end }}

web/template/sign-up.tmpl

@@ -19,83 +19,53 @@
 
 {{- with . }}
 <main>
-    <section class="with-form" aria-labelledby="sign-up">
-        <h2 id="sign-up">Sign up for an account on {{ .instance.Title -}}</h2>
-        {{- if not .registrationOpen }}
-        <p>This instance is not currently open to new sign-ups.</p>
-        {{- else }}
-        <form action="/signup" method="POST">
-            <div class="labelinput">
-                <label for="email">Email</label>
-                <input
-                    id="email"
-                    type="email"
-                    name="email"
-                    required
-                    placeholder="Email address"
-                >
-            </div>
-            <div class="labelinput">
-                <label for="password">Password</label>
-                <input
-                    id="password"
-                    type="password"
-                    name="password"
-                    required
-                    placeholder="Please enter your desired password"
-                    autocomplete="new-password"
-                >
-            </div>
-            <div class="labelinput">
-                <label for="username">
-                    Username (lowercase a-z, numbers, and underscores; max 64 characters).<br/>
-                    <small>Your username will be part of your fediverse handle, and cannot be changed later, so choose thoughtfully!</small>
-                </label>
-                <input
-                    id="username"
-                    type="text"
-                    name="username"
-                    required
-                    placeholder="Please enter your desired username"
-                    pattern="^[a-z0-9_]{1,64}$"
-                    autocapitalize="off"
-                    spellcheck="false"
-                    title="lowercase a-z, numbers, and underscores; max 64 characters"
-                >
-            </div>
-            {{- if .reasonRequired }}
-            <div class="labelinput">
-                <label for="reason">
-                    Reason you want to join {{ .instance.Title }} (40-500 characters).<br/>
-                    <small>The admin(s) will use this text to decide whether or not to approve your sign-up.</small>
-                </label>
-                <textarea
-                    id="reason"
-                    name="reason"
-                    required
-                    placeholder="Enter a few sentences about why you want to join this instance. If you know someone on the instance already, you may want to mention them here. You might want to link to any other accounts you have elsewhere too."
-                    rows="8"
-                    minlength="40"
-                    maxlength="500"
-                    autocapitalize="sentences"
-                    title="40-500 characters"
-                ></textarea>
-            </div>
-            {{- end }}
-            <div class="checkbox">
-                <label for="agreement">I have read and accept the <a href="/about#terms">terms and conditions</a> of {{ .instance.Title }}, and I agree to abide by the <a href="/about#rules">instance rules</a>.</label>
-                <input
-                    id="agreement"
-                    type="checkbox"
-                    name="agreement"
-                    required
-                    value="true"
-                >
-            </div>
-            <input type="hidden" name="locale" value="en">
-            <button type="submit" class="btn btn-success">Submit</button>
-        </form>
-        {{- end }}
-    </section>
+	<section class="with-form" aria-labelledby="sign-up">
+		<h2 id="sign-up">Sign up for an account on {{ .instance.Title -}}</h2>
+		{{- if not .registrationOpen }}
+		<p>This instance is not currently open to new sign-ups.</p>
+		{{- else }}
+		<form action="/signup" method="POST">
+			<div class="labelinput">
+				<label for="email">Email</label>
+				<input id="email" type="email" name="email" required placeholder="Email address">
+			</div>
+			<div class="labelinput">
+				<label for="password">Password</label>
+				<input id="password" type="password" name="password" required
+					placeholder="Please enter your desired password" autocomplete="new-password">
+			</div>
+			<div class="labelinput">
+				<label for="username">
+					Username (lowercase a-z, numbers, and underscores; max 64 characters).<br />
+					<small>Your username will be part of your fediverse handle, and cannot be changed later, so choose
+						thoughtfully!</small>
+				</label>
+				<input id="username" type="text" name="username" required
+					placeholder="Please enter your desired username" pattern="^[a-z0-9_]{1,64}$" autocapitalize="off"
+					spellcheck="false" title="lowercase a-z, numbers, and underscores; max 64 characters">
+			</div>
+			{{- if .reasonRequired }}
+			<div class="labelinput">
+				<label for="reason">
+					Reason you want to join {{ .instance.Title }} (40-500 characters).<br />
+					<small>The admin(s) will use this text to decide whether or not to approve your sign-up.</small>
+				</label>
+				<textarea id="reason" name="reason" required
+					placeholder="Enter a few sentences about why you want to join this instance. If you know someone on the instance already, you may want to mention them here. You might want to link to any other accounts you have elsewhere too."
+					rows="8" minlength="40" maxlength="500" autocapitalize="sentences"
+					title="40-500 characters"></textarea>
+			</div>
+			{{- end }}
+			<div class="checkbox">
+				<label for="agreement">I have read and accept the <a href="/about#terms">terms and conditions</a> of
+					{{ .instance.Title }}, and I agree to abide by the <a href="/about#rules">instance
+						rules</a>.</label>
+				<input id="agreement" type="checkbox" name="agreement" required value="true">
+			</div>
+			<input type="hidden" name="locale" value="en">
+			<button type="submit" class="btn btn-success">Submit</button>
+		</form>
+		{{- end }}
+	</section>
 </main>
-{{- end }}
+{{- end }}