summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2024-10-05 13:47:50 +0900
committerGitHub <noreply@github.com>2024-10-05 13:47:50 +0900
commitd8bf1ff7e9ab4d39b2e924bf7eae010e9b9e21f0 (patch)
tree92ae6fb2a809fc0a69df86b4ae36330aa21d5d1f /packages
parentfeat(backend): 通報および通報解決時に送出されるSystemWebhook... (diff)
downloadsharkey-d8bf1ff7e9ab4d39b2e924bf7eae010e9b9e21f0.tar.gz
sharkey-d8bf1ff7e9ab4d39b2e924bf7eae010e9b9e21f0.tar.bz2
sharkey-d8bf1ff7e9ab4d39b2e924bf7eae010e9b9e21f0.zip
#14675 レビューの修正 (#14705)
Diffstat (limited to 'packages')
-rw-r--r--packages/backend/src/server/api/ApiServerService.ts2
-rw-r--r--packages/frontend/src/components/MkFukidashi.vue6
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);
}
}