Merge "Fix logo/sidebar alignment on two-column mode"

resources/screen-desktop-mid.less

@@ -14,6 +14,12 @@
 	position: relative;
 }
 
+#mw-site-navigation {
+	// Force the portlet margins to apply at the top too
+	// No I don't know how to do this properly
+	padding-top: 0.01em;
+}
+
 #mw-related-navigation > div.sidebar-chunk:first-child {
 	margin-top: 0;
 }

resources/screen-desktop.less

@@ -142,6 +142,6 @@ html {
 /* Content */
 
 #mw-content-container {
-	margin-top: @fixed-header-height;
+	margin-top: @fixed-header-height + @color-height;
 	padding-bottom: 1em;
 }