diff --git a/README.md b/README.md index 0939c3712..1ac4ff602 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ ## 細かい変更点 +- マージされていない本家版へのプルリクエストを独断でマージ + - RTL Layout Support ([!10452](https://git.joinfirefish.org/firefish/firefish/-/merge_requests/10452)) - `emojis` の API エンドポイント（Misskey v13- 互換）を追加（[firefish-mkdir](https://git.mkdir.uk/hiira/firefish-mkdir) から取り込み） - Docker のベースイメージに Node v21 を使用 - HTML のコードに入るコメントアートを削除 diff --git a/packages/backend/src/server/web/bios.css b/packages/backend/src/server/web/bios.css index d6a1285e9..719ac90bf 100644 --- a/packages/backend/src/server/web/bios.css +++ b/packages/backend/src/server/web/bios.css @@ -83,8 +83,8 @@ button { color: rgb(156, 207, 216); font-size: 16px; padding: 0 20px; - margin-right: 5px; - margin-left: 5px; + margin-inline-end: 5px; + margin-inline-start: 5px; } button:hover { background: #555; diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css index 740a2aa1a..cfbe047ff 100644 --- a/packages/backend/src/server/web/cli.css +++ b/packages/backend/src/server/web/cli.css @@ -19,7 +19,7 @@ main { img { border-radius: 10px; - margin-right: 10px; + margin-inline-end: 10px; } #form { diff --git a/packages/backend/src/server/web/style.css b/packages/backend/src/server/web/style.css index cb99a160d..8a16ca842 100644 --- a/packages/backend/src/server/web/style.css +++ b/packages/backend/src/server/web/style.css @@ -13,7 +13,7 @@ html { position: fixed; z-index: 10000; top: 0; - left: 0; + inset-inline-start: 0; width: 100vw; height: 100vh; cursor: wait; @@ -25,9 +25,9 @@ html { #splashIcon { position: absolute; top: 0; - right: 0; + inset-inline-end: 0; bottom: 0; - left: 0; + inset-inline-start: 0; margin: auto; width: 64px; height: 64px; @@ -37,9 +37,9 @@ html { #splashSpinner { position: absolute; top: 0; - right: 0; + inset-inline-end: 0; bottom: 0; - left: 0; + inset-inline-start: 0; margin: auto; display: inline-block; width: 28px; @@ -51,7 +51,7 @@ html { #splashSpinner > .spinner { position: absolute; top: 0; - left: 0; + inset-inline-start: 0; width: 28px; height: 28px; fill-rule: evenodd; @@ -113,9 +113,9 @@ html { #splashText { position: absolute; top: 0; - right: 0; + inset-inline-end: 0; bottom: 0; - left: 0; + inset-inline-start: 0; margin: auto; display: inline-block; width: 70%; diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts index ccc6b365d..fd8f7328b 100644 --- a/packages/backend/src/services/send-email.ts +++ b/packages/backend/src/services/send-email.ts @@ -47,7 +47,7 @@ export async function sendEmail(
- +

${meta.name}

diff --git a/packages/client/src/components/MkAbuseReport.vue b/packages/client/src/components/MkAbuseReport.vue index 553652394..24067e6a7 100644 --- a/packages/client/src/components/MkAbuseReport.vue +++ b/packages/client/src/components/MkAbuseReport.vue @@ -100,9 +100,9 @@ function resolve() { > .target { width: 35%; box-sizing: border-box; - text-align: left; + text-align: initial; padding: 24px; - border-right: solid 1px var(--divider); + border-inline-end: solid 1px var(--divider); > .info { display: flex; @@ -129,7 +129,7 @@ function resolve() { } > .names { - margin-left: 0.3em; + margin-inline-start: 0.3em; padding: 0 8px; flex: 1; diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 8d5675868..c6fc768a6 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -9,7 +9,7 @@