Skip to content

Commit 02dc5fe

Browse files
onehappycatskjnldsv
authored andcommitted
Use CSS ellipsis, clean up tooltip code
Signed-off-by: onehappycat <onehappycat@gmx.com>
1 parent 9cbee7c commit 02dc5fe

13 files changed

+58
-56
lines changed

apps/files_sharing/js/dist/files_sharing_tab.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/files_sharing_tab.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-0.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-0.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-4.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-4.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-5.js

+29-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-5.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-6.js

+2-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-6.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/src/components/UserList/UserRowSimple.vue

+9-7
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
<div class="name">
1616
{{ user.id }}
1717
<div class="displayName subtitle">
18-
<div v-if="user.displayname.length>20" v-tooltip.auto="user.displayname">
19-
{{ user.displayname.substring(0,20)+'...' }}
18+
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
19+
{{ user.displayname }}
2020
</div>
21-
<div v-else>{{ user.displayname }}</div>
2221
</div>
2322
</div>
2423
<div />
2524
<div class="mailAddress">
26-
<div v-if="user.email !== null && user.email.length>20" v-tooltip.auto="user.email">
27-
{{ user.email.substring(0,20)+'...' }}
25+
<div v-tooltip="user.email !== null && user.email.length > 20 ? user.email : ''" class="cellText">
26+
{{ user.email }}
2827
</div>
29-
<div v-else>{{ user.email }}</div>
3028
</div>
3129
<div class="groups">
3230
{{ userGroupsLabels }}
@@ -161,5 +159,9 @@ export default {
161159
</script>
162160

163161
<style scoped>
164-
162+
.cellText {
163+
overflow: hidden;
164+
text-overflow: ellipsis;
165+
white-space: nowrap;
166+
}
165167
</style>

0 commit comments

Comments
 (0)