Merge "WLFilters: wrap Watchlist-details in a div instead of a p"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 40913bb..4451867 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4086,7 +4086,7 @@ class EditPage {
         *   where bool indicates the checked status of the checkbox
         * @return array
         */
-       protected function getCheckboxesDefinition( $checked ) {
+       public function getCheckboxesDefinition( $checked ) {
                global $wgUser;
                $checkboxes = [];
 

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less
index bbe4528..5e1e118 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.WatchlistTopSectionWidget.less
@@ -1,7 +1,15 @@
 .mw-rcfilters-ui-watchlistTopSectionWidget {
+       &-watchlistDetails {
+               width: 100%;
+       }
+
        &-editWatchlistButton {
-               float: right;
-               margin-left: 3em;
+               vertical-align: bottom;
+
+               // actual button
+               .oo-ui-buttonWidget {
+                       margin-left: 3em;
+               }
        }
 
        &-savedLinks {