diff --git a/handler/middleware/security_headers.go b/handler/middleware/security_headers.go index 5011bfa..c015e22 100644 --- a/handler/middleware/security_headers.go +++ b/handler/middleware/security_headers.go @@ -16,6 +16,7 @@ func SecurityHeaders(serverSettings *types.Settings) func(http.Handler) http.Han w.Header().Set("Content-Security-Policy", "default-src 'none'; "+ "script-src 'self'; "+ + "font-src 'self'; "+ "connect-src 'self'; "+ "img-src 'self'; "+ "style-src 'self'; "+ diff --git a/input.css b/input.css index 7a89382..1f21273 100644 --- a/input.css +++ b/input.css @@ -3,9 +3,15 @@ @source './static/**/*.js'; @source './template/**/*.templ'; -@theme { - --animate-fade: fadeOut 0.25s ease-in; +body { + @apply font-shippori +} +@theme { + --font-pirata: "Pirata One", sans-serif; + --font-shippori: "Shippori Mincho", sans-serif; + + --animate-fade: fadeOut 0.25s ease-in; @keyframes fadeOut { 0% { opacity: 1; @@ -16,3 +22,12 @@ } } +@font-face { + font-family: "Pirata One"; + src: url("/static/font/pirata_one/PirataOne-Regular.ttf") format("truetype"); +} + +@font-face { + font-family: "Shippori Mincho"; + src: url("/static/font/shippori_mincho/ShipporiMincho-Medium.ttf") format("truetype"); +} diff --git a/main_test.go b/main_test.go index 84c6c38..2b6702f 100644 --- a/main_test.go +++ b/main_test.go @@ -83,6 +83,7 @@ func TestIntegrationSecurityHeader(t *testing.T) { value = resp.Header.Get("Content-Security-Policy") assert.Equal(t, "default-src 'none'; "+ "script-src 'self'; "+ + "font-src 'self'; "+ "connect-src 'self'; "+ "img-src 'self'; "+ "style-src 'self'; "+ diff --git a/static/font/pirata_one/PirataOne-Regular.ttf b/static/font/pirata_one/PirataOne-Regular.ttf new file mode 100644 index 0000000..9738c39 Binary files /dev/null and b/static/font/pirata_one/PirataOne-Regular.ttf differ diff --git a/static/font/shippori_mincho/ShipporiMincho-Bold.ttf b/static/font/shippori_mincho/ShipporiMincho-Bold.ttf new file mode 100644 index 0000000..46cdaa8 Binary files /dev/null and b/static/font/shippori_mincho/ShipporiMincho-Bold.ttf differ diff --git a/static/font/shippori_mincho/ShipporiMincho-ExtraBold.ttf b/static/font/shippori_mincho/ShipporiMincho-ExtraBold.ttf new file mode 100644 index 0000000..496ad4d Binary files /dev/null and b/static/font/shippori_mincho/ShipporiMincho-ExtraBold.ttf differ diff --git a/static/font/shippori_mincho/ShipporiMincho-Medium.ttf b/static/font/shippori_mincho/ShipporiMincho-Medium.ttf new file mode 100644 index 0000000..e6ab292 Binary files /dev/null and b/static/font/shippori_mincho/ShipporiMincho-Medium.ttf differ diff --git a/static/font/shippori_mincho/ShipporiMincho-Regular.ttf b/static/font/shippori_mincho/ShipporiMincho-Regular.ttf new file mode 100644 index 0000000..5c25e56 Binary files /dev/null and b/static/font/shippori_mincho/ShipporiMincho-Regular.ttf differ diff --git a/static/font/shippori_mincho/ShipporiMincho-SemiBold.ttf b/static/font/shippori_mincho/ShipporiMincho-SemiBold.ttf new file mode 100644 index 0000000..389362b Binary files /dev/null and b/static/font/shippori_mincho/ShipporiMincho-SemiBold.ttf differ diff --git a/template/layout.templ b/template/layout.templ index 7d92788..ae5e075 100644 --- a/template/layout.templ +++ b/template/layout.templ @@ -1,45 +1,45 @@ package template templ Layout(slot templ.Component, user templ.Component) { - - - - - spend-sparrow - - - - - - - - -
-
- - Spend Sparrow logo - SpendSparrow - - @user -
-
- if slot != nil { - @slot - } -
-
-
- -
- - + }' /> + + + + + +
+
+ + SpendSparrow logo + SpendSparrow + + @user +
+
+ if slot != nil { + @slot + } +
+
+
+ +
+ + + }