diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 13a65e411f..78c3c29c0c 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -15,9 +15,6 @@ SPDX-License-Identifier: AGPL-3.0-only @focusin.passive.stop="() => {}" >
{}" @contextmenu.self.prevent="() => {}" > - - - {{ i18n.ts.none }} - +
+
@@ -429,7 +435,7 @@ onBeforeUnmount(() => { .root { &.center { > .menu { - > .item { + .item { text-align: center; } } @@ -439,7 +445,7 @@ onBeforeUnmount(() => { > .menu { min-width: 230px; - > .item { + .item { padding: 6px 20px; font-size: 0.95em; line-height: 24px; @@ -452,36 +458,38 @@ onBeforeUnmount(() => { margin: auto; > .menu { - padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0; width: 100%; border-radius: 24px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - > .item { - font-size: 1em; - padding: 12px 24px; + > .menuItems { + padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0; - &::before { - width: calc(100% - 24px); - border-radius: 12px; + > .item { + font-size: 1em; + padding: 12px 24px; + + &::before { + width: calc(100% - 24px); + border-radius: 12px; + } + + > .icon { + margin-right: 14px; + width: 24px; + } } - > .icon { - margin-right: 14px; - width: 24px; + > .divider { + margin: 12px 0; } } - - > .divider { - margin: 12px 0; - } } } } .menu { - padding: 8px 0; box-sizing: border-box; max-width: 100vw; min-width: 200px; @@ -493,6 +501,11 @@ onBeforeUnmount(() => { } } +.menuItems { + padding: 8px 0; + box-sizing: border-box; +} + .item { display: flex; align-items: center; diff --git a/packages/frontend/src/components/MkPostFormOtherMenu.vue b/packages/frontend/src/components/MkPostFormOtherMenu.vue index 4dbdeeab1c..ab92776c7f 100644 --- a/packages/frontend/src/components/MkPostFormOtherMenu.vue +++ b/packages/frontend/src/components/MkPostFormOtherMenu.vue @@ -4,57 +4,29 @@ SPDX-License-Identifier: AGPL-3.0-only --> @@ -62,6 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { shallowRef, computed, inject } from 'vue'; import * as Misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; +import MkMenu from '@/components/MkMenu.vue'; import { instance } from '@/instance.js'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; @@ -75,6 +48,8 @@ const modal = shallowRef>(); const props = defineProps<{ currentReactionAcceptance: Misskey.entities.Note['reactionAcceptance']; textLength: number; + align?: 'center' | string; + width?: number; src?: HTMLElement; }>(); @@ -154,48 +129,14 @@ async function reset() {