diff options
| author | Peter Holme Obrestad <pho@me.com> | 2017-03-22 23:35:37 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-03-22 23:35:37 +0300 |
| commit | 443d1fb9b8c7a6d58a06829529de406352c0c51f (patch) | |
| tree | 8d9d809dcf7cf8abcb62088e9ccf0314d4dbc1ee /plugins | |
| parent | 6177e26ac5196b2e0a3248d2505d855ce1186a1f (diff) | |
Update followingpages.js (#11511)
* Update followingpages.js
Fix for #11509
* Update followingpages.js
better css, allow for smooth transition and more control.
* Update client.css
add transition css.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Overlay/client/client.css | 1 | ||||
| -rw-r--r-- | plugins/Overlay/client/followingpages.js | 25 |
2 files changed, 12 insertions, 14 deletions
diff --git a/plugins/Overlay/client/client.css b/plugins/Overlay/client/client.css index 7431ab1efb..edc349f746 100644 --- a/plugins/Overlay/client/client.css +++ b/plugins/Overlay/client/client.css @@ -42,6 +42,7 @@ background: url(./linktags_lessshadow.png) no-repeat 0 -21px; overflow: hidden; transform-origin: 100% 50%; + transition: 0.2s ease-in-out; } .PIS_LinkTag span { diff --git a/plugins/Overlay/client/followingpages.js b/plugins/Overlay/client/followingpages.js index 33e924c4ca..d13bf68122 100644 --- a/plugins/Overlay/client/followingpages.js +++ b/plugins/Overlay/client/followingpages.js @@ -258,32 +258,29 @@ var Piwik_Overlay_FollowingPages = (function () { } var zoomFactor = 1 + +tagElement.attr('data-rateofmax'); - tagElement.css({ - '-webkit-transform': 'scale(' + zoomFactor + ')', - '-moz-transform': 'scale(' + zoomFactor + ')', - '-ms-transform': 'scale(' + zoomFactor + ')', - '-o-transform': 'scale(' + zoomFactor + ')', - 'transform': 'scale(' + zoomFactor + ')', - 'opacity': zoomFactor/2 - }); - top = offset.top - tagHeight + 6; left = offset.left - tagWidth + 10; - if (isRight = (left < 2)) { + if (isRight = (left < zoomFactor * tagWidth - tagWidth ) ) { tagElement.addClass('PIS_Right'); left = offset.left + linkTag.outerWidth() - 10; } - if (top < 2) { + if (top < zoomFactor * tagHeight - tagHeight ) { tagElement.addClass(isRight ? 'PIS_BottomRight' : 'PIS_Bottom'); top = offset.top + linkTag.outerHeight() - 6; } tagElement.css({ - top: top + 'px', - left: left + 'px' - }).show(); + '-webkit-transform': 'translate(' + left + 'px, ' + top + 'px) scale(' + zoomFactor + ')', + '-moz-transform': 'translate(' + left + 'px, ' + top + 'px) scale(' + zoomFactor + ')', + '-ms-transform': 'translate(' + left + 'px, ' + top + 'px) scale(' + zoomFactor + ')', + '-o-transform': 'translate(' + left + 'px, ' + top + 'px) scale(' + zoomFactor + ')', + 'transform': 'translate(' + left + 'px, ' + top + 'px) scale(' + zoomFactor + ')', + 'opacity': zoomFactor/2 + }); + + tagElement.show(); } } |