summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components/MkMenu.vue
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-04-24 14:23:45 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-04-24 14:23:45 -0400
commita4dd19fdd427a5adc8fa80871d1c742aa9708730 (patch)
tree3983a0e772922042043026b4af168e8dd3525fb2 /packages/frontend/src/components/MkMenu.vue
parentMerge branch 'develop' into merge/2025-03-24 (diff)
parentenhance(backend): DB note (userId) インデクス -> (userId, id) 複合イ... (diff)
downloadsharkey-a4dd19fdd427a5adc8fa80871d1c742aa9708730.tar.gz
sharkey-a4dd19fdd427a5adc8fa80871d1c742aa9708730.tar.bz2
sharkey-a4dd19fdd427a5adc8fa80871d1c742aa9708730.zip
merge upstream again
Diffstat (limited to 'packages/frontend/src/components/MkMenu.vue')
-rw-r--r--packages/frontend/src/components/MkMenu.vue25
1 files changed, 16 insertions, 9 deletions
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 8be4792cf8..c2fc967e1d 100644
--- a/packages/frontend/src/components/MkMenu.vue
+++ b/packages/frontend/src/components/MkMenu.vue
@@ -31,9 +31,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<template v-for="item in (items2 ?? [])">
<div v-if="item.type === 'divider'" role="separator" tabindex="-1" :class="$style.divider"></div>
- <span v-else-if="item.type === 'label'" role="menuitem" tabindex="-1" :class="[$style.label, $style.item]">
- <span style="opacity: 0.7;">{{ item.text }}</span>
- </span>
+ <div v-else-if="item.type === 'label'" role="menuitem" tabindex="-1" :class="[$style.label]">
+ <span>{{ item.text }}</span>
+ </div>
<span v-else-if="item.type === 'pending'" role="menuitem" tabindex="0" :class="[$style.pending, $style.item]">
<span><MkEllipsis/></span>
@@ -619,12 +619,6 @@ onBeforeUnmount(() => {
--menuActiveBg: var(--MI_THEME-accentedBg);
}
- &.label {
- pointer-events: none;
- font-size: 0.7em;
- padding-bottom: 4px;
- }
-
&.pending {
pointer-events: none;
opacity: 0.7;
@@ -694,6 +688,19 @@ onBeforeUnmount(() => {
font-size: 12px;
}
+.label {
+ position: relative;
+ padding: 6px 16px;
+ box-sizing: border-box;
+ white-space: nowrap;
+ font-size: 0.7em;
+ text-align: left;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ opacity: 0.7;
+ pointer-events: none;
+}
+
.divider {
margin: 8px 0;
border-top: solid 0.5px var(--MI_THEME-divider);