Merge "[dev] Consolidate ResourceLoader LESS style files"

resources/skins.vector.styles/index.less

@@ -1,6 +1,7 @@
+@import '../../variables.less';
+
 /* Vector screen styles */
 @media screen {
-	@import '../../variables.less';
 	@import 'common.less';
 	@import 'PersonalMenu.less';
 	@import 'SearchBox.less';
@@ -45,3 +46,5 @@
 		right: 1em;
 	}
 }
+
+@import 'print.less';

resources/skins.vector.styles/print.less

@@ -1,4 +1,3 @@
-@import '../../variables.less';
 @wmui-color-base0: #000;
 
 @color-base: @wmui-color-base0;
@@ -8,7 +7,7 @@
 
 @media print {
 
-	/* These styles retain the existing typography in screen.less
+	/* These styles retain the existing typography in index.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

@@ -49,19 +49,14 @@
 				"desktop",
 				"mobile"
 			],
-			"styles": {
-				"resources/skins.vector.styles/screen.less": [],
-				"resources/skins.vector.styles/print.less": []
-			}
+			"styles": [ "resources/skins.vector.styles/index.less" ]
 		},
 		"skins.vector.styles.responsive": {
 			"targets": [
 				"desktop",
 				"mobile"
 			],
-			"styles": [
-				"resources/skins.vector.styles.responsive.less"
-			]
+			"styles": [ "resources/skins.vector.styles.responsive.less" ]
 		},
 		"skins.vector.js": {
 			"scripts": [

stories/skin.stories.js

@@ -3,7 +3,7 @@ import { htmluserlangattributes } from './utils';
 import skinTemplate from '!!raw-loader!../includes/templates/index.mustache';
 import { placeholder } from './utils';
 
-import '../resources/skins.vector.styles/screen.less';
+import '../resources/skins.vector.styles/index.less';
 import { NAVIGATION_TEMPLATE_DATA, navTemplate, NAVIGATION_TEMPLATE_PARTIALS } from './Navigation.stories.data';
 import { FOOTER_TEMPLATE_DATA, footerTemplate } from './Footer.stories.data';