Skip to content

Commit fdda142

Browse files
[FIX] Auto complete user suggestions (#18437)
Co-authored-by: Tasso Evangelista <[email protected]>
1 parent 5a8762a commit fdda142

File tree

2 files changed

+38
-13
lines changed

2 files changed

+38
-13
lines changed

app/theme/client/imports/general/base_old.css

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,9 +1962,26 @@
19621962
}
19631963

19641964
.rc-old .popup-user-not_in_channel {
1965-
display: inline-block;
1965+
overflow: hidden;
19661966

1967-
float: right;
1967+
white-space: nowrap;
1968+
text-overflow: ellipsis;
1969+
}
1970+
1971+
.rc-old .popup-user {
1972+
display: flex;
1973+
align-items: center;
1974+
1975+
&-avatar_wrap,
1976+
&-name {
1977+
margin-right: 4px;
1978+
flex-shrink: 0;
1979+
}
1980+
}
1981+
1982+
.rc-old .popup-user-notice {
1983+
min-width: 0;
1984+
margin-left: auto;
19681985
}
19691986

19701987
.rc-old .popup-user-status {
Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<template name="messagePopupUser">
2-
{{#unless system}}
3-
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div>
4-
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div>
5-
{{/unless}}
6-
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}}
7-
{{#if outside}}
8-
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div>
9-
{{/if}}
10-
{{#if suggestion}}
11-
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div>
12-
{{/if}}
2+
<div class="popup-user" title="{{#if outside}}{{_ 'Not_in_channel'}}{{/if}} {{#if suggestion}}{{_ 'Suggestion_from_recent_messages'}}{{/if}}">
3+
{{#unless system}}
4+
<div class="popup-user-avatar_wrap">
5+
<div class="popup-user-status border-transparent-dark popup-user-status-{{status}}"></div>
6+
<div class="popup-user-avatar" style="background-image:url({{avatarUrlFromUsername username avatarETag}});"></div>
7+
</div>
8+
{{/unless}}
9+
<div class="popup-user-name">
10+
<strong>{{username}}</strong> {{name}}{{#if nickname}} ({{nickname}}){{/if}}
11+
</div>
12+
<div class="popup-user-notice">
13+
{{#if outside}}
14+
<div class="popup-user-not_in_channel">{{_ "Not_in_channel"}}</div>
15+
{{/if}}
16+
{{#if suggestion}}
17+
<div class="popup-user-not_in_channel">{{_ "Suggestion_from_recent_messages"}}</div>
18+
{{/if}}
19+
</div>
20+
</div>
1321
</template>

0 commit comments

Comments
 (0)