Browse Source

Bugfixes

master
Igor Zhukov 8 years ago
parent
commit
83daade80b
  1. 2
      app/js/directives.js
  2. 24
      app/less/app.less
  3. 2
      app/partials/desktop/message_attach_webpage.html

2
app/js/directives.js

@ -2898,7 +2898,7 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -2898,7 +2898,7 @@ angular.module('myApp.directives', ['myApp.filters'])
}
}
initEl.attr('data-content', encodeEntities(peer.initials)).prependTo(element);
initEl.attr('data-content', encodeEntities(peer.initials || '')).prependTo(element);
imgEl.remove();

24
app/less/app.less

@ -435,6 +435,12 @@ a { @@ -435,6 +435,12 @@ a {
.progress-arc-wrap {
display: block;
border-radius: 100%;
transform-origin: center center;
-webkit-animation: infinite_rotation 0.8s linear infinite;
-moz-animation: infinite_rotation 0.8s linear infinite;
-ms-animation: infinite_rotation 0.8s linear infinite;
animation: infinite_rotation 0.8s linear infinite;
}
.progress-arc .progress-arc-bar {
stroke-dashoffset: 0;
@ -443,15 +449,10 @@ a { @@ -443,15 +449,10 @@ a {
.progress-arc-intermediate & {
stroke: #68a4d1;
-webkit-animation: infinite_rotation 0.8s linear infinite;
-moz-animation: infinite_rotation 0.8s linear infinite;
-ms-animation: infinite_rotation 0.8s linear infinite;
animation: infinite_rotation 0.8s linear infinite;
}
.composer_progress_icon & {
stroke: rgba(0,0,0,0.3);
stroke: #b3b3b3;
}
.progress-arc-percent & {
@ -459,32 +460,27 @@ a { @@ -459,32 +460,27 @@ a {
stroke: rgba(255,255,255,0.95);
transition: stroke-dasharray 500ms linear;
-webkit-animation: infinite_rotation 2s linear infinite;
-moz-animation: infinite_rotation 2s linear infinite;
-ms-animation: infinite_rotation 2s linear infinite;
animation: infinite_rotation 2s linear infinite;
}
}
.stop0 {
stop-opacity: 1.0;
stop-color: #68a4d1;
.composer_progress_icon & {
stop-color: rgba(0,0,0,0.3);
stop-color: #b3b3b3;
}
}
.stop60 {
stop-opacity: 1.0;
stop-color: #68a4d1;
.composer_progress_icon & {
stop-color: rgba(0,0,0,0.3);
stop-color: #b3b3b3;
}
}
.stop100 {
stop-opacity: 0.0;
stop-color: #68a4d1;
.composer_progress_icon & {
stop-color: rgba(0,0,0,0.3);
stop-color: #b3b3b3;
}
}

2
app/partials/desktop/message_attach_webpage.html

@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
</div>
<div ng-if="webpage.description.length" class="im_message_webpage_description" ng-bind-html="webpage.rDescription"></div>
<a class="im_message_video_thumb" ng-click="openEmbed($event)" ng-href="{{webpage.url}}" target="_blank" ng-style="::{width: video.thumb.width + 'px'}">
<span ng-if="webpage.duration > 0" class="im_message_video_duration nocopy" data-content="::webpage.duration | duration"></span>
<span ng-if="webpage.duration > 0" class="im_message_video_duration nocopy" data-content="{{::webpage.duration | duration}}"></span>
<i class="icon icon-videoplay"></i>
<img
class="im_message_video_thumb"

Loading…
Cancel
Save