From f3f41c5884be5bde07a68e77305a5d96f7a96e9e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 19 Jun 2024 15:32:42 -0500 Subject: [PATCH] Use Vazirmatn font for Arabic and Farsi Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1677 --- package.json | 2 +- src/styles/i18n/arabic.css | 37 +++++++++++++++++++++++-------------- yarn.lock | 8 ++++---- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 4a2efa577..8065d9050 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "@fontsource/inter": "^5.0.0", "@fontsource/noto-sans-javanese": "^5.0.16", "@fontsource/roboto-mono": "^5.0.0", - "@fontsource/tajawal": "^5.0.8", + "@fontsource/vazirmatn": "^5.0.20", "@gamestdio/websocket": "^0.3.2", "@lexical/clipboard": "^0.14.2", "@lexical/hashtag": "^0.14.2", diff --git a/src/styles/i18n/arabic.css b/src/styles/i18n/arabic.css index 0d56b78c5..66c634354 100644 --- a/src/styles/i18n/arabic.css +++ b/src/styles/i18n/arabic.css @@ -3,8 +3,8 @@ font-style: normal; font-display: swap; font-weight: 200; - src: url('@fontsource/tajawal/files/tajawal-arabic-200-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-200-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-200-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-200-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -12,8 +12,8 @@ font-style: normal; font-display: swap; font-weight: 300; - src: url('@fontsource/tajawal/files/tajawal-arabic-300-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-300-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-300-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-300-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -21,8 +21,8 @@ font-style: normal; font-display: swap; font-weight: 400; - src: url('@fontsource/tajawal/files/tajawal-arabic-400-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-400-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-400-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-400-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -30,8 +30,17 @@ font-style: normal; font-display: swap; font-weight: 500; - src: url('@fontsource/tajawal/files/tajawal-arabic-500-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-500-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-500-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-500-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; +} + +@font-face { + font-family: 'Soapbox i18n'; + font-style: normal; + font-display: swap; + font-weight: 600; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-600-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-600-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -39,8 +48,8 @@ font-style: normal; font-display: swap; font-weight: 700; - src: url('@fontsource/tajawal/files/tajawal-arabic-700-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-700-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-700-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-700-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -48,8 +57,8 @@ font-style: normal; font-display: swap; font-weight: 800; - src: url('@fontsource/tajawal/files/tajawal-arabic-800-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-800-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-800-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-800-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } @font-face { @@ -57,6 +66,6 @@ font-style: normal; font-display: swap; font-weight: 900; - src: url('@fontsource/tajawal/files/tajawal-arabic-900-normal.woff2') format('woff2'), url('@fontsource/tajawal/files/tajawal-arabic-900-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF; + src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-900-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-900-normal.woff') format('woff'); + unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index d71bbeadf..5db1f7a37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1434,10 +1434,10 @@ resolved "https://registry.yarnpkg.com/@fontsource/roboto-mono/-/roboto-mono-5.0.8.tgz#9b3df61f884f46e12d3eca46e75517fde58da68e" integrity sha512-vjnNX8zQCSp4HadUJ3gpZiizCsK/ROjgGMpd4bcRxuyiTNGGMaznmKbhqdyVeFVap1sX8h2Qu380awaotey/mQ== -"@fontsource/tajawal@^5.0.8": - version "5.0.8" - resolved "https://registry.yarnpkg.com/@fontsource/tajawal/-/tajawal-5.0.8.tgz#cd8a593ec5062b283b093b56ee5d38b6b97fa93d" - integrity sha512-KILlXB6B8YYcssz3pccPs/4s1XcXwTWogCtE4Ag3oTpK+81DIQLc2b9o77UiBP4yC17MmqeOp1lvoaJQP80RoA== +"@fontsource/vazirmatn@^5.0.20": + version "5.0.20" + resolved "https://registry.yarnpkg.com/@fontsource/vazirmatn/-/vazirmatn-5.0.20.tgz#9e8d56b712f6c397e7a6c63498a2fecca9fde9a3" + integrity sha512-5h9bKrZjJ3U7C5tj2OtGdDBWGzS+acOOFhlonYlNekS4vNzcwMU7qkKADHTZYGQrMqhpUNKqGwHEHlxXqZpXmQ== "@formatjs/cli@^6.2.0": version "6.2.0"