Petar.petkovic has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387630 )
Change subject: Fix invite guided tour overflows
......................................................................
Fix invite guided tour overflows
- Remove hard height constraint on guided tour card, which caused
overflows when translated info is lenghty.
- Pass width of guided tour card through JS, instead of LESS !important rules.
- Limit the width of cancel and confirm buttons, which makes
buttons stay in one line.
Bug: T168413
Change-Id: Iee66e9dfdeae18df32a8cb6f9572e5fb103db86e
---
M modules/rcfilters-beta-tour.js
M modules/rcfilters-beta-tour.less
M modules/rcfilters-highlight-tour.js
M modules/rcfilters-highlight-tour.less
M modules/rcfilters-invite-tour.js
M modules/rcfilters-invite-tour.less
6 files changed, 21 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMessages
refs/changes/30/387630/1
diff --git a/modules/rcfilters-beta-tour.js b/modules/rcfilters-beta-tour.js
index e01ea6b..01b29f8 100644
--- a/modules/rcfilters-beta-tour.js
+++ b/modules/rcfilters-beta-tour.js
@@ -1,9 +1,9 @@
( function ( mw, gt ) {
var tour = new gt.TourBuilder( {
- name: 'RcFiltersBeta',
- shouldLog: true,
- isSinglePage: true
- } );
+ name: 'RcFiltersBeta',
+ shouldLog: true,
+ isSinglePage: true
+ } );
tour.firstStep( {
name: 'Welcome',
@@ -13,6 +13,7 @@
'eri-rcfilters-tour-welcome-no-ores-description',
autoFocus: true,
allowAutomaticOkay: false,
+ width: 600,
buttons: [
{
namemsg: 'eri-rcfilters-tour-welcome-button',
diff --git a/modules/rcfilters-beta-tour.less b/modules/rcfilters-beta-tour.less
index 0c0ce60..5b8d5d8 100644
--- a/modules/rcfilters-beta-tour.less
+++ b/modules/rcfilters-beta-tour.less
@@ -1,6 +1,5 @@
.mw-guidedtour-tour-RcFiltersBeta {
padding: 40px;
- width: 600px !important;
.guider_content {
background: url( images/rc-beta-tour-welcome-ltr.gif )
no-repeat;
// Ensure the background image appears on the left in LTR and
on the right in RTL
diff --git a/modules/rcfilters-highlight-tour.js
b/modules/rcfilters-highlight-tour.js
index c423f97..448c314 100644
--- a/modules/rcfilters-highlight-tour.js
+++ b/modules/rcfilters-highlight-tour.js
@@ -3,10 +3,10 @@
*/
( function ( mw, gt ) {
var tour = new gt.TourBuilder( {
- name: 'RcFiltersHighlight',
- shouldLog: true,
- isSinglePage: true
- } );
+ name: 'RcFiltersHighlight',
+ shouldLog: true,
+ isSinglePage: true
+ } );
tour.firstStep( {
name: 'Highlight',
@@ -15,6 +15,7 @@
autoFocus: true,
allowAutomaticOkay: false,
attachTo: '.mw-rcfilters-ui-filtersListWidget-hightlightButton',
+ width: 250,
position: 'right',
buttons: [
{
diff --git a/modules/rcfilters-highlight-tour.less
b/modules/rcfilters-highlight-tour.less
index 827772d..e3f1833 100644
--- a/modules/rcfilters-highlight-tour.less
+++ b/modules/rcfilters-highlight-tour.less
@@ -1,6 +1,5 @@
.mw-guidedtour-tour-RcFiltersHighlight {
padding: 40px;
- width: 250px !important;
.guider_content {
background: url( images/highlight-tour-ltr.svg ) no-repeat;
background-position-x: 50%;
diff --git a/modules/rcfilters-invite-tour.js b/modules/rcfilters-invite-tour.js
index aa8f5ed..d65c1dc 100644
--- a/modules/rcfilters-invite-tour.js
+++ b/modules/rcfilters-invite-tour.js
@@ -11,7 +11,7 @@
url =
'https://www.mediawiki.org/wiki/Special:MyLanguage/Edit_Review_Improvements/New_filters_for_edit_review',
linkLabel = mw.message(
'eri-rcfilters-tour-invite-learnmore-link-label' ).text(),
inviteDesc = new gt.WikitextDescription(
- descText + '<br />' + '[' + url + ' ' + linkLabel + ']'
+ descText + '<br />[' + url + ' ' + linkLabel + ']'
),
$attachTo = $( '#pt-betafeatures > a' );
@@ -26,6 +26,7 @@
autoFocus: true,
allowAutomaticOkay: false,
attachTo: $attachTo,
+ width: 290,
position: 'bottom',
onShow: function () {
var api = new mw.Api();
diff --git a/modules/rcfilters-invite-tour.less
b/modules/rcfilters-invite-tour.less
index 89d1b92..1a15245 100644
--- a/modules/rcfilters-invite-tour.less
+++ b/modules/rcfilters-invite-tour.less
@@ -16,14 +16,21 @@
// first step (Invite)
&#gt-RcFiltersInvite-Invite {
- width: 290px !important;
- height: 405px !important;
.guider_content {
/* @embed */
background-image: url(
images/rc-beta-tour-welcome-ltr.gif );
// Make space for the image
padding-top: 200px;
}
+
+ .guider_buttons .mw-ui-button {
+ max-width: 65%;
+ margin: 0;
+
+ &.mw-ui-quiet {
+ max-width: 30%;
+ }
+ }
}
// second step (Confirm)
--
To view, visit https://gerrit.wikimedia.org/r/387630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee66e9dfdeae18df32a8cb6f9572e5fb103db86e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic <ppetko...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
