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

diff --git a/includes/pager/TablePager.php b/includes/pager/TablePager.php
index 71b1ad7..d94104b 100644 (file)
--- 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 c7eae2c..1cccb88 100644 (file)
--- 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;