From d8bf1ff7e9ab4d39b2e924bf7eae010e9b9e21f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Sat, 5 Oct 2024 13:47:50 +0900 Subject: [PATCH] =?UTF-8?q?#14675=20=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#14705)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/backend/src/server/api/ApiServerService.ts | 2 +- packages/frontend/src/components/MkFukidashi.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/backend/src/server/api/ApiServerService.ts b/packages/backend/src/server/api/ApiServerService.ts index 6b760c258b..be63635efe 100644 --- a/packages/backend/src/server/api/ApiServerService.ts +++ b/packages/backend/src/server/api/ApiServerService.ts @@ -125,7 +125,7 @@ export class ApiServerService { fastify.post<{ Body: { username: string; - password: string; + password?: string; token?: string; credential?: AuthenticationResponseJSON; 'hcaptcha-response'?: string; diff --git a/packages/frontend/src/components/MkFukidashi.vue b/packages/frontend/src/components/MkFukidashi.vue index ba82eb442f..09825487bf 100644 --- a/packages/frontend/src/components/MkFukidashi.vue +++ b/packages/frontend/src/components/MkFukidashi.vue @@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only :class="[ $style.root, tail === 'left' ? $style.left : $style.right, - negativeMargin === true && $style.negativeMergin, + negativeMargin === true && $style.negativeMargin, shadow === true && $style.shadow, ]" > @@ -54,7 +54,7 @@ withDefaults(defineProps<{ &.left { padding-left: calc(var(--fukidashi-radius) * .13); - &.negativeMergin { + &.negativeMargin { margin-left: calc(calc(var(--fukidashi-radius) * .13) * -1); } } @@ -62,7 +62,7 @@ withDefaults(defineProps<{ &.right { padding-right: calc(var(--fukidashi-radius) * .13); - &.negativeMergin { + &.negativeMargin { margin-right: calc(calc(var(--fukidashi-radius) * .13) * -1); } }