From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 8 Feb 2018 00:35:40 +0000 (+0000)
Subject: Merge "Revert legend when results are grouped"
X-Git-Tag: 1.31.0-rc.0~668
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=b7237a9d7e0f72c35860187af05aca680ed5ba58;hp=50457372ff6fef64374cee03e61e75d5b0fdd5aa

Merge "Revert legend when results are grouped"
---

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 282d764239..cf990c2839 100644
--- 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 c379e2702a..e9e331b171 100644
--- 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 44adbf3dc9..65860ea08c 100644
--- 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;
-}