aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-04-29 18:11:07 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-04-29 18:11:07 +0000
commit6d1d09bcc05f4476c7efad1980e656683db2e5c3 (patch)
tree06ef92e0f8e78c6b5246a47b5cfaf119ed9c3d98 /src
parent9e2fa50b74eb83e3c3eadb9a68d24ddaa1d9da48 (diff)
parent5b16e368285a3e61f8d200c06e6109ec39819314 (diff)
Merge branch '509' into 'develop'
Show ellipsis for long user name and screen name Closes #509 See merge request pleroma/pleroma-fe!775
Diffstat (limited to 'src')
-rw-r--r--src/components/basic_user_card/basic_user_card.vue15
-rw-r--r--src/components/selectable_list/selectable_list.vue4
2 files changed, 12 insertions, 7 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 48de6678..25f1fb2a 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -44,14 +44,15 @@
width: 16px;
vertical-align: middle;
}
+ }
- &-value {
- display: inline-block;
- max-width: 100%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
+ &-user-name-value,
+ &-screen-name {
+ display: inline-block;
+ max-width: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
&-expanded-content {
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
index ba1e5266..3f16c921 100644
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@@ -31,6 +31,10 @@
&-item-inner {
display: flex;
align-items: center;
+
+ > * {
+ min-width: 0;
+ }
}
&-item-selected-inner {