Skip to content

Commit 8aaf11a

Browse files
committed
Merge pull request #25 from adaptlearning/issue/#24
Issue/#24
2 parents 1a390eb + 8468fe2 commit 8aaf11a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

js/adapt-contrib-tutor.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,16 @@ define(function(require) {
4949
'top':0,
5050
'overflow-y': 'scroll',
5151
'-webkit-overflow-scrolling': 'touch'
52-
}).animate({opacity:1});
52+
});
5353
} else {
5454
if (noAnimation) {
5555
var animationSpeed = 0;
5656
}
57-
this.$('.tutor').css({'margin-top': -(tutorHeight/2)-50, 'opacity': 0}).animate({'margin-top': -(tutorHeight/2), 'opacity':1}, animationSpeed);
57+
this.$('.tutor').css({
58+
'margin-top': -(tutorHeight/2)-50, 'opacity': 0
59+
}).velocity({
60+
'margin-top': -(tutorHeight/2), 'opacity':1
61+
}, animationSpeed);
5862
}
5963
},
6064

less/tutor.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
color: @inverted-foreground-color;
99
z-index: 550;
1010
opacity:0;
11-
display:none;
1211
.ie8 & {
1312
left:0px;
1413
}

0 commit comments

Comments
 (0)