From c42739a200f358dd6b0bbd3dbf6cab7e110e7487 Mon Sep 17 00:00:00 2001
From: AronDemian <AronManning5@gmail.com>
Date: Fri, 8 May 2020 03:39:22 +0200
Subject: [PATCH] [legacy] Merge 'background-gradient.less' into 'layout.less'

Bug: T249073
Change-Id: Icb4ef65fbc72b5793061d97194ef4b88836c0fe2
---
 resources/skins.vector.styles/legacy.less     |  1 -
 .../legacy/background-gradient.less           | 20 -------------------
 .../skins.vector.styles/legacy/layout.less    |  8 +++++++-
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 resources/skins.vector.styles/legacy/background-gradient.less

diff --git a/resources/skins.vector.styles/legacy.less b/resources/skins.vector.styles/legacy.less
index dd66d6b..feab3a3 100644
--- a/resources/skins.vector.styles/legacy.less
+++ b/resources/skins.vector.styles/legacy.less
@@ -5,7 +5,6 @@
 
 @media screen {
 	@import 'legacy/layout.less';
-	@import 'legacy/background-gradient.less';
 	@import 'common/content.less';
 	@import 'common/typography.less';
 
diff --git a/resources/skins.vector.styles/legacy/background-gradient.less b/resources/skins.vector.styles/legacy/background-gradient.less
deleted file mode 100644
index bdbcb7a..0000000
--- a/resources/skins.vector.styles/legacy/background-gradient.less
+++ /dev/null
@@ -1,20 +0,0 @@
-// 'background-gradient.less' will be removed and its rules moved to
-// legacy/layout.less as soon as new header is in place.
-
-@import '../../../variables.less';
-
-body {
-	background-color: @background-color-secondary;
-}
-
-/* Head */
-#mw-page-base {
-	background-position: bottom left;
-	.vertical-gradient( @background-color-base, @background-color-secondary, 50%, 100% );
-}
-
-.mw-body {
-	/* Border on top, left, and bottom side */
-	border: @border-width-base @border-style-base @border-color-content;
-	border-right-width: 0;
-}
diff --git a/resources/skins.vector.styles/legacy/layout.less b/resources/skins.vector.styles/legacy/layout.less
index f1a2077..9c99bbc 100644
--- a/resources/skins.vector.styles/legacy/layout.less
+++ b/resources/skins.vector.styles/legacy/layout.less
@@ -12,6 +12,7 @@ body {
 }
 
 body {
+	background-color: @background-color-secondary;
 	overflow-y: scroll;
 }
 
@@ -30,8 +31,11 @@ body {
 }
 
 .mw-body {
-	/* Merge the border with tabs' one (in their background image) */
+	// Merge the border below with tabs' one (in their background image).
 	margin-top: -@border-width-base;
+	// Border on top, left, and bottom side.
+	border: @border-width-base @border-style-base @border-color-content;
+	border-right-width: 0;
 
 	.firstHeading {
 		/* Change the default from mediawiki.skinning CSS to let indicators float into heading area */
@@ -51,6 +55,8 @@ body {
 
 /* Head */
 #mw-page-base {
+	.vertical-gradient( @background-color-base, @background-color-secondary, 50%, 100% );
+	background-position: bottom left;
 	height: 5em;
 }