summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-04-17 20:23:27 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-04-17 20:23:27 +0900
commitfd61ac5221da56c0c9743a96eac4cbdcbbcaa41d (patch)
tree28984a56742567bebe253b00659ba82076147154
parentfix(deps): update vite to v6.3.1 (#15857) (diff)
downloadsharkey-fd61ac5221da56c0c9743a96eac4cbdcbbcaa41d.tar.gz
sharkey-fd61ac5221da56c0c9743a96eac4cbdcbbcaa41d.tar.bz2
sharkey-fd61ac5221da56c0c9743a96eac4cbdcbbcaa41d.zip
refactor(frontend): refactor styles
-rw-r--r--packages/frontend/src/components/MkMenu.vue25
-rw-r--r--packages/frontend/src/components/MkNotification.vue13
2 files changed, 17 insertions, 21 deletions
diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue
index 44f5a09404..fbae4f0d8a 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);
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 13ffd6b7cc..9672efca0a 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -296,6 +296,7 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
right: -2px;
width: 20px;
height: 20px;
+ line-height: 20px;
box-sizing: border-box;
border-radius: 100%;
background: var(--MI_THEME-panel);
@@ -310,73 +311,61 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
}
.t_follow, .t_followRequestAccepted, .t_receiveFollowRequest {
- padding: 3px;
background: var(--eventFollow);
pointer-events: none;
}
.t_renote {
- padding: 3px;
background: var(--eventRenote);
pointer-events: none;
}
.t_quote {
- padding: 3px;
background: var(--eventRenote);
pointer-events: none;
}
.t_reply {
- padding: 3px;
background: var(--eventReply);
pointer-events: none;
}
.t_mention {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.t_pollEnded {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.t_achievementEarned {
- padding: 3px;
background: var(--eventAchievement);
pointer-events: none;
}
.t_exportCompleted {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.t_roleAssigned {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.t_login {
- padding: 3px;
background: var(--eventLogin);
pointer-events: none;
}
.t_createToken {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}
.t_chatRoomInvitationReceived {
- padding: 3px;
background: var(--eventOther);
pointer-events: none;
}