Merge "Make afterContent stuff appear correctly after content in all view modes"

includes/TimelessTemplate.php

@@ -75,9 +75,9 @@ class TimelessTemplate extends BaseTemplate {
 								$this->getClear()
 							)
 						)
-					)
+					) .
+					$this->getAfterContent()
 				) .
-				$this->getAfterContent() .
 				Html::rawElement( 'div', [ 'id' => 'mw-site-navigation' ],
 					$this->getLogo( 'p-logo', 'image' ) .
 					$this->getMainNavigation() .

resources/screen-desktop-mid.less

@@ -21,7 +21,8 @@
 	margin-left: -@column-left-size;
 	width: 100%;
 }
-#mw-content {
+#mw-content,
+#content-bottom-stuff {
 	margin-left: @column-left-size;
 }