Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I2b15e07932e4fe8b2a49fa87bb6136a3b50b7786

i18n/da.json

@@ -16,6 +16,8 @@
 	"mobile-frontend-editor-disabled": "Denne side er beskyttet for at forhindre hærværk.",
 	"mobile-frontend-editor-edit": "Rediger",
 	"minerva-download": "Hent",
+	"skin-minerva-share": "Del",
+	"skin-minerva-mobile-option-MinervaShareButton": "Del",
 	"mobile-frontend-editor-redlink-create": "Opret side",
 	"mobile-frontend-editor-redlink-explain": "Denne side er endnu ikke blevet oprettet.",
 	"mobile-frontend-editor-redlink-leave": "Nej, tak.",

i18n/kjp.json

@@ -0,0 +1,9 @@
+{
+	"@metadata": {
+		"authors": [
+			"Rul1902"
+		]
+	},
+	"skin-minerva-share": "အင်းၮင်ႋဖ်ုရီ့",
+	"skin-minerva-mobile-option-MinervaShareButton": "အင်းၮင်ႋဖ်ုရီ့"
+}

i18n/lv.json

@@ -9,6 +9,9 @@
 	"mobile-frontend-editor-disabled": "Šī lapa ir aizsargāta, lai novērstu vandalismu.",
 	"mobile-frontend-editor-edit": "Labot",
 	"minerva-download": "Lejupielādēt",
+	"skin-minerva-share": "Dalīties",
+	"skin-minerva-mobile-option-MinervaShareButton": "Dalīties",
+	"skin-minerva-mobile-option-MinervaShareButton-description": "Dalīties",
 	"mobile-frontend-editor-redlink-create": "Izveidot lapu",
 	"mobile-frontend-editor-redlink-leave": "Nē, paldies.",
 	"mobile-frontend-history": "Apskatīt šīs lapas labojumu vēsturi",

i18n/ru.json

@@ -21,6 +21,8 @@
 	"mobile-frontend-editor-disabled": "Эта страница защищена ради предотвращения вандализма.",
 	"mobile-frontend-editor-edit": "Править",
 	"minerva-download": "Скачать",
+	"skin-minerva-share": "Поделиться",
+	"skin-minerva-mobile-option-MinervaShareButton": "Поделиться",
 	"mobile-frontend-editor-redlink-create": "Создать страницу",
 	"mobile-frontend-editor-redlink-explain": "Эта страница ещё не была создана.",
 	"mobile-frontend-editor-redlink-leave": "Нет, спасибо.",

i18n/sv.json

@@ -14,6 +14,9 @@
 	"mobile-frontend-editor-disabled": "Denna sida är skyddad för att förhindra vandalism.",
 	"mobile-frontend-editor-edit": "Redigera",
 	"minerva-download": "Ladda ned",
+	"skin-minerva-share": "Dela",
+	"skin-minerva-mobile-option-MinervaShareButton": "Dela",
+	"skin-minerva-mobile-option-MinervaShareButton-description": "Dela nuvarande artikel via webbläsarens delningsfunktion (endast webbläsare som stöds)",
 	"mobile-frontend-editor-redlink-create": "Skapa sida",
 	"mobile-frontend-editor-redlink-explain": "Denna sida har ännu inte skapats.",
 	"mobile-frontend-editor-redlink-leave": "Nej tack.",

i18n/tr.json

@@ -19,6 +19,8 @@
 	"mobile-frontend-editor-disabled": "Bu sayfa vandalizmi önlemek için korunmaktadır.",
 	"mobile-frontend-editor-edit": "Düzenle",
 	"minerva-download": "İndir",
+	"skin-minerva-share": "Paylaş",
+	"skin-minerva-mobile-option-MinervaShareButton": "Paylaş",
 	"mobile-frontend-editor-redlink-create": "Sayfayı oluştur",
 	"mobile-frontend-editor-redlink-explain": "Bu sayfa henüz oluşturulmadı.",
 	"mobile-frontend-editor-redlink-leave": "Hayır, teşekkürler.",

includes/skins/SkinMinerva.php

@@ -266,10 +266,10 @@ class SkinMinerva extends SkinTemplate {
 	 * @param Title $nt
 	 * @param string $section
 	 * @param string|null $tooltip
-	 * @param string|bool $lang
+	 * @param Language $lang
 	 * @return string
 	 */
-	public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
+	public function doEditSectionLink( Title $nt, $section, $tooltip, Language $lang ) {
 		if ( $this->isAllowedPageAction( 'edit' ) ) {
 			$message = $this->msg( 'mobile-frontend-editor-edit' )->inLanguage( $lang )->text();
 			$html = Html::openElement( 'span', [ 'class' => 'mw-editsection' ] );

minerva.less/minerva.variables.less

@@ -74,7 +74,7 @@
 @headingMargin: 0.5em;
 @sectionIconWidth: 30px;
 
-// blockquotes
+// blockquote
 @blockquotePaddingRight: 25px;
 @blockquotePaddingLeft: 30px;
 

resources/skins.minerva.base.styles/print/article.less

@@ -86,6 +86,12 @@
 		color: @colorGray2;
 	}
 
+	blockquote {
+		color: @colorGray5;
+		padding: 5px 39px;
+		font-style: italic;
+	}
+
 	.section-heading {
 		border-bottom: 0;
 		padding-bottom: 0;

resources/skins.minerva.base.styles/print/blockquotes.less

@@ -1,5 +0,0 @@
-blockquote {
-	color: @colorGray5;
-	font-style: italic;
-	padding: 5px 39px;
-}

resources/skins.minerva.base.styles/print/styles.less

@@ -43,7 +43,6 @@
 
 	@import 'header.less';
 	@import 'article.less';
-	@import 'blockquotes.less';
 	@import 'references.less';
 	@import 'footer.less';
 }

resources/skins.minerva.content.styles/blockquotes.less

@@ -1,20 +0,0 @@
-// Blockquotes
-//
-// Use the blockquote tag for quoted text.
-//
-// Markup:
-// <blockquote>In the end, it's not the years in your life that count. It's the life in your years.</blockquote>
-//
-// Styleguide 1.8.
-@import 'mediawiki.mixins.less';
-@import '../../minerva.less/minerva.variables';
-@import '../../minerva.less/minerva.mixins';
-
-blockquote {
-	border-left: 3px solid @colorGray12;
-	font-family: @fontFamilyHeading;
-	font-size: 1.1em;
-	padding: 1em @blockquotePaddingRight 1em @blockquotePaddingLeft;
-	position: relative;
-	overflow: hidden;
-}

resources/skins.minerva.content.styles/styles.less

@@ -2,7 +2,6 @@
 @import 'thumbnails.less';
 @import 'images.less';
 @import 'headings.less';
-@import 'blockquotes.less';
 @import 'lists.less';
 @import 'links.less';
 @import 'text.less';

resources/skins.minerva.content.styles/text.less

@@ -52,11 +52,20 @@
 	}
 }
 
-strong,
+b,
-b {
+strong {
 	font-weight: bold;
 }
 
+blockquote {
+	border-left: 3px solid @colorGray12;
+	font-family: @fontFamilyHeading;
+	font-size: 1.1em;
+	padding: 1em @blockquotePaddingRight 1em @blockquotePaddingLeft;
+	position: relative;
+	overflow: hidden;
+}
+
 em,
 i {
 	font-style: italic;

resources/skins.minerva.icons.images/edit.svg

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#54595d" d="M6.387 17.996l-1.12-1.12 12.38-12.38 1.12 1.118-12.38 12.382zM21.692 6.83l-3.52-3.521a1.058 1.058 0 0 0-1.495 0L3 16.985V22h5.015L21.692 8.323a1.06 1.06 0 0 0 0-1.493z"/></svg>
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#54595d" d="M19.5 9.8l2.2-2.2c.4-.4.4-1.1 0-1.6L18 2.3c-.4-.4-1.1-.4-1.6 0l-2.2 2.2 5.3 5.3zm-6.4-4.1L2 16.7V22h5.3l11.1-11.1c-.1 0-5.3-5.2-5.3-5.2z"/></svg>

resources/skins.minerva.scripts/pageIssuesLogger.js

@@ -49,9 +49,12 @@
 				function ( sectionStr ) { return parseInt( sectionStr, 10 ); }
 			);
 
+			// For backwards compatibility with cached WikimediaEvents code
+			// (remove me in a weeks time!! T207423)
+			mwTrack( 'wikimedia.event.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) );
 			// Log readingDepth schema.(ReadingDepth is guarded against multiple enables).
 			// See https://gerrit.wikimedia.org/r/#/c/mediawiki/extensions/WikimediaEvents/+/437686/
-			mwTrack( 'wikimedia.event.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) );
+			mwTrack( 'wikimedia.ReadingDepthSchema.enable', bucketToGroup( newTreatmentEnabled ) );
 			// Log PageIssues schema.
 			mwTrack( 'wikimedia.event.PageIssues', mixedData );
 		} );

tests/browser/features/support/pages/article_page.rb

@@ -53,8 +53,8 @@ class ArticlePage
   end
 
   ## watch star
-  button(:watch_star, text: 'Watch this page')
+  a(:watch_star, text: 'Watch this page')
-  button(:unwatch_star, text: 'Stop watching')
+  a(:unwatch_star, text: 'Stop watching')
   button(:watch_confirm, class: 'mw-htmlform-submit')
 
   # search