diff --git a/README.md b/README.md index a2fb6672f..44d5af258 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ ## 細かい変更点 +- 標準のフォントを Atkinson Hyperlegible にする変更を取り消し + - フォントを変更したい場合は[このカスタム CSS](https://gitlab.com/LunarEclipse363/lunar-misskey-tweaks#setting-a-different-font) を使ってください - 簡体中文の翻訳が存在しない項目では繁体中文の翻訳を用いるように(本家では逆) - @sup39 さんが独自機能に使われているラベルの繁体中文訳を提供してくださったため - オンラインステータスが非公開のアカウントにはステータスを表す丸印を表示しないように diff --git a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700.woff2 b/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700.woff2 deleted file mode 100644 index f3898921c..000000000 Binary files a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700.woff2 and /dev/null differ diff --git a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700italic.woff2 b/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700italic.woff2 deleted file mode 100644 index 9aac4b88e..000000000 Binary files a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700italic.woff2 and /dev/null differ diff --git a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-italic.woff2 b/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-italic.woff2 deleted file mode 100644 index ce7c7fed1..000000000 Binary files a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-italic.woff2 and /dev/null differ diff --git a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2 b/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2 deleted file mode 100644 index 7093c429f..000000000 Binary files a/packages/backend/assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2 and /dev/null differ diff --git a/packages/backend/src/server/web/style.css b/packages/backend/src/server/web/style.css index 2a9325399..cb99a160d 100644 --- a/packages/backend/src/server/web/style.css +++ b/packages/backend/src/server/web/style.css @@ -1,18 +1,7 @@ -/* atkinson-hyperlegible-regular - latin_latin-ext */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: "Atkinson Hyperlegible"; - font-style: normal; - font-weight: 400; - src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2") - format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} - html { background-color: var(--bg); color: var(--fg); } - @media (prefers-color-scheme: dark) { html { --bg: rgb(17, 17, 27); @@ -115,7 +104,7 @@ html { } } -@media (prefers-reduced-motion) { +@media(prefers-reduced-motion) { #splashSpinner { display: block; } @@ -133,5 +122,5 @@ html { height: 0; text-align: center; padding-top: 100px; - font-family: "Atkinson Hyperlegible", sans-serif; + font-family: sans-serif; } diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index 8d677f761..bc28b4366 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -25,43 +25,6 @@ //--ad: rgb(255 169 0 / 10%); } -/* atkinson-hyperlegible-regular - latin_latin-ext */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: "Atkinson Hyperlegible"; - font-style: normal; - font-weight: 400; - src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-regular.woff2") - format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* atkinson-hyperlegible-italic - latin_latin-ext */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: "Atkinson Hyperlegible"; - font-style: italic; - font-weight: 400; - src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-italic.woff2") - format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* atkinson-hyperlegible-700 - latin_latin-ext */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: "Atkinson Hyperlegible"; - font-style: normal; - font-weight: 700; - src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700.woff2") - format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} -/* atkinson-hyperlegible-700italic - latin_latin-ext */ -@font-face { - font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */ - font-family: "Atkinson Hyperlegible"; - font-style: italic; - font-weight: 700; - src: url("/static-assets/fonts/atkinson-hyperlegible-v11-latin_latin-ext-700italic.woff2") - format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ -} - ::selection { color: #fff; background-color: var(--accent); @@ -76,8 +39,7 @@ html { accent-color: var(--accent); overflow: auto; overflow-wrap: break-word; - font-family: "Atkinson Hyperlegible", Roboto, HelveticaNeue, Arial, - sans-serif; + font-family: Roboto, HelveticaNeue, Arial, sans-serif; font-size: 14px; line-height: 1.6; text-size-adjust: 100%; @@ -88,8 +50,8 @@ html { -webkit-text-size-adjust: none; &.useCJKFont { - font-family: "Hiragino Maru Gothic Pro", "BIZ UDGothic", - "Atkinson Hyperlegible", Roboto, HelveticaNeue, Arial, sans-serif; + font-family: "Hiragino Maru Gothic Pro", "BIZ UDGothic", Roboto, + HelveticaNeue, Arial, sans-serif; } &.useSystemFont {