jenkins-bot has submitted this change and it was merged.
Change subject: Use MediaWiki UI buttons in alpha
......................................................................
Use MediaWiki UI buttons in alpha
* Kill meaningless $wgMFMobileSpecialPageResourceStyleBoilerplate -
styles in head are always loaded before.
Change-Id: I3600c76ca4ea414cfda2e41410766fefd0b4d14f
---
M includes/Resources.php
M includes/skins/MinervaTemplate.php
M includes/skins/SkinMinerva.php
M includes/skins/SkinMinervaAlpha.php
M includes/skins/SkinMinervaBeta.php
M includes/skins/UserAccountCreateMobileTemplate.php
M includes/skins/UserLoginMobileTemplate.php
M includes/specials/SpecialMobileOptions.php
M includes/specials/SpecialMobileWatchlist.php
M includes/specials/SpecialUserProfile.php
M javascripts/modules/uploads/PhotoUploaderButton.js
M less/common/buttons.less
M less/common/ui.less
M less/common/uiNew.less
M templates/ctaDrawer.html
M templates/keepgoing/KeepGoingDrawer.html
M templates/overlays/talk.html
M templates/talkSection.html
18 files changed, 96 insertions(+), 31 deletions(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index cffe597..7b47baa 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -53,13 +53,6 @@
$wgMFMobileSpecialPageResourceScriptBoilerplate =
$wgMFMobileSpecialPageResourceBoilerplate + array(
'dependencies' => array( 'mobile.stable' ),
);
-/**
- * A boilerplate for RL style modules for special pages
-*/
-$wgMFMobileSpecialPageResourceStyleBoilerplate =
$wgMFMobileSpecialPageResourceBoilerplate + array(
- // ensure special css is always loaded after mobile.styles for
cascading purposes (keep jgonera happy)
- 'dependencies' => array( 'mobile.styles' ),
-);
$wgResourceModules = array_merge( $wgResourceModules, array(
// FIXME: Upstream to core
@@ -116,15 +109,16 @@
'position' => 'top',
),
+ // FIXME: Kill module when no longer in cache.
'mobile.styles' => $wgMFMobileResourceBoilerplate + array(
'styles' => array(
'less/common/reset.less',
'less/common/common.less',
+ 'less/common/buttons.less',
'less/common/ui.less',
'less/common/typography.less',
'less/common/footer.less',
'less/modules/toggle.less',
- 'less/common/drawer.less',
'less/common/hacks.less',
'less/common/pageactions.less',
),
@@ -160,6 +154,39 @@
'dependencies' => array(
'mobile.toc',
),
+ ),
+
+ // FIXME: Remove in favour of mediawiki ui
+ 'skins.minerva.buttons.styles' => $wgMFMobileResourceBoilerplate +
array(
+ 'styles' => array(
+ 'less/common/buttons.less',
+ ),
+ ),
+
+ 'skins.minerva.chrome.styles' => $wgMFMobileResourceBoilerplate + array(
+ 'styles' => array(
+ 'less/common/reset.less',
+ 'less/common/ui.less',
+ 'less/common/pageactions.less',
+ 'less/common/footer.less',
+ ),
+ 'position' => 'top',
+ ),
+
+ 'skins.minerva.content.styles' => $wgMFMobileResourceBoilerplate +
array(
+ 'styles' => array(
+ 'less/common/common.less',
+ 'less/common/typography.less',
+ 'less/modules/toggle.less',
+ ),
+ 'position' => 'top',
+ ),
+
+ 'skins.minerva.drawers.styles' => $wgMFMobileResourceBoilerplate +
array(
+ 'styles' => array(
+ 'less/common/drawer.less',
+ ),
+ 'position' => 'top',
),
'mobile.styles.beta' => $wgMFMobileResourceBoilerplate + array(
@@ -896,7 +923,7 @@
),
),
- 'mobile.mobilemenu.styles' =>
$wgMFMobileSpecialPageResourceStyleBoilerplate + array(
+ 'mobile.mobilemenu.styles' => $wgMFMobileSpecialPageResourceBoilerplate
+ array(
'styles' => array(
'less/specials/mobilemenu.less',
),
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 894c278..8c3830b 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -239,7 +239,7 @@
<form action="<?php
echo $data['wgScript'] ?>" class="search-box">
<?php
echo
$this->makeSearchInput( $data['searchBox'] );
- echo
$this->makeSearchButton( 'go', array( 'class' => 'searchSubmit' ) );
+ echo
$this->makeSearchButton( 'go', array( 'class' => 'searchSubmit mw-ui-button
mw-ui-progressive' ) );
?>
</form>
<?php
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index a612617..3ca12a7 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -693,7 +693,12 @@
protected function getSkinStyles() {
return array(
- 'mobile.styles',
+ 'skins.minerva.chrome.styles',
+ 'skins.minerva.buttons.styles',
+ 'skins.minerva.content.styles',
+ 'skins.minerva.drawers.styles',
+ // FIXME: Rename to use skins.minerva prefix - don't
break cache in process
+ 'mobile.styles.page',
'mobile.pagelist.styles',
);
}
diff --git a/includes/skins/SkinMinervaAlpha.php
b/includes/skins/SkinMinervaAlpha.php
index 92ea8ee..e49a8b5 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -14,6 +14,16 @@
return $modules;
}
+ protected function getSkinStyles() {
+ // This replaces MobileFrontend's button styles with MediaWiki
UI button styles
+ // MediaWiki UI is in core so to be consistent with desktop
these are preferable to use
+ $styles = parent::getSkinStyles();
+ $key = array_search( 'skins.minerva.buttons.styles', $styles );
+ unset( $styles[$key] );
+ $styles[] = 'mediawiki.ui.button';
+ return $styles;
+ }
+
protected function prepareQuickTemplate() {
$tpl = parent::prepareQuickTemplate();
$this->prepareTalkLabel( $tpl );
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index ba65489..4b0ebba 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -132,7 +132,7 @@
$this->msg(
'mobile-frontend-mainpage-cta-prompt' )->text() ) .
Html::openElement( 'p', array( 'class' =>
'content component' ) ) .
Html::element( 'a', array(
- 'class' => 'button',
+ 'class' => 'mw-ui-button
mw-ui-progressive button',
'href' => $title->getLocalUrl(
array( 'campaign' =>
'mobile-mainpage-keepgoing-links' )
),
diff --git a/includes/skins/UserAccountCreateMobileTemplate.php
b/includes/skins/UserAccountCreateMobileTemplate.php
index d80f8fc..2e812cc 100644
--- a/includes/skins/UserAccountCreateMobileTemplate.php
+++ b/includes/skins/UserAccountCreateMobileTemplate.php
@@ -67,6 +67,7 @@
$captcha .
Html::input( 'wpCreateaccount', wfMessage(
'mobile-frontend-account-create-submit' )->text(), 'submit',
array( 'id' => 'wpCreateaccount',
+ 'class' => 'mw-ui-button
mw-ui-constructive',
'tabindex' => '6' ) ) .
Html::input( 'wpRemember', '1', 'hidden' ) .
Html::input( 'wpCreateaccountToken', $token, 'hidden' )
.
diff --git a/includes/skins/UserLoginMobileTemplate.php
b/includes/skins/UserLoginMobileTemplate.php
index 0cf1b63..b43d1c10 100644
--- a/includes/skins/UserLoginMobileTemplate.php
+++ b/includes/skins/UserLoginMobileTemplate.php
@@ -77,6 +77,7 @@
Html::input( 'wpRemember', '1', 'hidden' ) .
Html::input( 'wpLoginAttempt', wfMessage(
'mobile-frontend-login' )->text(), 'submit',
array( 'id' => 'wpLoginAttempt',
+ 'class' => 'mw-ui-button
mw-ui-constructive',
'tabindex' => '3' ) ) .
$signupLink .
Html::input( 'wpLoginToken', $token, 'hidden' ) .
diff --git a/includes/specials/SpecialMobileOptions.php
b/includes/specials/SpecialMobileOptions.php
index 267115a..8b2ffd7 100644
--- a/includes/specials/SpecialMobileOptions.php
+++ b/includes/specials/SpecialMobileOptions.php
@@ -138,7 +138,7 @@
{$betaSetting}
{$alphaSetting}
<li>
- <input type="submit" id="mw-mf-settings-save"
value="{$saveSettings}">
+ <input type="submit" class="mw-ui-progressive
mw-ui-button" id="mw-mf-settings-save" value="{$saveSettings}">
</li>
</ul>
$token
diff --git a/includes/specials/SpecialMobileWatchlist.php
b/includes/specials/SpecialMobileWatchlist.php
index 64a6693..4976149 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -145,13 +145,17 @@
$view = $user->getOption(
SpecialMobileWatchlist::VIEW_OPTION_NAME, 'a-z' );
$filter = $user->getOption(
SpecialMobileWatchlist::FILTER_OPTION_NAME, 'all' );
if ( $view === 'feed' ) {
- $attrsFeed[ 'class' ] = 'active';
+ $attrsList[ 'class' ] = 'mw-ui-button';
+ // FIXME [MediaWiki UI] This probably be described as a
different type of mediawiki ui element
+ $attrsFeed[ 'class' ] = 'active mw-ui-progressive
mw-ui-button';
} else {
- $attrsList[ 'class' ] = 'active';
+ $attrsFeed[ 'class' ] = 'mw-ui-button';
+ // FIXME [MediaWiki UI] This probably be described as a
different type of mediawiki ui element
+ $attrsList[ 'class' ] = 'active mw-ui-progressive
mw-ui-button';
}
$html =
- Html::openElement( 'ul', array( 'class' => 'button-bar' ) ) .
+ Html::openElement( 'ul', array( 'class' => 'button-bar
mw-ui-button-group' ) ) .
Html::openElement( 'li', $attrsList ) .
Linker::link( $sp,
wfMessage( 'mobile-frontend-watchlist-a-z'
)->text(),
diff --git a/includes/specials/SpecialUserProfile.php
b/includes/specials/SpecialUserProfile.php
index ccc81da..34271d2 100644
--- a/includes/specials/SpecialUserProfile.php
+++ b/includes/specials/SpecialUserProfile.php
@@ -169,7 +169,7 @@
protected function getTalkLink() {
// replace secondary icon
$attrs = array(
- 'class' => 'talk button',
+ 'class' => 'talk button mw-ui-button',
'href' =>
$this->targetUser->getTalkPage()->getLocalUrl(),
);
// FIXME: What if this is the user's own profile? Should we
change the message?
diff --git a/javascripts/modules/uploads/PhotoUploaderButton.js
b/javascripts/modules/uploads/PhotoUploaderButton.js
index 02d2e5d..63f26d2 100644
--- a/javascripts/modules/uploads/PhotoUploaderButton.js
+++ b/javascripts/modules/uploads/PhotoUploaderButton.js
@@ -74,7 +74,7 @@
*/
PhotoUploaderButton = View.extend( {
template: M.template.get( 'uploads/PhotoUploaderButton' ),
- className: 'button photo',
+ className: 'mw-ui-progressive mw-ui-button button photo',
postRender: function() {
var self = this, $input = this.$( 'input' );
diff --git a/less/common/buttons.less b/less/common/buttons.less
index e6310ef..9dfe602 100644
--- a/less/common/buttons.less
+++ b/less/common/buttons.less
@@ -1,5 +1,7 @@
-// Component of ui.less
-// FIXME: Move to components/
+// FIXME: Deprecate this in favour of mediawiki.ui
+@import "mediawiki.mixins.less";
+@import "minerva.variables.less";
+@import "minerva.mixins.less";
// Buttons
//
diff --git a/less/common/ui.less b/less/common/ui.less
index f4aa9a4..1d802c6 100644
--- a/less/common/ui.less
+++ b/less/common/ui.less
@@ -1,8 +1,8 @@
@import "minerva.variables";
@import "minerva.mixins";
@import "mediawiki.mixins";
-// FIXME: Separate these two imported folders into a components directory
-@import "buttons";
+
+// FIXME: Separate imported folders into a components directory
@import 'mainmenu';
html,
@@ -204,4 +204,3 @@
-webkit-text-overflow: ellipsis;
text-overflow: ellipsis;
}
-
diff --git a/less/common/uiNew.less b/less/common/uiNew.less
index 8f5a622..2adcc36 100644
--- a/less/common/uiNew.less
+++ b/less/common/uiNew.less
@@ -25,3 +25,19 @@
}
}
}
+
+// FIXME [mediawiki ui] These rules should not be needed and are specifically
for Watchlist and
+// the CTADrawer
+.mw-ui-button-group {
+ text-align: center;
+ a {
+ color: inherit;
+ text-decoration: none;
+ }
+ * {
+ float: none !important;
+ }
+ .mw-ui-block {
+ width: auto;
+ }
+}
diff --git a/templates/ctaDrawer.html b/templates/ctaDrawer.html
index cabed04..3164d7a 100644
--- a/templates/ctaDrawer.html
+++ b/templates/ctaDrawer.html
@@ -1,6 +1,6 @@
<a class="close" href="#">{{cancelMessage}}</a>
<p>{{content}}</p>
-<div class="buttonBar">
- <a class="button wide" href="{{loginUrl}}">{{loginCaption}}</a>
- <a class="signup" href="{{signupUrl}}">{{signupCaption}}</a>
+<div class="buttonBar mw-ui-button-group">
+ <a class="button wide mw-ui-button mw-ui-block mw-ui-progressive"
href="{{loginUrl}}">{{loginCaption}}</a>
+ <a class="signup mw-ui-progressive mw-ui-quiet mw-ui-block"
href="{{signupUrl}}">{{signupCaption}}</a>
</div>
diff --git a/templates/keepgoing/KeepGoingDrawer.html
b/templates/keepgoing/KeepGoingDrawer.html
index 96e8cc7..4bfd35b 100644
--- a/templates/keepgoing/KeepGoingDrawer.html
+++ b/templates/keepgoing/KeepGoingDrawer.html
@@ -1,5 +1,5 @@
<p>{{msg}}</p>
<div class="buttonBar">
- <button class="inline close">{{cancel}}</button>
- <a class="continue button" href="{{nextUrl}}">{{{nextLabel}}}</a>
+ <button class="inline close mw-ui-button mw-ui-progressive
mw-ui-quiet">{{cancel}}</button>
+ <a class="continue button mw-ui-button mw-ui-progressive"
href="{{nextUrl}}">{{{nextLabel}}}</a>
</div>
diff --git a/templates/overlays/talk.html b/templates/overlays/talk.html
index 470e569..854dc4b 100644
--- a/templates/overlays/talk.html
+++ b/templates/overlays/talk.html
@@ -1,5 +1,5 @@
<p class="content-header">{{explanation}}<br>
- <button class="add">{{addTopicLabel}}</button>
+ <button class="add mw-ui-button
mw-ui-progressive">{{addTopicLabel}}</button>
</p>
<ul class="page-list actionable">
<li class="lead-discussion">
diff --git a/templates/talkSection.html b/templates/talkSection.html
index 0e7e460..9657167 100644
--- a/templates/talkSection.html
+++ b/templates/talkSection.html
@@ -9,7 +9,7 @@
<em>{{info}}</em>
<em>{{{licenseMsg}}}</em>
</p>
- <textarea></textarea>
- <button>{{confirmMsg}}</button>
+ <textarea class="wikitext-editor"></textarea>
+ <button class="mw-ui-button mw-ui-constructive
mw-ui-block">{{confirmMsg}}</button>
</div>
</div>
--
To view, visit https://gerrit.wikimedia.org/r/102581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3600c76ca4ea414cfda2e41410766fefd0b4d14f
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
