From 24b1e7d54d348165d20781c3f2647c5bd0f19158 Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Thu, 10 Jan 2019 16:35:18 -0800
Subject: [PATCH] Hygiene: Merge skins.minerva.base.reset into
 skins.minerva.base.styles

No need for 2 modules that are both loaded on every page load
Provided consumers are loading skins.minerva.base.styles they will
continue to get the same CSS. If any consumers exist that load
skins.minerva.base.reset but not skins.minerva.base.styles they will
need to use their own css reset file
(e.g. https://meyerweb.com/eric/tools/css/reset/)

Change-Id: I599e6d5a84b311cb3bb2da197da1b688e0e6b9d4
---
 includes/skins/SkinMinerva.php                         |  1 -
 .../reset.less                                         |  0
 skin.json                                              | 10 +---------
 3 files changed, 1 insertion(+), 10 deletions(-)
 rename resources/{skins.minerva.base.reset => skins.minerva.base.styles}/reset.less (100%)

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 8d9f56a..720ab61 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1426,7 +1426,6 @@ class SkinMinerva extends SkinTemplate {
 	protected function getSkinStyles() {
 		$title = $this->getTitle();
 		$styles = [
-			'skins.minerva.base.reset',
 			'skins.minerva.base.styles',
 			'skins.minerva.content.styles',
 			'skins.minerva.content.styles.images',
diff --git a/resources/skins.minerva.base.reset/reset.less b/resources/skins.minerva.base.styles/reset.less
similarity index 100%
rename from resources/skins.minerva.base.reset/reset.less
rename to resources/skins.minerva.base.styles/reset.less
diff --git a/skin.json b/skin.json
index 6e7136f..43b27d9 100644
--- a/skin.json
+++ b/skin.json
@@ -155,21 +155,13 @@
 		"WebClientError": 18340282
 	},
 	"ResourceModules": {
-		"skins.minerva.base.reset": {
-			"targets": [
-				"mobile",
-				"desktop"
-			],
-			"styles": [
-				"resources/skins.minerva.base.reset/reset.less"
-			]
-		},
 		"skins.minerva.base.styles": {
 			"targets": [
 				"mobile",
 				"desktop"
 			],
 			"styles": [
+				"resources/skins.minerva.base.styles/reset.less",
 				"resources/skins.minerva.base.styles/ui.less",
 				"resources/skins.minerva.base.styles/pageactions.less",
 				"resources/skins.minerva.base.styles/common.less",