Browse Source

style improvements

master
Igor Zhukov 10 years ago
parent
commit
b0130531f8
  1. 16
      app/css/app.css
  2. 4
      app/js/services.js
  3. 6
      app/partials/message.html
  4. 3
      app/vendor/jquery.emojiarea/jquery.emojiarea.js

16
app/css/app.css

@ -883,6 +883,15 @@ img.im_message_video_thumb { @@ -883,6 +883,15 @@ img.im_message_video_thumb {
border-radius: 2px;
}
img.im_message_video_thumb {
-webkit-filter: blur(2px);
-moz-filter: blur(2px);
-o-filter: blur(2px);
-ms-filter: blur(2px);
filter: blur(2px);
filter:progid:DXImageTransform.Microsoft.Blur(PixelRadius='2');
}
div.im_message_video_thumb {
position: relative;
}
@ -965,6 +974,13 @@ div.im_message_video_thumb { @@ -965,6 +974,13 @@ div.im_message_video_thumb {
float: left;
}
.im_message_document_thumb {
border-radius: 2px;
overflow: hidden;
max-width: 100px;
max-height: 100px;
}
.im_message_document_name_wrap {
overflow: hidden;
white-space: nowrap;

4
app/js/services.js

@ -1667,8 +1667,8 @@ angular.module('myApp.services', []) @@ -1667,8 +1667,8 @@ angular.module('myApp.services', [])
function wrapForHistory (videoID) {
var video = angular.copy(videos[videoID]),
width = 100,
height = 100,
width = 200,
height = 200,
thumbPhotoSize = video.thumb,
thumb = {
placeholder: 'img/placeholders/VideoThumbConversation.gif',

6
app/partials/message.html

@ -115,6 +115,12 @@ @@ -115,6 +115,12 @@
<div ng-switch-when="messageMediaDocument" class="im_message_document">
<a href="" ng-click="openDoc(historyMessage.media.document.id)" ng-if="!historyMessage.media.document.progress.enabled">
<i class="icon icon-document"></i>
<!-- <img
class="im_message_document_thumb"
my-load-thumb
thumb="historyMessage.media.document.thumb"
ng-if="historyMessage.media.document.thumb"
/> -->
</a>
<i class="icon icon-document" ng-if="historyMessage.media.document.progress.enabled"></i>

3
app/vendor/jquery.emojiarea/jquery.emojiarea.js vendored

@ -281,7 +281,8 @@ @@ -281,7 +281,8 @@
this.setup();
this.$button.on('mousedown', function() {
/* MODIFICATION: Following line was modified by Igor Zhukov, in order to improve emoji insert behaviour */
$(document.body).on('mousedown', function() {
if (self.hasFocus) {
self.selection = util.saveSelection();
}

Loading…
Cancel
Save