diff --git a/i18n/da.json b/i18n/da.json
index b5f6c60..7f6bc4a 100644
--- a/i18n/da.json
+++ b/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.",
diff --git a/i18n/kjp.json b/i18n/kjp.json
new file mode 100644
index 0000000..8969221
--- /dev/null
+++ b/i18n/kjp.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": [
+ "Rul1902"
+ ]
+ },
+ "skin-minerva-share": "အင်းၮင်ႋဖ်ုရီ့",
+ "skin-minerva-mobile-option-MinervaShareButton": "အင်းၮင်ႋဖ်ုရီ့"
+}
diff --git a/i18n/lv.json b/i18n/lv.json
index 73ae9ec..9f09134 100644
--- a/i18n/lv.json
+++ b/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",
diff --git a/i18n/ru.json b/i18n/ru.json
index f975652..26d1d20 100644
--- a/i18n/ru.json
+++ b/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": "Нет, спасибо.",
diff --git a/i18n/sv.json b/i18n/sv.json
index 13c68d1..b992f07 100644
--- a/i18n/sv.json
+++ b/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.",
diff --git a/i18n/tr.json b/i18n/tr.json
index b42b8fe..672f80d 100644
--- a/i18n/tr.json
+++ b/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.",
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 207ac24..9f21c02 100644
--- a/includes/skins/SkinMinerva.php
+++ b/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' ] );
diff --git a/minerva.less/minerva.variables.less b/minerva.less/minerva.variables.less
index 7360d45..4ad5bfa 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -74,7 +74,7 @@
@headingMargin: 0.5em;
@sectionIconWidth: 30px;
-// blockquotes
+// blockquote
@blockquotePaddingRight: 25px;
@blockquotePaddingLeft: 30px;
diff --git a/resources/skins.minerva.base.styles/print/article.less b/resources/skins.minerva.base.styles/print/article.less
index 9b96ef3..a616889 100644
--- a/resources/skins.minerva.base.styles/print/article.less
+++ b/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;
diff --git a/resources/skins.minerva.base.styles/print/blockquotes.less b/resources/skins.minerva.base.styles/print/blockquotes.less
deleted file mode 100644
index 842d6e4..0000000
--- a/resources/skins.minerva.base.styles/print/blockquotes.less
+++ /dev/null
@@ -1,5 +0,0 @@
-blockquote {
- color: @colorGray5;
- font-style: italic;
- padding: 5px 39px;
-}
diff --git a/resources/skins.minerva.base.styles/print/styles.less b/resources/skins.minerva.base.styles/print/styles.less
index 28874ff..3580ee5 100644
--- a/resources/skins.minerva.base.styles/print/styles.less
+++ b/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';
}
diff --git a/resources/skins.minerva.content.styles/blockquotes.less b/resources/skins.minerva.content.styles/blockquotes.less
deleted file mode 100644
index a4024b8..0000000
--- a/resources/skins.minerva.content.styles/blockquotes.less
+++ /dev/null
@@ -1,20 +0,0 @@
-// Blockquotes
-//
-// Use the blockquote tag for quoted text.
-//
-// Markup:
-// In the end, it's not the years in your life that count. It's the life in your years.
-//
-// 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;
-}
diff --git a/resources/skins.minerva.content.styles/styles.less b/resources/skins.minerva.content.styles/styles.less
index 705eb66..447227d 100644
--- a/resources/skins.minerva.content.styles/styles.less
+++ b/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';
diff --git a/resources/skins.minerva.content.styles/text.less b/resources/skins.minerva.content.styles/text.less
index 435b64a..d78e5ce 100644
--- a/resources/skins.minerva.content.styles/text.less
+++ b/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;
diff --git a/resources/skins.minerva.icons.images/edit.svg b/resources/skins.minerva.icons.images/edit.svg
index b9bca20..fc29e93 100644
--- a/resources/skins.minerva.icons.images/edit.svg
+++ b/resources/skins.minerva.icons.images/edit.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/resources/skins.minerva.scripts/pageIssuesLogger.js b/resources/skins.minerva.scripts/pageIssuesLogger.js
index 51accb0..9756963 100644
--- a/resources/skins.minerva.scripts/pageIssuesLogger.js
+++ b/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 );
} );
diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb
index 0b313b1..80930d7 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -53,8 +53,8 @@ class ArticlePage
end
## watch star
- button(:watch_star, text: 'Watch this page')
- button(:unwatch_star, text: 'Stop watching')
+ a(:watch_star, text: 'Watch this page')
+ a(:unwatch_star, text: 'Stop watching')
button(:watch_confirm, class: 'mw-htmlform-submit')
# search