Merge pull request #9970 from nextcloud/users-line-height-fix

Fixed multi line in users list
This commit is contained in:
Morris Jobke 2018-06-25 15:35:15 +02:00 committed by GitHub
commit e3be9efd57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 1 deletions

View file

@ -1463,10 +1463,34 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
display: block !important; display: block !important;
} }
} }
/* inputs like mail, username, password */
&:not(.userActions) > input:not([type='submit']) { &:not(.userActions) > input:not([type='submit']) {
width: 100%; width: 100%;
min-width: 0; min-width: 0;
} }
&.name {
word-break: break-all;
}
&.displayName,
&.mailAddress {
> input {
text-overflow: ellipsis;
}
}
&.name,
&.storageLocation {
/* better multi-line visual */
line-height: 1.3em;
max-height: 2.6em;
overflow : hidden;
/* not supported by all browsers
so we keep the overflow hidden
as a fallback */
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
&.quota { &.quota {
.multiselect--active + progress { .multiselect--active + progress {
display: none; display: none;

File diff suppressed because one or more lines are too long

View file

@ -39,6 +39,7 @@
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'" :srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
v-if="!loading.delete && !loading.disable"> v-if="!loading.delete && !loading.disable">
</div> </div>
<!-- dirty hack to ellipsis on two lines -->
<div class="name">{{user.id}}</div> <div class="name">{{user.id}}</div>
<form class="displayName" :class="{'icon-loading-small': loading.displayName}" v-on:submit.prevent="updateDisplayName"> <form class="displayName" :class="{'icon-loading-small': loading.displayName}" v-on:submit.prevent="updateDisplayName">
<input :id="'displayName'+user.id+rand" type="text" <input :id="'displayName'+user.id+rand" type="text"