Merge "RCFilters: Actually toggle the collapsed class for toplinks"

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 8dfae97..7e2a67d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -24,6 +24,8 @@
 
        .mw-recentchanges-toplinks {
                margin-bottom: 0.5em;
+               padding: 0 0.5em 0.5em 0.5em;
+               border: 1px solid transparent;
 
                &:not( .mw-recentchanges-toplinks-collapsed ) {
                        // Same as the legend

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less
index 6f3cdfe..8e30937 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.RcTopSectionWidget.less
@@ -14,10 +14,4 @@
                vertical-align: bottom;
                padding-left: 1em;
        }
-
-       .mw-recentchanges-toplinks {
-               .oo-ui-widget-enabled.oo-ui-buttonElement.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button {
-                       padding: 0 2.5em 0 0.5em;
-               }
-       }
 }

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
index 2c99d3d..fce1cb7 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.RcTopSectionWidget.js
@@ -108,5 +108,6 @@
                } else {
                        this.$tableTopLinks.append( this.$topLinks );
                }
+               this.$topLinks.toggleClass( 'mw-recentchanges-toplinks-collapsed', state === 'collapsed' );
        };
 }( mediaWiki ) );