Merge "Use more common 250ms transition for toolbar instead of 400ms"

This commit is contained in:
jenkins-bot 2017-10-19 17:40:36 +00:00 committed by Gerrit Code Review
commit 600208453b
2 changed files with 4 additions and 4 deletions

View file

@ -9,12 +9,12 @@
.ve-init-mw-desktopArticleTarget-toolbar {
overflow: hidden;
transition: height 0.4s ease;
transition: height 250ms ease;
}
.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
transform: translateY( -100% );
transition: transform 0.4s ease;
transition: transform 250ms ease;
}
.ve-init-mw-desktopArticleTarget-toolbar-opened {

View file

@ -256,7 +256,7 @@ ve.init.mw.DesktopArticleTarget.prototype.setupToolbar = function ( surface ) {
.css( 'height', '' )
.addClass( 've-init-mw-desktopArticleTarget-toolbar-opened' );
target.toolbarSetupDeferred.resolve();
}, 400 );
}, 250 );
} );
this.toolbarSetupDeferred.done( function () {
@ -1151,7 +1151,7 @@ ve.init.mw.DesktopArticleTarget.prototype.teardownToolbar = function () {
// Parent method
ve.init.mw.DesktopArticleTarget.super.prototype.teardownToolbar.call( target );
deferred.resolve();
}, 400 );
}, 250 );
} );
return deferred.promise();
};