Merge "Revert "Move indicators underneath `#firstHeading` in DOM""

includes/VectorTemplate.php

@@ -138,6 +138,7 @@ class VectorTemplate extends BaseTemplate {
 		$commonSkinData = [
 			'html-headelement' => $this->get( 'headelement', '' ),
 			'html-sitenotice' => $this->get( 'sitenotice', null ),
+			'html-indicators' => $this->getIndicators(),
 			'page-langcode' => $this->getSkin()->getTitle()->getPageViewLanguage()->getHtmlCode(),
 			'page-isarticle' => (bool)$this->get( 'isarticle' ),
 
@@ -151,7 +152,6 @@ class VectorTemplate extends BaseTemplate {
 			'html-userlangattributes' => $this->get( 'userlangattributes', '' ),
 			// From OutputPage::getSubtitle()
 			'html-subtitle' => $this->get( 'subtitle', '' ),
-			'html-indicators' => $this->getIndicators(),
 
 			// TODO: Use directly Skin::getUndeleteLink() directly.
 			// Always returns string, cast to null if empty.

includes/templates/index.mustache

@@ -40,8 +40,8 @@
 <div id="content" class="mw-body" role="main">
 	<a id="top"></a>
 	{{#html-sitenotice}}<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>{{/html-sitenotice}}
-	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-indicators}}}
+	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-prebodyhtml}}}
 	<div id="bodyContent" class="mw-body-content">
 		{{#page-isarticle}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/page-isarticle}}

includes/templates/legacy.mustache

@@ -40,8 +40,8 @@
 <div id="content" class="mw-body" role="main">
 	<a id="top"></a>
 	{{#html-sitenotice}}<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>{{/html-sitenotice}}
-	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-indicators}}}
+	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-prebodyhtml}}}
 	<div id="bodyContent" class="mw-body-content">
 		{{#page-isarticle}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/page-isarticle}}

resources/skins.vector.styles/common.less

@@ -79,6 +79,18 @@ body {
 		/* Change the default from mediawiki.skinning CSS to let indicators float into heading area */
 		overflow: visible;
 	}
+
+	.mw-indicators {
+		float: right;
+		font-size: @font-size-base;
+		line-height: @line-height-base;
+		position: relative;
+		z-index: @z-index-indicators;
+	}
+
+	.mw-indicator {
+		display: inline-block;
+	}
 }
 
 .mw-body-content {
@@ -160,21 +172,6 @@ pre,
 	font-size: @font-size-site-notice;
 }
 
-.mw-indicators {
-	float: right;
-	z-index: @z-index-indicators;
-
-	// FIXME: Delete in 2 weeks time from when this comment was added
-	// and merge #firstHeading .mw-indicator rule into above, see T248761
-	#firstHeading + & {
-		margin-top: @margin-top-indicators;
-	}
-}
-
-.mw-indicator {
-	display: inline-block;
-}
-
 .mw-jump-link:not( :focus ) {
 	.mixin-screen-reader-text;
 }

variables.less

@@ -99,8 +99,6 @@
 // Using `unit()` without second parameter to achieve a unitless output for `line-height`.
 @line-height-nav-personal: unit( 14 / @font-size-browser / @font-size-nav-personal ); // Equals `1.667`.
 
-@margin-top-indicators: -( 38 / @font-size-browser / @font-size-base );
-
 // Tabs
 @font-size-tabs: unit( 13 / @font-size-browser, em ); // Equals `0.8125em`.