Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317997
Change subject: Fix toolbar transition
......................................................................
Fix toolbar transition
The contents of the bar to should appear to move in to place, not
just be revealed.
Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
---
M modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
2 files changed, 26 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/97/317997/1
diff --git a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
index a5566f9..5c09f95 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.css
@@ -7,19 +7,31 @@
/* Toolbar */
-.ve-activating .ve-init-mw-desktopArticleTarget-toolbar,
+.ve-activated .ve-init-mw-desktopArticleTarget-toolbar,
.ve-deactivating .ve-init-mw-desktopArticleTarget-toolbar {
- overflow: hidden;
transition: height 0.4s ease; /* stylelint-disable-line
no-unsupported-browser-features */
}
-.ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar > .oo-ui-toolbar-bar {
transform: translateY( -100% );
transition: transform 0.4s ease; /* stylelint-disable-line
no-unsupported-browser-features */
+}
+
+.ve-ui-toolbar-floating > .oo-ui-toolbar-bar {
+/* transform: translateY( -100% );*/
+ /*transition: transform 0.4s ease;*/ /* stylelint-disable-line
no-unsupported-browser-features */
z-index: 4;
}
-.ve-active .ve-ui-toolbar-floating .oo-ui-toolbar-bar {
+.ve-init-mw-desktopArticleTarget-toolbar {
+ overflow: hidden;
+}
+
+.ve-init-mw-desktopArticleTarget-toolbar-opened {
+ overflow: visible;
+}
+
+.ve-init-mw-desktopArticleTarget-toolbar-open > .oo-ui-toolbar-bar {
transform: translateY( 0 );
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index 39304d5..1814222 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -248,11 +248,14 @@
ve.track( 'trace.setupToolbar.exit' );
if ( !wasSetup ) {
setTimeout( function () {
- var height = toolbar.$bar.outerHeight();
- toolbar.$element.css( 'height', height );
+ toolbar.$element
+ .css( 'height', toolbar.$bar.outerHeight() )
+ .addClass(
've-init-mw-desktopArticleTarget-toolbar-open' );
setTimeout( function () {
// Clear to allow growth during use and when
resizing window
- toolbar.$element.css( 'height', '' );
+ toolbar.$element
+ .css( 'height', '' )
+ .addClass(
've-init-mw-desktopArticleTarget-toolbar-opened' );
target.toolbarSetupDeferred.resolve();
}, 400 );
} );
@@ -1153,7 +1156,10 @@
deferred = $.Deferred();
this.toolbar.$element.css( 'height', this.toolbar.$bar.outerHeight() );
setTimeout( function () {
- target.toolbar.$element.css( 'height', '0' );
+ target.toolbar.$element
+ .css( 'height', '0' )
+ .removeClass(
've-init-mw-desktopArticleTarget-toolbar-open' )
+ .removeClass(
've-init-mw-desktopArticleTarget-toolbar-opened' );
setTimeout( function () {
target.toolbar.destroy();
target.toolbar = null;
--
To view, visit https://gerrit.wikimedia.org/r/317997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01a85e3455462cf70b6c3f25a236ab6cb82c706c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
