Merge "Create wrapper for all junk below firstHeading, including nav stuff"

includes/TimelessTemplate.php

@@ -126,33 +126,35 @@ class TimelessTemplate extends BaseTemplate {
 				],
 				$this->get( 'title' )
 			) .
-			Html::rawElement( 'div', [ 'id' => 'siteSub' ], $this->getMsg( 'tagline' )->parse() ) .
-			Html::rawElement( 'div', [ 'id' => 'mw-page-header-links' ],
-				$this->getPortlet(
-					'namespaces',
-					$this->pileOfTools['namespaces'],
-					'timeless-namespaces',
-					[ 'extra-classes' => 'tools-inline' ]
-				) .
-				$this->getPortlet(
-					'more',
-					$this->pileOfTools['more'],
-					'timeless-more',
-					[ 'extra-classes' => 'tools-inline' ]
+			Html::rawElement( 'div', [ 'id' => 'bodyContentOuter' ],
+				Html::rawElement( 'div', [ 'id' => 'siteSub' ], $this->getMsg( 'tagline' )->parse() ) .
+				Html::rawElement( 'div', [ 'id' => 'mw-page-header-links' ],
+					$this->getPortlet(
+						'namespaces',
+						$this->pileOfTools['namespaces'],
+						'timeless-namespaces',
+						[ 'extra-classes' => 'tools-inline' ]
+					) .
+					$this->getPortlet(
+						'more',
+						$this->pileOfTools['more'],
+						'timeless-more',
+						[ 'extra-classes' => 'tools-inline' ]
+					) .
+					$this->getVariants() .
+					$this->getPortlet(
+						'views',
+						$this->pileOfTools['page-primary'],
+						'timeless-pagetools',
+						[ 'extra-classes' => 'tools-inline' ]
+					)
 				) .
-				$this->getVariants() .
-				$this->getPortlet(
-					'views',
-					$this->pileOfTools['page-primary'],
-					'timeless-pagetools',
-					[ 'extra-classes' => 'tools-inline' ]
+				$this->getClear() .
+				Html::rawElement( 'div', [ 'class' => 'mw-body-content', 'id' => 'bodyContent' ],
+					$this->getContentSub() .
+					$this->get( 'bodytext' ) .
+					$this->getClear()
 				)
-			) .
-			$this->getClear() .
-			Html::rawElement( 'div', [ 'class' => 'mw-body-content', 'id' => 'bodyContent' ],
-				$this->getContentSub() .
-				$this->get( 'bodytext' ) .
-				$this->getClear()
 			)
 		);
 

resources/screen-common.less

@@ -22,7 +22,7 @@ body {
 	padding: 1em @content-padding 3em;
 }
 
-#mw-content-text {
+#bodyContentOuter {
 	/* Set a z-index for the content to group it away from any nav stuff (extensions) - T200148 */
 	position: relative;
 	z-index: 0;