summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-06-05 18:04:54 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-06-05 18:04:54 +0900
commita63a417fd4fa95c6cfde274cf4bdfa9973895635 (patch)
tree54e42c0bc05594683a7b7b38356174e50a829069 /packages/frontend/src/components
parentUpdate basic.cy.js (diff)
parentfix(backend): pageのピン留めを解除することができない問題... (diff)
downloadmisskey-a63a417fd4fa95c6cfde274cf4bdfa9973895635.tar.gz
misskey-a63a417fd4fa95c6cfde274cf4bdfa9973895635.tar.bz2
misskey-a63a417fd4fa95c6cfde274cf4bdfa9973895635.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/MkUserPopup.vue9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue
index c9ff02cc76..c3b777a12e 100644
--- a/packages/frontend/src/components/MkUserPopup.vue
+++ b/packages/frontend/src/components/MkUserPopup.vue
@@ -22,7 +22,7 @@
<div :class="$style.username"><MkAcct :user="user"/></div>
</div>
<div :class="$style.description">
- <Mfm v-if="user.description" :text="user.description" :author="user" :i="$i"/>
+ <Mfm v-if="user.description" :class="$style.mfm" :text="user.description" :author="user" :i="$i"/>
<div v-else style="opacity: 0.7;">{{ i18n.ts.noAccountDescription }}</div>
</div>
<div :class="$style.status">
@@ -192,6 +192,13 @@ onMounted(() => {
border-bottom: solid 1px var(--divider);
}
+.mfm {
+ display: -webkit-box;
+ -webkit-line-clamp: 5;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+}
+
.status {
padding: 16px 26px 16px 26px;
}