Merge "Revert legend when results are grouped"

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 282d764..cf990c2 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -1625,13 +1625,9 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                # Collapsible
                $collapsedState = $this->getRequest()->getCookie( 'changeslist-state' );
                $collapsedClass = $collapsedState === 'collapsed' ? ' mw-collapsed' : '';
-               # Enhanced mode
-               $enhancedMode = $this->getRequest()->getBool( 'enhanced', $user->getOption( 'usenewrc' ) );
-               $enhancedClass = $enhancedMode ? ' mw-enhanced' : '';
 
-               $legendClasses = $collapsedClass . $enhancedClass;
                $legend =
-                       '<div class="mw-changeslist-legend mw-collapsible' . $legendClasses . '">' .
+                       '<div class="mw-changeslist-legend mw-collapsible' . $collapsedClass . '">' .
                                $legendHeading .
                                '<div class="mw-collapsible-content">' . $legend . '</div>' .
                        '</div>';

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
index c379e27..e9e331b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
@@ -55,24 +55,10 @@
                }
        }
 
-       &-enhancedView {
-               .mw-changeslist-legend {
-                       z-index: 1;
-
-                       &:not( .mw-collapsed ) {
-                               .box-shadow( 0 1px 1px rgba( 0, 0, 0, 0.15 ) );
-                       }
-               }
-       }
-
        .mw-changeslist-legend {
                background-color: @background-color-base;
+               position: relative; // We want to keep the legend accessible when results are overlaid
                border: 1px solid @colorGray12;
-
-               &:not( .mw-enhanced ) {
-                       // We want to keep the legend accessible when results are overlaid
-                       position: relative;
-               }
        }
 
        .mw-changeslist-overlay {

diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
index 44adbf3..65860ea 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.css
+++ b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
@@ -46,17 +46,11 @@
 }
 
 .mw-changeslist-legend.mw-collapsed {
-       margin: 0;
+       margin-bottom: 0;
 }
 
-/* Prevent pushing down of content if legend is initially collapsed */
-.mw-changeslist-legend.mw-collapsed ~ ul:first-of-type > li:first-child {
+/* Prevent pushing down the content if legend is collapsed */
+.mw-changeslist-legend.mw-collapsed ~ ul:first-of-type > li:first-child,
+.mw-changeslist-legend.mw-collapsed + h4 + div > table.mw-changeslist-line:first-child {
        clear: right;
 }
-
-/* Absolute positioning to avoid table overlap with floating elements */
-.mw-changeslist > .mw-changeslist-legend.mw-enhanced {
-       background-color: #fff;
-       position: absolute;
-       right: 0;
-}