From ed0d493a17a0ad7abc29b78a024c42f28d297f7e Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Wed, 2 Oct 2024 00:32:55 -0300 Subject: [PATCH] Apply font to `Select.Option` elements Based on whether or not the element is for a RTL or LTR language --- src/js/components/Select/LanguageSelect.tsx | 1 + src/js/loaders/SurahIndexLoader.ts | 12 ++++++------ src/js/loaders/SurahStreamLoader.ts | 14 +++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/js/components/Select/LanguageSelect.tsx b/src/js/components/Select/LanguageSelect.tsx index ff817f189..197bcc8e9 100644 --- a/src/js/components/Select/LanguageSelect.tsx +++ b/src/js/components/Select/LanguageSelect.tsx @@ -17,6 +17,7 @@ export function LanguageSelect({ locale }: Props) { key={i} className={classNames( "flex h-6 w-full justify-center no-underline mb-1 rounded border-accent", + l.direction === "rtl" ? "font-cairo" : "font-kanit", l.direction, l.name === locale.name ? "active" : undefined, )} diff --git a/src/js/loaders/SurahIndexLoader.ts b/src/js/loaders/SurahIndexLoader.ts index b160014bc..375c380ad 100644 --- a/src/js/loaders/SurahIndexLoader.ts +++ b/src/js/loaders/SurahIndexLoader.ts @@ -11,14 +11,14 @@ import { formatNumber } from "~/lib/t"; .querySelector("meta[name='revision']")! .getAttribute("content")!; const fonts = (() => { + const f = [ + item.font("Cairo Regular", "url(/fonts/cairo-regular.ttf)"), + item.font("Kanit Regular", "url(/fonts/kanit-regular.ttf)"), + ]; if (doc.dir === "rtl") { - return [ - item.font("Cairo Regular", "url(/fonts/cairo-regular.ttf)"), - item.font("Cairo Bold", "url(/fonts/cairo-bold.ttf)"), - ]; - } else { - return [item.font("Kanit Regular", "url(/fonts/kanit-regular.ttf)")]; + f.push(item.font("Cairo Bold", "url(/fonts/cairo-bold.ttf)")); } + return f; })(); postman( diff --git a/src/js/loaders/SurahStreamLoader.ts b/src/js/loaders/SurahStreamLoader.ts index 6c008fa6b..1957acb54 100644 --- a/src/js/loaders/SurahStreamLoader.ts +++ b/src/js/loaders/SurahStreamLoader.ts @@ -12,15 +12,15 @@ import { formatNumber } from "~/lib/t"; .querySelector("meta[name='revision']")! .getAttribute("content")!; const fonts = (() => { + const f = [ + item.font("Cairo Regular", "url(/fonts/cairo-regular.ttf)"), + item.font("Kanit Regular", "url(/fonts/kanit-regular.ttf)"), + ]; if (doc.dir === "rtl") { - return [ - item.font("Cairo Regular", "url(/fonts/cairo-regular.ttf)"), - item.font("Cairo Bold", "url(/fonts/cairo-bold.ttf)"), - item.font("Amiri Regular", "url(/fonts/amiri-regular.ttf)"), - ]; - } else { - return [item.font("Kanit Regular", "url(/fonts/kanit-regular.ttf)")]; + f.push(item.font("Cairo Bold", "url(/fonts/cairo-bold.ttf)")); + f.push(item.font("Amiri Regular", "url(/fonts/amiri-regular.ttf)")); } + return f; })(); postman(