aboutsummaryrefslogtreecommitdiff
path: root/src/components/basic_user_card/basic_user_card.vue
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-03-25 21:06:58 +0200
committerHenry Jameson <me@hjkos.com>2019-03-25 21:06:58 +0200
commit72749834f3c82847dd8b584cb0e0622a25f292f8 (patch)
tree5ef37dff498ca3daa03b80589d1b641167007501 /src/components/basic_user_card/basic_user_card.vue
parentfaef769b40784c32b095db24d16a92c80ce7ea1f (diff)
parent854d0e80512d2da80cd5153144698a5148da4aa6 (diff)
Merge remote-tracking branch 'upstream/develop' into masto-api/direct
* upstream/develop: (40 commits) review Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi reactivity fixes less hackery, more direct usage of mastoapi ...
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
-rw-r--r--src/components/basic_user_card/basic_user_card.vue12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 9b80c72b..8afe8b44 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -8,8 +8,8 @@
</div>
<div class="basic-user-card-collapsed-content" v-else>
<div :title="user.name" class="basic-user-card-user-name">
- <span v-if="user.name_html" v-html="user.name_html"></span>
- <span v-else>{{ user.name }}</span>
+ <span v-if="user.name_html" class="basic-user-card-user-name-value" v-html="user.name_html"></span>
+ <span v-else class="basic-user-card-user-name-value">{{ user.name }}</span>
</div>
<div>
<router-link class="basic-user-card-screen-name" :to="userProfileLink(user)">
@@ -52,6 +52,14 @@
width: 16px;
vertical-align: middle;
}
+
+ &-value {
+ display: inline-block;
+ max-width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
}
&-expanded-content {