diff --git a/public/style/global.css b/public/style/global.css index 3ab0147..cf97e92 100644 --- a/public/style/global.css +++ b/public/style/global.css @@ -1,5 +1,8 @@ @charset "utf-8"; body { - display: block; + font-family: "Noto Sans JP", sans-serif; + font-optical-sizing: auto; + font-weight: 400; + font-style: normal; } diff --git a/src/app.lisp b/src/app.lisp index c0b1eb6..f1846ce 100644 --- a/src/app.lisp +++ b/src/app.lisp @@ -16,10 +16,10 @@ :port 3000)) (defmethod jg:not-found ((app jg:app)) - (view:render-page (cmp:not-found-page) - :status :not-found - :title "404 Not Found" - :description "お探しのページは見つかりませんでした。")) + (view:render (cmp:not-found-page) + :status :not-found + :title "404 Not Found" + :description "お探しのページは見つかりませんでした。")) (defun update () (jg:clear-middlewares *app*) diff --git a/src/components/global/metadata.lisp b/src/components/global/metadata.lisp index 5089782..1198c09 100644 --- a/src/components/global/metadata.lisp +++ b/src/components/global/metadata.lisp @@ -13,6 +13,9 @@ (script :src "/js/alpine.js" :defer t) (link :rel "stylesheet" :type "text/css" :href "/style/ress.css") (link :rel "stylesheet" :type "text/css" :href "/style/global.css") + (link :rel "preconnect" :href "https://fonts.googleapis.com") + (link :rel "preconnect" :href "https://fonts.gstatic.com" :crossorigin t) + (link :rel "stylesheet" :href "https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&display=swap") (title (format nil "~@[~a - ~]skyizwhite.dev" title)) (meta :name "description" diff --git a/src/routes/about.lisp b/src/routes/about.lisp index 480b84a..a015711 100644 --- a/src/routes/about.lisp +++ b/src/routes/about.lisp @@ -16,6 +16,6 @@ (defun on-get (params) (declare (ignore params)) - (view:render-page (page) - :title "about" - :description "pakuの自己紹介")) + (view:render (page) + :title "about" + :description "pakuの自己紹介")) diff --git a/src/routes/index.lisp b/src/routes/index.lisp index 77cb87b..118157b 100644 --- a/src/routes/index.lisp +++ b/src/routes/index.lisp @@ -18,4 +18,4 @@ (defun on-get (params) (declare (ignore params)) - (view:render-page (page))) + (view:render (page))) diff --git a/src/view.lisp b/src/view.lisp index 6b35c39..3b74507 100644 --- a/src/view.lisp +++ b/src/view.lisp @@ -3,10 +3,10 @@ (:local-nicknames (#:jg #:jingle)) (:local-nicknames (#:pi #:piccolo)) (:local-nicknames (#:cmp #:hp/components/**/*)) - (:export #:render-page)) + (:export #:render)) (in-package #:hp/view) -(defun render-page (page &key status title description) +(defun render (page &key status title description) (jg:with-html-response (and status (jg:set-response-status status)) (pi:elem-str