summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-04-14 19:35:16 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-04-14 19:35:16 +0900
commit69adbdef1519bbfe0ed23455736e5873862c0e44 (patch)
treea6ba8628ff5c29084c93260acdccc3f1accb544a /packages/frontend/src/components
parentUpdate about-misskey.vue (diff)
parentrefactor(backend): validateNoteの引数の型を強くし、anyを除去 (#1... (diff)
downloadmisskey-69adbdef1519bbfe0ed23455736e5873862c0e44.tar.gz
misskey-69adbdef1519bbfe0ed23455736e5873862c0e44.tar.bz2
misskey-69adbdef1519bbfe0ed23455736e5873862c0e44.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkReactionsViewer.details.vue19
1 files changed, 10 insertions, 9 deletions
diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue
index b4210be911..f5e611c62a 100644
--- a/packages/frontend/src/components/MkReactionsViewer.details.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.details.vue
@@ -10,7 +10,7 @@
<MkAvatar :class="$style.avatar" :user="u"/>
<MkUserName :user="u" :nowrap="true"/>
</div>
- <div v-if="users.length > 10">+{{ count - 10 }}</div>
+ <div v-if="users.length > 10" :class="$style.more">+{{ count - 10 }}</div>
</div>
</div>
</MkTooltip>
@@ -50,7 +50,9 @@ function getReactionName(reaction: string): string {
.reaction {
max-width: 100px;
+ padding-right: 10px;
text-align: center;
+ border-right: solid 0.5px var(--divider);
}
.reactionIcon {
@@ -66,25 +68,20 @@ function getReactionName(reaction: string): string {
}
.users {
+ contain: content;
flex: 1;
min-width: 0;
+ margin: -4px 14px 0 10px;
font-size: 0.95em;
- border-left: solid 0.5px var(--divider);
- padding-left: 10px;
- margin-left: 10px;
- margin-right: 14px;
text-align: left;
}
.user {
line-height: 24px;
+ padding-top: 4px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-
- &:not(:last-child) {
- margin-bottom: 3px;
- }
}
.avatar {
@@ -92,4 +89,8 @@ function getReactionName(reaction: string): string {
height: 24px;
margin-right: 3px;
}
+
+.more {
+ padding-top: 4px;
+}
</style>