From: Volker E <volker.e@wikimedia.org>
Date: Sat, 19 Jan 2019 02:48:13 +0000 (-0800)
Subject: Replace 'TablePager' CSS class exclusively by `mw-datatable`
X-Git-Tag: 1.34.0-rc.0~2465^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=ade83aff143399fa68884491431a380858b60df4;p=lhc%2Fweb%2Fwiklou.git

Replace 'TablePager' CSS class exclusively by `mw-datatable`

`mw-datatable` has already been in use and should be the main class
for styling TablePager tables.
`mw-datatable` also includes the equivalent padding of former
`.TablePager th` & `td`, therefore removing it.

Bug: T214218
Change-Id: I2025b2ede87035e15f0280a6fe5efddec174bcca
---

diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index 71b1ad7246..d94104bda9 100644
--- a/includes/pager/TablePager.php
+++ b/includes/pager/TablePager.php
@@ -152,7 +152,7 @@ abstract class TablePager extends IndexPager {
 
 		$tableClass = $this->getTableClass();
 		$ret = Html::openElement( 'table', [
-			'class' => "mw-datatable $tableClass" ]
+			'class' => " $tableClass" ]
 		);
 		$ret .= Html::rawElement( 'thead', [], Html::rawElement( 'tr', [], "\n" . $s . "\n" ) );
 		$ret .= Html::openElement( 'tbody' ) . "\n";
@@ -266,10 +266,11 @@ abstract class TablePager extends IndexPager {
 	}
 
 	/**
+	 * TablePager relies on `mw-datatable` for styling, see T214208
 	 * @return string
 	 */
 	protected function getTableClass() {
-		return 'TablePager';
+		return 'mw-datatable';
 	}
 
 	/**
diff --git a/resources/src/mediawiki.pager.tablePager/TablePager.less b/resources/src/mediawiki.pager.tablePager/TablePager.less
index c7eae2c1c2..1cccb88a43 100644
--- a/resources/src/mediawiki.pager.tablePager/TablePager.less
+++ b/resources/src/mediawiki.pager.tablePager/TablePager.less
@@ -5,17 +5,10 @@
 
 @import 'mediawiki.mixins';
 
-.TablePager {
+// TablePager uses `.mw-datatable` and is loaded in the right order by RL
+.mw-datatable {
 	min-width: 80%;
 
-	// Remove as soon as `.mw-datatable` receives this `padding`, see T214208
-	td,
-	th {
-		padding: 0.2em 0.4em;
-	}
-}
-
-.mw-datatable {
 	&-is-sorted a {
 		background-position: left center;
 		background-repeat: no-repeat;