jenkins-bot has submitted this change and it was merged.
Change subject: Special:Contributions: Use mediawiki.ui
......................................................................
Special:Contributions: Use mediawiki.ui
* Use 'mw-ui-input-inline' for tagfilter input
* Use 'mw-ui-input-inline' for IP/Username
* Use 'mw-ui-progressive' for Search button
* Vertically align the select dropdown
Bug: 71137
Change-Id: I20b0ebeb194ce0505abede6fb3bdd69b28350f04
---
M includes/ChangeTags.php
M includes/specials/SpecialContributions.php
M resources/src/mediawiki.special/mediawiki.special.css
3 files changed, 17 insertions(+), 16 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 94b7b7a..a3c2360 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -265,7 +265,7 @@
'tagfilter',
20,
$selected,
- array( 'class' => 'mw-tagfilter-input', 'id' =>
'tagfilter' )
+ array( 'class' => 'mw-tagfilter-input
mw-ui-input mw-ui-input-inline', 'id' => 'tagfilter' )
)
);
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 32a887c..4b4f545 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -478,13 +478,8 @@
if ( $tagFilter ) {
$filterSelection = Html::rawElement(
'td',
- array( 'class' => 'mw-label' ),
- array_shift( $tagFilter )
- );
- $filterSelection .= Html::rawElement(
- 'td',
- array( 'class' => 'mw-input' ),
- implode( ' ', $tagFilter )
+ array(),
+ array_shift( $tagFilter ) . implode( ' ',
$tagFilter )
);
} else {
$filterSelection = Html::rawElement( 'td', array(
'colspan' => 2 ), '' );
@@ -510,7 +505,7 @@
'target',
$this->opts['target'],
'text',
- array( 'size' => '40', 'required' => '', 'class' =>
'mw-input' ) +
+ array( 'size' => '40', 'required' => '', 'class' =>
'mw-input mw-ui-input-inline' ) +
( $this->opts['target'] ? array() : array(
'autofocus' )
)
);
@@ -522,16 +517,12 @@
$namespaceSelection = Xml::tags(
'td',
- array( 'class' => 'mw-label' ),
+ array(),
Xml::label(
$this->msg( 'namespace' )->text(),
'namespace',
''
- )
- );
- $namespaceSelection .= Html::rawElement(
- 'td',
- null,
+ ) .
Html::namespaceSelector(
array( 'selected' => $this->opts['namespace'],
'all' => '' ),
array(
@@ -612,6 +603,11 @@
$deletedOnlyCheck . $checkLabelTopOnly .
$checkLabelNewOnly
);
+ $className = 'mw-submit';
+ if ( $this->getConfig( 'UseMediaWikiUIEverywhere') ) {
+ $className .= ' mw-ui-button mw-ui-progressive';
+ }
+
$dateSelectionAndSubmit = Xml::tags( 'td', array( 'colspan' =>
2 ),
Xml::dateMenu(
$this->opts['year'] === '' ?
MWTimestamp::getInstance()->format( 'Y' ) : $this->opts['year'],
@@ -619,7 +615,7 @@
) . ' ' .
Xml::submitButton(
$this->msg( 'sp-contributions-submit'
)->text(),
- array( 'class' => 'mw-submit' )
+ array( 'class' => $className )
)
);
diff --git a/resources/src/mediawiki.special/mediawiki.special.css
b/resources/src/mediawiki.special/mediawiki.special.css
index 0356fc7..d245726 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -118,3 +118,8 @@
table.mw-userrights-groups * th {
padding-right: 1.5em;
}
+
+/* Special:Contributions */
+.mw-contributions-form select {
+ vertical-align: middle;
+}
--
To view, visit https://gerrit.wikimedia.org/r/162121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20b0ebeb194ce0505abede6fb3bdd69b28350f04
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Prtksxna <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
