Jdlrobson has uploaded a new change for review. https://gerrit.wikimedia.org/r/185850
Change subject: WIP: Fix UploadTutorial ...................................................................... WIP: Fix UploadTutorial Unbreak the rendering of the finished button/icon http://localhost:8080/wiki/Albert_Einstein#/upload-tutorial/foo TODO: * vertically center left and right arrows Change-Id: Ibeb904fc83470de7da31b7573b9c5cbec4d68361 --- M javascripts/modules/uploads/UploadTutorial.js M less/modules/tutorials.less M less/modules/uploads/UploadTutorial.less M templates/modules/uploads/UploadTutorial.hogan 4 files changed, 23 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/50/185850/1 diff --git a/javascripts/modules/uploads/UploadTutorial.js b/javascripts/modules/uploads/UploadTutorial.js index 5e7ce36..9676377 100644 --- a/javascripts/modules/uploads/UploadTutorial.js +++ b/javascripts/modules/uploads/UploadTutorial.js @@ -39,12 +39,10 @@ */ defaults: { slideLeftButton: new Icon( { - name: 'previous', - additionalClassNames: 'slider-button prev' + name: 'previous' } ).toHtmlString(), slideRightButton: new Icon( { - name: 'next', - additionalClassNames: 'slider-button next' + name: 'next' } ).toHtmlString(), inBeta: context.isBetaGroupMember(), pages: [ diff --git a/less/modules/tutorials.less b/less/modules/tutorials.less index 19003e4..db72028 100644 --- a/less/modules/tutorials.less +++ b/less/modules/tutorials.less @@ -1,6 +1,20 @@ @import "minerva.variables"; @import "minerva.mixins"; +.stable { + .content-overlay { + + .button { + // FIXME: without this the cloaked input seems to interfere making cancel button start upload + position: relative; + // use background to override gradient in other buttons + background: #fff; + color: @colorTutorial; + padding: 12px; + font-weight: bold; + } + } +} .content-overlay { position: absolute; @@ -17,16 +31,6 @@ p { line-height: 1.4; margin: 0 0 1em; - } - - .button { - // FIXME: without this the cloaked input seems to interfere making cancel button start upload - position: relative; - // use background to override gradient in other buttons - background: #fff; - color: @colorTutorial; - padding: 12px; - font-weight: bold; } .cancel.inline { diff --git a/less/modules/uploads/UploadTutorial.less b/less/modules/uploads/UploadTutorial.less index fd04ba5..935346c 100644 --- a/less/modules/uploads/UploadTutorial.less +++ b/less/modules/uploads/UploadTutorial.less @@ -19,7 +19,7 @@ &.prev { left: 0; // FIXME: Remove when mw-ui-icon in stable - &.icon { + .icon { .background-image('../images/uploads/chevronLeft.png'); } } @@ -27,7 +27,7 @@ &.next { right: 0; // FIXME: Remove when mw-ui-icon in stable - &.icon { + .icon { .background-image('../images/uploads/chevronRight.png'); } } diff --git a/templates/modules/uploads/UploadTutorial.hogan b/templates/modules/uploads/UploadTutorial.hogan index f92578a..1dbba0e 100644 --- a/templates/modules/uploads/UploadTutorial.hogan +++ b/templates/modules/uploads/UploadTutorial.hogan @@ -1,4 +1,6 @@ -{{{slideLeftButton}}} +<div class="prev slider-button"> + {{{slideLeftButton}}} +</div> <ul> {{#pages}} <li class="slide slide-image"> @@ -15,4 +17,6 @@ </li> {{/pages}} </ul> +<div class="next slider-button"> {{{slideRightButton}}} +</div> -- To view, visit https://gerrit.wikimedia.org/r/185850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb904fc83470de7da31b7573b9c5cbec4d68361 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jdlrobson <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
