diff --git a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro DB.otf b/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro DB.otf deleted file mode 100644 index 6861f73dff..0000000000 Binary files a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro DB.otf and /dev/null differ diff --git a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro EB.otf b/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro EB.otf deleted file mode 100644 index f02ae332d1..0000000000 Binary files a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro EB.otf and /dev/null differ diff --git a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro L.otf b/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro L.otf deleted file mode 100644 index 983c7fbd01..0000000000 Binary files a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro L.otf and /dev/null differ diff --git a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro M.otf b/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro M.otf deleted file mode 100644 index 0396bdc6b7..0000000000 Binary files a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro M.otf and /dev/null differ diff --git a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro UB.otf b/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro UB.otf deleted file mode 100644 index 150c41341e..0000000000 Binary files a/packages/backend/assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro UB.otf and /dev/null differ diff --git a/packages/backend/assets/fonts/Lexend-VariableFont_wght.ttf b/packages/backend/assets/fonts/Lexend-VariableFont_wght.ttf deleted file mode 100644 index b294dc840f..0000000000 Binary files a/packages/backend/assets/fonts/Lexend-VariableFont_wght.ttf and /dev/null differ diff --git a/packages/backend/assets/fonts/NewRodinPro-B.ttf b/packages/backend/assets/fonts/NewRodinPro-B.ttf new file mode 100644 index 0000000000..4127b273c2 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-B.ttf differ diff --git a/packages/backend/assets/fonts/NewRodinPro-B.woff2 b/packages/backend/assets/fonts/NewRodinPro-B.woff2 new file mode 100644 index 0000000000..787a9758a7 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-B.woff2 differ diff --git a/packages/backend/assets/fonts/NewRodinPro-DB.ttf b/packages/backend/assets/fonts/NewRodinPro-DB.ttf new file mode 100644 index 0000000000..a1028ca048 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-DB.ttf differ diff --git a/packages/backend/assets/fonts/NewRodinPro-DB.woff2 b/packages/backend/assets/fonts/NewRodinPro-DB.woff2 new file mode 100644 index 0000000000..1c401e2299 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-DB.woff2 differ diff --git a/packages/backend/assets/fonts/NewRodinPro-EB.ttf b/packages/backend/assets/fonts/NewRodinPro-EB.ttf new file mode 100644 index 0000000000..d9d7a7e180 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-EB.ttf differ diff --git a/packages/backend/assets/fonts/NewRodinPro-EB.woff2 b/packages/backend/assets/fonts/NewRodinPro-EB.woff2 new file mode 100644 index 0000000000..79cfa744ed Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-EB.woff2 differ diff --git a/packages/backend/assets/fonts/NewRodinPro-M.ttf b/packages/backend/assets/fonts/NewRodinPro-M.ttf new file mode 100644 index 0000000000..48e906690a Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-M.ttf differ diff --git a/packages/backend/assets/fonts/NewRodinPro-M.woff2 b/packages/backend/assets/fonts/NewRodinPro-M.woff2 new file mode 100644 index 0000000000..9ef38f4ac9 Binary files /dev/null and b/packages/backend/assets/fonts/NewRodinPro-M.woff2 differ diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss index fc1d6bbe3e..a037078b00 100644 --- a/packages/frontend/src/style.scss +++ b/packages/frontend/src/style.scss @@ -1,20 +1,11 @@ @charset "utf-8"; -// default sharkey font -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: 'Lexend'; - font-style: normal; - font-weight: 400; - src: url('/static-assets/fonts/Lexend-VariableFont_wght.ttf') format('opentype'); -} - // barkey/yeentown font @font-face { font-family: 'FOT-NewRodin Pro'; font-style: normal; font-weight: 400; - src: url('/static-assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro DB.otf') format('opentype'); + src: url('/static-assets/fonts/NewRodinPro-DB.woff2') format('woff2'); } // barkey/yeentown font @@ -22,7 +13,7 @@ font-family: 'FOT-NewRodin Pro'; font-style: normal; font-weight: 700; - src: url('/static-assets/fonts/FOT-NewRodin Pro/FOT-NewRodin Pro EB.otf') format('opentype'); + src: url('/static-assets/fonts/NewRodinPro-EB.woff2') format('woff2'); } /* @@ -58,6 +49,8 @@ --avatar: 48px; --thread-width: 2px; + + --custom-font: 'sharkey-theme-font-face'; } html.radius-misskey { @@ -82,7 +75,7 @@ html { accent-color: var(--accent); overflow: auto; overflow-wrap: break-word; - font-family: 'sharkey-theme-font-face', 'FOT-NewRodin Pro', 'Lexend', 'Hiragino Maru Gothic Pro', "BIZ UDGothic", Roboto, HelveticaNeue, Arial, sans-serif; + font-family: var(--custom-font), 'FOT-NewRodin Pro', sans-serif; font-size: 14px; line-height: 1.35; text-size-adjust: 100%;