Merge branch 'master' into remove-logout-button

2020-01-09 17:27:49 +00:00
parent b42b09ccbe 7cb046c542
commit a9e715dc50
18 changed files with 1464 additions and 636 deletions
--- a/http/static.go
+++ b/http/static.go
@@ -38,6 +38,7 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, d *data, box *
 		"LoginPage":       auther.LoginPage(),
 		"CSS":             false,
 		"ReCaptcha":       false,
+		"Theme":           d.settings.Branding.Theme,
 	}

 	if d.settings.Branding.Files != "" {