Merge "Naming convention using 'skin' as entrance point"

includes/VectorTemplate.php

@@ -76,7 +76,7 @@ class VectorTemplate extends BaseTemplate {
 
 		$this->templateParser = $templateParser;
 		$this->isLegacy = $isLegacy;
-		$this->templateRoot = $isLegacy ? 'legacy' : 'index';
+		$this->templateRoot = $isLegacy ? 'skin-legacy' : 'skin';
 	}
 
 	/**

resources/skins.vector.styles/common/print.less

@@ -6,7 +6,7 @@
 	@border-color-base: @wmui-color-base0;
 	@border-color-footer: #eee;
 
-	/* These styles retain the existing typography in index.less
+	/* These styles retain the existing typography in skin.less
 	In future (when deploying these styles) we may want to refactor skins.vector.styles
 	to apply certain styles in print as well as screen mode. */
 	.toc,

skin.json

@@ -47,7 +47,7 @@
 				"desktop",
 				"mobile"
 			],
-			"styles": [ "resources/skins.vector.styles/legacy.less" ]
+			"styles": [ "resources/skins.vector.styles/skin-legacy.less" ]
 		},
 		"skins.vector.styles": {
 			"class": "ResourceLoaderSkinModule",
@@ -56,7 +56,7 @@
 				"desktop",
 				"mobile"
 			],
-			"styles": [ "resources/skins.vector.styles/index.less" ]
+			"styles": [ "resources/skins.vector.styles/skin.less" ]
 		},
 		"skins.vector.icons": {
 			"class": "ResourceLoaderImageModule",
@@ -76,7 +76,7 @@
 		},
 		"skins.vector.js": {
 			"packageFiles": [
-				"resources/skins.vector.js/index.js",
+				"resources/skins.vector.js/skin.js",
 				"resources/skins.vector.legacy.js/collapsibleTabs.js",
 				"resources/skins.vector.legacy.js/vector.js"
 			],
@@ -87,7 +87,7 @@
 		},
 		"skins.vector.legacy.js": {
 			"packageFiles": [
-				"resources/skins.vector.legacy.js/index.js",
+				"resources/skins.vector.legacy.js/skin-legacy.js",
 				"resources/skins.vector.legacy.js/collapsibleTabs.js",
 				"resources/skins.vector.legacy.js/vector.js"
 			],

stories/legacy.stories.js

@@ -1,6 +1,6 @@
 import mustache from 'mustache';
-import '../resources/skins.vector.styles/legacy.less';
-import legacySkinTemplate from '!!raw-loader!../includes/templates/legacy.mustache';
+import '../resources/skins.vector.styles/skin-legacy.less';
+import legacySkinTemplate from '!!raw-loader!../includes/templates/skin-legacy.mustache';
 import {
 	LEGACY_TEMPLATE_DATA,
 	NAVIGATION_TEMPLATE_DATA,