diff --git a/internal/web/about.go b/internal/web/about.go index 2bc558962..6d77d25fc 100644 --- a/internal/web/about.go +++ b/internal/web/about.go @@ -54,7 +54,7 @@ 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(), diff --git a/internal/web/domain-blocklist.go b/internal/web/domain-blocklist.go index 5d631e0f7..24c861865 100644 --- a/internal/web/domain-blocklist.go +++ b/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}, } diff --git a/internal/web/index.go b/internal/web/index.go index 25960cf7f..0db8f5153 100644 --- a/internal/web/index.go +++ b/internal/web/index.go @@ -59,7 +59,7 @@ func (m *Module) indexHandler(c *gin.Context) { Template: "index.tmpl", Instance: instance, OGMeta: apiutil.OGBase(instance), - Stylesheets: []string{cssAbout, cssIndex}, + Stylesheets: []string{}, Extra: map[string]any{"showStrap": true}, } diff --git a/internal/web/profile.go b/internal/web/profile.go index 60157fd19..ce28f02d1 100644 --- a/internal/web/profile.go +++ b/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 != "" { diff --git a/internal/web/settings-panel.go b/internal/web/settings-panel.go index ec8166e95..92d5d5f21 100644 --- a/internal/web/settings-panel.go +++ b/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}, diff --git a/internal/web/tag.go b/internal/web/tag.go index 5c3cd31a6..3f5059db5 100644 --- a/internal/web/tag.go +++ b/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}, } diff --git a/internal/web/thread.go b/internal/web/thread.go index d3ba6ea5e..30fc08e82 100644 --- a/internal/web/thread.go +++ b/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 != "" { diff --git a/internal/web/web.go b/internal/web/web.go index 185bf7120..d3129ddb7 100644 --- a/internal/web/web.go +++ b/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. diff --git a/web/template/index.tmpl b/web/template/index.tmpl index 121190775..22b1e3377 100644 --- a/web/template/index.tmpl +++ b/web/template/index.tmpl @@ -26,10 +26,10 @@ {{- end -}} {{- with . }} -
-
+
+

About this instance

-
+
{{- include "shortDescription" . | indent 3 }} See more details
diff --git a/web/template/index_apps.tmpl b/web/template/index_apps.tmpl index bf818b50a..8580b3983 100644 --- a/web/template/index_apps.tmpl +++ b/web/template/index_apps.tmpl @@ -18,9 +18,9 @@ */ -}} {{- with . }} -
+

Client applications

-
+

Have an account on this instance and want to log in? GoToSocial does not provide its own webclient, but implements the Mastodon client API. diff --git a/web/template/index_register.tmpl b/web/template/index_register.tmpl index 1f647cca9..e51da948d 100644 --- a/web/template/index_register.tmpl +++ b/web/template/index_register.tmpl @@ -27,9 +27,9 @@ New account registration is currently  {{- end -}} {{- with . }} -

+

Register an Account on {{ .instance.Title -}}

-
+