r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

trying to fix safari flicker in conversations list

Browse Source
This commit is contained in:
Igor Zhukov 2016-12-12 13:59:36 +03:00
parent d8579edd85
commit a6d2214b84
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/less/app.less
View File

@ -1296,14 +1296,6 @@ i.icon-verified {
word-wrap: break-word; word-wrap: break-word;
} }
.im_dialog_message_typing,
.im_dialog_message_wtyping .im_dialog_message_notyping {
display: none;
}
.im_dialog_message_wtyping .im_dialog_message_typing {
display: block;
}
a.im_dialog { a.im_dialog {
.im_dialog_chat_from_wrap, .im_dialog_chat_from_wrap,
@ -1432,6 +1424,10 @@ a.im_dialog_selected {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.im_dialog_message_wrap {
height: 44px;
overflow: hidden;
}
.im_dialog_message { .im_dialog_message {
color: #808080; color: #808080;
} }

4
app/partials/desktop/dialog.html
View File

@ -16,7 +16,7 @@
<div class="im_dialog_photo pull-left" my-peer-photolink="::dialogMessage.peerID" img-class="im_dialog_photo" watch="true"></div> <div class="im_dialog_photo pull-left" my-peer-photolink="::dialogMessage.peerID" img-class="im_dialog_photo" watch="true"></div>
<div class="im_dialog_message_wrap" ng-class="{im_dialog_message_wtyping: dialogMessage.typing > 0}"> <div class="im_dialog_message_wrap">
<div class="im_dialog_peer"> <div class="im_dialog_peer">
<span my-peer-link="dialogMessage.peerID" verified="true"></span> <span my-peer-link="dialogMessage.peerID" verified="true"></span>
@ -24,7 +24,7 @@
<div ng-switch="dialogMessage.typing ? 'typing' : (!dialogMessage.unreadCount && dialogMessage.draft ? 'draft' : (dialogMessage.deleted ? 'deleted' : 'message'))"> <div ng-switch="dialogMessage.typing ? 'typing' : (!dialogMessage.unreadCount && dialogMessage.draft ? 'draft' : (dialogMessage.deleted ? 'deleted' : 'message'))">
<div ng-switch-when="typing" class="im_dialog_message im_dialog_message_typing"> <div ng-switch-when="typing" class="im_dialog_message">
<span class="im_short_message_service" my-i18n="im_conversation_group_typing"> <span class="im_short_message_service" my-i18n="im_conversation_group_typing">
<my-i18n-param name="name"><span my-peer-link="dialogMessage.typing" short="true" class="im_dialog_chat_from_wrap"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param> <my-i18n-param name="name"><span my-peer-link="dialogMessage.typing" short="true" class="im_dialog_chat_from_wrap"></span></my-i18n-param><my-i18n-param name="dots"><span my-loading-dots></span></my-i18n-param>
</span> </span>