Skip to content

Commit

Permalink
[FIX] Auto complete user suggestions (#18437)
Browse files Browse the repository at this point in the history
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
  • Loading branch information
MartinSchoeler and tassoevan authored Aug 19, 2020
1 parent 5a8762a commit fdda142
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 13 deletions.
21 changes: 19 additions & 2 deletions app/theme/client/imports/general/base_old.css
Original file line number Diff line number Diff line change
Expand Up @@ -1962,9 +1962,26 @@
}

.rc-old .popup-user-not_in_channel {
display: inline-block;
overflow: hidden;

float: right;
white-space: nowrap;
text-overflow: ellipsis;
}

.rc-old .popup-user {
display: flex;
align-items: center;

&-avatar_wrap,
&-name {
margin-right: 4px;
flex-shrink: 0;
}
}

.rc-old .popup-user-notice {
min-width: 0;
margin-left: auto;
}

.rc-old .popup-user-status {
Expand Down
30 changes: 19 additions & 11 deletions app/ui-message/client/popup/messagePopupUser.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
<template name="messagePopupUser">
{{#unless system}}
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div>
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div>
{{/unless}}
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}}
{{#if outside}}
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div>
{{/if}}
{{#if suggestion}}
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div>
{{/if}}
<div class="popup-user" title="{{#if outside}}{{_ 'Not_in_channel'}}{{/if}} {{#if suggestion}}{{_ 'Suggestion_from_recent_messages'}}{{/if}}">
{{#unless system}}
<div class="popup-user-avatar_wrap">
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div>
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div>
</div>
{{/unless}}
<div class="popup-user-name">
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}}
</div>
<div class="popup-user-notice">
{{#if outside}}
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div>
{{/if}}
{{#if suggestion}}
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div>
{{/if}}
</div>
</div>
</template>

0 comments on commit fdda142

Please sign in to comment.