Merge "Refactor: Revert to previous ordering"

resources/skins.vector.styles/index.less

@@ -3,6 +3,7 @@
 /* Vector screen styles */
 @media screen {
 	@import 'common.less';
+	@import 'legacy/layout.less';
 	@import 'PersonalMenu.less';
 	@import 'SearchBox.less';
 	@import 'VectorTabs.less';
@@ -16,6 +17,5 @@
 	@import 'externalLinks.less';
 }
 
-@import 'legacy/layout.less';
 @import 'watchstar-ie8.less';
 @import 'print.less';

resources/skins.vector.styles/legacy.less

@@ -3,6 +3,7 @@
 /* Vector screen styles */
 @media screen {
 	@import 'common.less';
+	@import 'legacy/layout.less';
 	@import 'PersonalMenu.less';
 	@import 'SearchBox.less';
 	@import 'VectorTabs.less';
@@ -15,6 +16,5 @@
 	@import 'externalLinks.less';
 }
 
-@import 'legacy/layout.less';
 @import 'watchstar-ie8.less';
 @import 'print.less';

resources/skins.vector.styles/legacy/layout.less

@@ -3,48 +3,47 @@
 
 @import 'mediawiki.mixins.less';
 
-@media screen {
-	.mw-body,
-	#mw-data-after-content {
+.mw-body,
+#mw-data-after-content {
 	margin-left: 10em;
-	}
+}
 
-	.mw-indicators {
+.mw-indicators {
 	float: right;
 	z-index: @z-index-indicators;
-	}
+}
 
-	.mw-body-content {
+.mw-body-content {
 	position: relative;
 	z-index: @z-index-base;
-	}
+}
 
-	/* Head */
-	#mw-page-base {
+/* Head */
+#mw-page-base {
 	height: 5em;
-	}
+}
 
-	#mw-head-base {
+#mw-head-base {
 	margin-top: -5em;
 	margin-left: 10em;
 	height: 5em;
-	}
+}
 
-	/* Hide, but keep accessible for screen-readers */
-	#mw-navigation h2 {
+/* Hide, but keep accessible for screen-readers */
+#mw-navigation h2 {
 	position: absolute;
 	top: -9999px;
-	}
+}
 
-	#mw-head {
+#mw-head {
 	position: absolute;
 	top: 0;
 	right: 0;
 	width: 100%;
-	}
+}
 
-	/* Navigation Containers */
-	#left-navigation {
+/* Navigation Containers */
+#left-navigation {
 	float: left;
 	margin-left: 10em;
 	margin-top: 2.5em;
@@ -54,30 +53,29 @@
 	is still broken, but at least the nav overlaps only the page title
 	instead of half the content. */
 	margin-bottom: -2.5em;
-	}
+}
 
-	#right-navigation {
+#right-navigation {
 	float: right;
 	margin-top: 2.5em;
-	}
+}
 
-	#mw-panel {
+#mw-panel {
 	position: absolute;
 	top: 0;
 	width: 10em;
 	left: 0;
-	}
+}
 
-	#footer, /* FIXME: Remove 2 weeks after deployment. */
-	.mw-footer {
+#footer, /* FIXME: Remove 2 weeks after deployment. */
+.mw-footer {
 	margin-left: 10em;
 	margin-top: 0;
-	}
 }
 
 /* Vector screen styles for high definition displays. These rules cross the above components and are
    grouped together here only for the sake of the media query common to each. */
-@media screen and ( min-width: 982px ) {
+@media ( min-width: 982px ) {
 	.mw-body,
 	#mw-head-base,
 	#left-navigation,