Skip to content

Commit

Permalink
Css clamp
Browse files Browse the repository at this point in the history
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Jun 25, 2018
1 parent 910a431 commit ab22ffa
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
11 changes: 10 additions & 1 deletion settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1479,8 +1479,17 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
&.name,
&.storageLocation {
// better multi-line visual
/* 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 {
.multiselect--active + progress {
Expand Down
2 changes: 1 addition & 1 deletion settings/js/settings-vue.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/js/settings-vue.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings/src/components/userList/userRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
v-if="!loading.delete && !loading.disable">
</div>
<!-- dirty hack to ellipsis on two lines -->
<div class="name">{{user.id.substr(0, 40)}}{{user.id.substr(0, 40).length===40?'…':''}}</div>
<div class="name">{{user.id}}</div>
<form class="displayName" :class="{'icon-loading-small': loading.displayName}" v-on:submit.prevent="updateDisplayName">
<input :id="'displayName'+user.id+rand" type="text"
:disabled="loading.displayName||loading.all"
Expand Down

0 comments on commit ab22ffa

Please sign in to comment.