From 83daade80b5eba10b0b5b2003daf2dd9db60c9dd Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 10 Feb 2016 18:51:20 +0000 Subject: [PATCH] Bugfixes --- app/js/directives.js | 2 +- app/less/app.less | 24 ++++++++----------- .../desktop/message_attach_webpage.html | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/js/directives.js b/app/js/directives.js index d8dce3eb..c9f7b9e7 100755 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -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(); diff --git a/app/less/app.less b/app/less/app.less index 0179f307..c9997f96 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -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 { .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 { 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; } } diff --git a/app/partials/desktop/message_attach_webpage.html b/app/partials/desktop/message_attach_webpage.html index 2ac2b4ed..c16ebf2d 100644 --- a/app/partials/desktop/message_attach_webpage.html +++ b/app/partials/desktop/message_attach_webpage.html @@ -20,7 +20,7 @@
- +