Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 37291

Browse source
This commit is contained in:
Julia Radzhabova 2018-03-23 17:15:42 +03:00
parent 582b7e16e4
commit f11f79b1b9
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/view/Chat.js
View file

@ -60,8 +60,8 @@ define([
storeMessages: undefined, storeMessages: undefined,
tplUser: ['<li id="<%= user.get("iid") %>"<% if (!user.get("online")) { %> class="offline"<% } %>>', tplUser: ['<li id="<%= user.get("iid") %>"<% if (!user.get("online")) { %> class="offline"<% } %>>',
'<div class="color" style="background-color: <%= user.get("color") %>;" >', '<div class="name"><%= scope.getUserName(user.get("username")) %>',
'<label class="name"><%= scope.getUserName(user.get("username")) %></label>', '<div class="color" style="background-color: <%= user.get("color") %>;" ></div>',
'</div>', '</div>',
'</li>'].join(''), '</li>'].join(''),

2
apps/common/main/lib/view/Comments.js
View file

@ -1370,7 +1370,7 @@ define([
return Common.Utils.String.ellipsis(Common.Utils.String.htmlEncode(quote), 120, true); return Common.Utils.String.ellipsis(Common.Utils.String.htmlEncode(quote), 120, true);
}, },
getUserName: function (username) { getUserName: function (username) {
return Common.Utils.String.ellipsis(Common.Utils.String.htmlEncode(username), 22, true); return Common.Utils.String.htmlEncode(username);
}, },
pickLink: function (message) { pickLink: function (message) {

14
apps/common/main/resources/less/chat.less
View file

@ -52,22 +52,24 @@
} }
.color { .color {
position: absolute;
top: 0;
left: 0;
margin-top: 1px;
width: 12px; width: 12px;
height: 12px; height: 12px;
display: inline-block;
vertical-align: middle;
border: 1px solid @gray-dark; border: 1px solid @gray-dark;
} }
.name { .name {
display: block; display: block;
padding-left: 16px; position: relative;
padding: 0 10px 0 16px;
margin-top: -2px; margin-top: -2px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden;
font-weight: bold; font-weight: bold;
vertical-align: middle;
} }
} }
@ -94,6 +96,8 @@
.user { .user {
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.message { .message {

3
apps/common/main/resources/less/comments.less
View file

@ -113,10 +113,9 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding: 10px 0px 0 0px; padding: 10px 65px 0 0px;
height: 26px; height: 26px;
cursor: default; cursor: default;
max-width: 155px;
} }
.user-name-colored { .user-name-colored {

2
apps/common/main/resources/less/history.less
View file

@ -121,8 +121,8 @@
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
color: @gray-darker; color: @gray-darker;
max-width: 210px;
text-overflow: ellipsis; text-overflow: ellipsis;
padding-right: 35px;
} }
.color { .color {