From 38d20327f4c142646c3c111547bfaf7633f2d382 Mon Sep 17 00:00:00 2001
From: Joseph Seddon <jseddon@wikimedia.org>
Date: Wed, 17 Aug 2022 08:14:23 +0100
Subject: [PATCH] WIP Special:Search dyk messaging and padding tweaks.

Bug: T315323
Change-Id: Ic701fdbd43816b84a7803eae305c9adc336dd256
---
 .../search/searchwidgets/DidYouMeanWidget.php |  9 +----
 .../src/mediawiki.special.search.styles.less  | 34 +++++++++++++++----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/includes/search/searchwidgets/DidYouMeanWidget.php b/includes/search/searchwidgets/DidYouMeanWidget.php
index 0bb2d2cd932..9dd4e1f6683 100644
--- a/includes/search/searchwidgets/DidYouMeanWidget.php
+++ b/includes/search/searchwidgets/DidYouMeanWidget.php
@@ -75,14 +75,7 @@ class DidYouMeanWidget {
 			$stParams
 		);
 
-		$stParams['search'] = $term;
-		$stParams['runsuggestion'] = 0;
-		$original = $linkRenderer->makeKnownLink(
-			$this->specialSearch->getPageTitle(),
-			$term,
-			[ 'id' => 'mw-search-DYM-original' ],
-			$stParams
-		);
+		$original = $term;
 
 		return $this->specialSearch->msg( 'search-rewritten' )
 			->rawParams( $rewritten, $original )
diff --git a/resources/src/mediawiki.special.search.styles.less b/resources/src/mediawiki.special.search.styles.less
index 55c772917d8..e36e93c80d1 100644
--- a/resources/src/mediawiki.special.search.styles.less
+++ b/resources/src/mediawiki.special.search.styles.less
@@ -3,17 +3,34 @@
 @import 'mediawiki.ui/variables.less';
 
 /* stylelint-disable selector-class-pattern */
-.searchresults {
-	margin: 1em 0 1em 0;
-}
+#mw-content-text {
+	.searchresults {
+		margin-bottom: 1em;
+	}
 
-.searchresults .mw-search-exists {
-	margin-bottom: 32px;
+	.mw-search-nonefound,
+	.mw-search-exists,
+	.mw-search-createlink,
+	.searchdidyoumean {
+		margin-top: 24px;
+		margin-bottom: 0;
+		float: none;
+	}
+
+	// If more than one message is present at the same time, reduce margin in between
+	.searchdidyoumean + .searchresults .mw-search-createlink,
+	.mw-search-nonefound + .mw-search-createlink {
+		margin-top: 12px;
+	}
+
+	// Default top margin for the search result
+	.mw-search-results {
+		margin-top: 32px;
+	}
 }
 
 /* needs extra specificity to override `.mw-body p` selector */
 .mw-body .mw-search-nonefound {
-	margin: 1.5em 0 0.5em 0;
 	font-size: 1.2em;
 }
 
@@ -21,6 +38,10 @@
 	font-weight: bold;
 }
 
+.mw-search-form-wrapper {
+	margin-bottom: 24px;
+}
+
 .mw-search-results {
 	margin: 0;
 
@@ -221,6 +242,7 @@
 .searchdidyoumean {
 	font-size: 114%;
 	margin-top: 0.8em;
+	margin-bottom: 0.8em;
 
 	em {
 		font-style: normal;