From b2926377b75fdcfb35816c8f4f0996d8619b2730 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sat, 20 Jul 2024 16:11:21 +0200 Subject: [PATCH] WebUI: switch favicon from ico to png Signed-off-by: Nicola Murino --- go.mod | 20 +++++++------- go.sum | 44 +++++++++++++++---------------- internal/httpd/httpd.go | 2 +- internal/httpd/httpd_test.go | 4 +-- internal/httpd/internal_test.go | 2 +- static/favicon.ico | Bin 16958 -> 0 bytes static/favicon.png | Bin 0 -> 3126 bytes templates/common/base.html | 2 +- templates/common/baselogin.html | 2 +- templates/webclient/viewpdf.html | 2 +- 10 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 static/favicon.ico create mode 100644 static/favicon.png diff --git a/go.mod b/go.mod index f1f4a64a..a92fd5bf 100644 --- a/go.mod +++ b/go.mod @@ -4,19 +4,19 @@ go 1.22.2 require ( cloud.google.com/go/storage v1.43.0 - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 github.com/alexedwards/argon2id v1.0.0 github.com/amoghe/go-crypt v0.0.0-20220222110647-20eada5f5964 github.com/aws/aws-sdk-go-v2 v1.30.3 - github.com/aws/aws-sdk-go-v2/config v1.27.26 - github.com/aws/aws-sdk-go-v2/credentials v1.17.26 + github.com/aws/aws-sdk-go-v2/config v1.27.27 + github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.7 + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8 github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.23.3 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 - github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.3 + github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4 github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 github.com/bmatcuk/doublestar/v4 v4.6.1 github.com/cockroachdb/cockroach-go/v2 v2.3.8 @@ -84,7 +84,7 @@ require ( cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.11 // indirect filippo.io/edwards25519 v1.1.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect github.com/ajg/form v1.5.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect @@ -95,7 +95,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect github.com/aws/smithy-go v1.20.3 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -167,12 +167,12 @@ require ( go.opentelemetry.io/otel/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.19.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/tools v0.23.0 // indirect - golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect google.golang.org/genproto v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect diff --git a/go.sum b/go.sum index 08d09fd5..872f2a72 100644 --- a/go.sum +++ b/go.sum @@ -18,16 +18,16 @@ cloud.google.com/go/storage v1.43.0/go.mod h1:ajvxEa7WmZS1PxvKRq4bq0tFT3vMd502Jw filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0 h1:1nGuui+4POelzDwI7RG56yfQJHCnKvwfMoU7VsEp+Zg= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0/go.mod h1:99EvauvlcJ1U06amZiksfYz/3aFGyIhWGHVyiZXtBAI= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 h1:GJHeeA2N7xrG3q30L2UXDyuWRzDM900/65j70wcM4Ww= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.1 h1:Xy/qV1DyOhhqsU/z0PyFMJfYCxnzna+vBEUtFW0ksQo= -github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.1/go.mod h1:oib6iWdC+sILvNUoJbbBn3xv7TXow7mEp/WRcsYvmow= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= +github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 h1:Be6KInmFEKV81c0pOAEbRYehLMwmmGI1exuFj248AMk= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0/go.mod h1:WCPBHsOXfBVnivScjs2ypRfimjEW0qPVLGgJkZlrIOA= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -43,14 +43,14 @@ github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP github.com/aws/aws-sdk-go-v2 v1.30.3/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3/go.mod h1:UbnqO+zjqk3uIt9yCACHJ9IVNhyhOCnYk8yA19SAWrM= -github.com/aws/aws-sdk-go-v2/config v1.27.26 h1:T1kAefbKuNum/AbShMsZEro6eRkeOT8YILfE9wyjAYQ= -github.com/aws/aws-sdk-go-v2/config v1.27.26/go.mod h1:ivWHkAWFrw/nxty5Fku7soTIVdqZaZ7dw+tc5iGW3GA= -github.com/aws/aws-sdk-go-v2/credentials v1.17.26 h1:tsm8g/nJxi8+/7XyJJcP2dLrnK/5rkFp6+i2nhmz5fk= -github.com/aws/aws-sdk-go-v2/credentials v1.17.26/go.mod h1:3vAM49zkIa3q8WT6o9Ve5Z0vdByDMwmdScO0zvThTgI= +github.com/aws/aws-sdk-go-v2/config v1.27.27 h1:HdqgGt1OAP0HkEDDShEl0oSYa9ZZBSOmKpdpsDMdO90= +github.com/aws/aws-sdk-go-v2/config v1.27.27/go.mod h1:MVYamCg76dFNINkZFu4n4RjDixhVr51HLj4ErWzrVwg= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27 h1:2raNba6gr2IfA0eqqiP2XiQ0UVOpGPgDSi0I9iAP+UI= +github.com/aws/aws-sdk-go-v2/credentials v1.17.27/go.mod h1:gniiwbGahQByxan6YjQUMcW4Aov6bLC3m+evgcoN4r4= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 h1:KreluoV8FZDEtI6Co2xuNk/UqI9iwMrOx/87PBNIKqw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11/go.mod h1:SeSUYBLsMYFoRvHE0Tjvn7kbxaUhl75CJi1sbfhMxkU= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.7 h1:kNemAUX+bJFBSfPkGVZ8HFOKIadjLoI2Ua1ZKivhGSo= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.7/go.mod h1:71S2C1g/Zjn+ANmyoOqJ586OrPF9uC9iiHt9ZAT+MOw= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8 h1:u1KOU1S15ufyZqmH/rA3POkiRH6EcDANHj2xHRzq+zc= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8/go.mod h1:WPv2FRnkIOoDv/8j2gSUsI4qDc7392w5anFB/I89GZ8= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 h1:SoNJ4RlFEQEbtDcCEt+QG56MY4fm4W8rYirAmq+/DdU= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15/go.mod h1:U9ke74k1n2bf+RIgoX1SXFed1HLs51OgUSs+Ph0KJP8= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 h1:C6WHdGnTDIYETAm5iErQUiVNsclNx9qbJVPIt03B6bI= @@ -71,10 +71,10 @@ github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.23.3 h1:ZkaFS2PmZFk7 github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.23.3/go.mod h1:ZK5KBD+u8g1Frfqe1atGaH19dSnY9SbHuSUimYv1cy0= github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2 h1:sZXIzO38GZOU+O0C+INqbH7C2yALwfMWpd64tONS/NE= github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2/go.mod h1:Lcxzg5rojyVPU/0eFwLtcyTaek/6Mtic5B1gJo7e/zE= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.3 h1:ilavrucVBQHYnMjD2KmZQDCU1fuluQb0l9zRigGNVEc= -github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.3/go.mod h1:TKKN7IQoM7uTnyuFm9bm9cw5P//ZYTl4m3htBWQ1G/c= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.3 h1:Fv1vD2L65Jnp5QRsdiM64JvUM4Xe+E0JyVsRQKv6IeA= -github.com/aws/aws-sdk-go-v2/service/sso v1.22.3/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4 h1:NgRFYyFpiMD62y4VPXh4DosPFbZd4vdMVBWKk0VmWXc= +github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.4/go.mod h1:TKKN7IQoM7uTnyuFm9bm9cw5P//ZYTl4m3htBWQ1G/c= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= +github.com/aws/aws-sdk-go-v2/service/sso v1.22.4/go.mod h1:ooyCOXjvJEsUw7x+ZDHeISPMhtwI3ZCB7ggFMcFfWLU= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 h1:yiwVzJW2ZxZTurVbYWA7QOrAaCYQR72t0wrSBfoesUE= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4/go.mod h1:0oxfLkpz3rQ/CHlx5hB7H69YUpFiI1tql6Q6Ne+1bCw= github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudrvuKpDKgMVRlepGE= @@ -419,8 +419,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 gocloud.dev v0.37.0 h1:XF1rN6R0qZI/9DYjN16Uy0durAmSlf58DHOcb28GPro= gocloud.dev v0.37.0/go.mod h1:7/O4kqdInCNsc6LqgmuFnS0GRew4XNNYWpA44yQnwco= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -512,8 +512,8 @@ golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= -golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 h1:LLhsEBxRTBLuKlQxFBYUOU8xyFgXv6cOTp2HASDlsDk= +golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= diff --git a/internal/httpd/httpd.go b/internal/httpd/httpd.go index 64677acc..4e41d8cc 100644 --- a/internal/httpd/httpd.go +++ b/internal/httpd/httpd.go @@ -418,7 +418,7 @@ func (b *UIBranding) check() { if b.FaviconPath != "" { b.FaviconPath = util.CleanPath(b.FaviconPath) } else { - b.FaviconPath = "/favicon.ico" + b.FaviconPath = "/favicon.png" } if b.DisclaimerPath != "" { if !strings.HasPrefix(b.DisclaimerPath, "https://") && !strings.HasPrefix(b.DisclaimerPath, "http://") { diff --git a/internal/httpd/httpd_test.go b/internal/httpd/httpd_test.go index 5675797c..a3a72d80 100644 --- a/internal/httpd/httpd_test.go +++ b/internal/httpd/httpd_test.go @@ -13134,7 +13134,7 @@ func TestDefender(t *testing.T) { checkResponseCode(t, http.StatusForbidden, rr) assert.Contains(t, rr.Body.String(), "your IP address is blocked") // requests for static files should be always allowed - req, err = http.NewRequest(http.MethodGet, "/static/favicon.ico", nil) + req, err = http.NewRequest(http.MethodGet, "/static/favicon.png", nil) assert.NoError(t, err) req.RemoteAddr = remoteAddr rr = executeRequest(req) @@ -26229,7 +26229,7 @@ func TestGetWebStatusMock(t *testing.T) { } func TestStaticFilesMock(t *testing.T) { - req, err := http.NewRequest(http.MethodGet, "/static/favicon.ico", nil) + req, err := http.NewRequest(http.MethodGet, "/static/favicon.png", nil) assert.NoError(t, err) rr := executeRequest(req) checkResponseCode(t, http.StatusOK, rr) diff --git a/internal/httpd/internal_test.go b/internal/httpd/internal_test.go index c0cfa7cc..2e580869 100644 --- a/internal/httpd/internal_test.go +++ b/internal/httpd/internal_test.go @@ -341,7 +341,7 @@ func TestBrandingValidation(t *testing.T) { }, } b.checkBranding() - assert.Equal(t, "/favicon.ico", b.Branding.WebAdmin.FaviconPath) + assert.Equal(t, "/favicon.png", b.Branding.WebAdmin.FaviconPath) assert.Equal(t, "/path1", b.Branding.WebAdmin.LogoPath) assert.Equal(t, []string{"/my.css"}, b.Branding.WebAdmin.DefaultCSS) assert.Len(t, b.Branding.WebAdmin.ExtraCSS, 0) diff --git a/static/favicon.ico b/static/favicon.ico deleted file mode 100644 index f7bbf3780116164ce2e202f1aee8e3ef4d04699e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16958 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 Q>;M1&07*qoM6N<$f=!94=l}o! literal 0 HcmV?d00001 diff --git a/templates/common/base.html b/templates/common/base.html index 15b369aa..f0236fc0 100644 --- a/templates/common/base.html +++ b/templates/common/base.html @@ -800,7 +800,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). - + {{- template "fonts" . }} {{- block "extra_css" .}}{{- end}} {{- range .Branding.DefaultCSS}} diff --git a/templates/common/baselogin.html b/templates/common/baselogin.html index cec7aad9..000faaa4 100644 --- a/templates/common/baselogin.html +++ b/templates/common/baselogin.html @@ -22,7 +22,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). - + {{- template "fonts" . }} {{- range .Branding.DefaultCSS}} diff --git a/templates/webclient/viewpdf.html b/templates/webclient/viewpdf.html index b4639a05..07fa5c65 100644 --- a/templates/webclient/viewpdf.html +++ b/templates/webclient/viewpdf.html @@ -20,7 +20,7 @@ explicit grant from the SFTPGo Team (support@sftpgo.com). - + {{range .Branding.ExtraCSS}}