diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js index f30d4fe0..9e0de4d0 100755 --- a/ui (gen4)/features/ui.js +++ b/ui (gen4)/features/ui.js @@ -2113,13 +2113,14 @@ var CurrentImageIndicatorActions = actions.Actions({ .addClass('current-marker ui-current-image-indicator') .css({ opacity: '0', - top: '0px', - left: '0px', + //top: '0px', + //left: '0px', }) .appendTo(ribbon) .animate({ 'opacity': 1 }, fadein) + this.ribbons.dom.setOffset(marker, 0, 0) // add marker to current ribbon... } else { @@ -2157,7 +2158,8 @@ var CurrentImageIndicatorActions = actions.Actions({ } } - css.left = cur[0].offsetLeft + //css.left = cur[0].offsetLeft + this.ribbons.dom.setOffset(marker, cur[0].offsetLeft, 0) marker.css(css) }], diff --git a/ui (gen4)/index.html b/ui (gen4)/index.html index 9038624f..1f5586a9 100755 --- a/ui (gen4)/index.html +++ b/ui (gen4)/index.html @@ -75,11 +75,11 @@ body { /* XXX not 100% sure about this... */ :not(.no-transitions) .current-marker:not(.no-transitions) { - -webkit-transition: left 0.1s ease-out; - -moz-transition: left 0.1s ease-out; - -ms-transition: left 0.1s ease-out; - -o-transition: left 0.1s ease-out; - transition: left 0.1s ease-out; + -webkit-transition: transform 0.1s ease-out; + -moz-transition: transform 0.1s ease-out; + -ms-transition: transform 0.1s ease-out; + -o-transition: transform 0.1s ease-out; + transition: transform 0.1s ease-out; } /* XXX should this be !important */ diff --git a/ui (gen4)/ribbons.js b/ui (gen4)/ribbons.js index 8f758434..02e4b80d 100755 --- a/ui (gen4)/ribbons.js +++ b/ui (gen4)/ribbons.js @@ -1527,7 +1527,7 @@ var RibbonsPrototype = { var dl = loaded.index(ref) - gids.indexOf(gid) if(dl != 0){ - this.dom.setOffset(r, this.dom.getOrigin(r) + dl * w) + this.dom.setOffset(r, this.dom.getOffset(r).left + dl * w) } } }