jenkins-bot has submitted this change and it was merged.
Change subject: Remove dead code in SkinMinervaBeta
......................................................................
Remove dead code in SkinMinervaBeta
All this code is unnecessary. The styles it adds are empty and
the logic in the methods is duplicating efforts in SkinMinerva
Bug: T147944
Change-Id: I084e51dcacdcdc29b55362b06c4001c3dd1344d9
---
M extension.json
M includes/skins/SkinMinervaBeta.php
D resources/skins.minerva.content.styles.beta/styles.less
D resources/skins.minerva.mainPage.beta.styles/common.less
4 files changed, 0 insertions(+), 69 deletions(-)
Approvals:
Bmansurov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 51605ef..42a6bf1 100644
--- a/extension.json
+++ b/extension.json
@@ -130,16 +130,6 @@
"resources/skins.minerva.content.styles/styles.less"
]
},
- "skins.minerva.content.styles.beta": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "position": "top",
- "styles": [
-
"resources/skins.minerva.content.styles.beta/styles.less"
- ]
- },
"mobile.pagelist.styles": {
"targets": [
"mobile",
@@ -260,16 +250,6 @@
"user":
"resources/skins.minerva.icons.images.scripts/userNormal.svg",
"anonymous":
"resources/skins.minerva.icons.images.scripts/userAnonymous.svg"
}
- },
- "skins.minerva.mainPage.beta.styles": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "position": "top",
- "styles": [
-
"resources/skins.minerva.mainPage.beta.styles/common.less"
- ]
},
"skins.minerva.footerV2.styles": {
"targets": [
diff --git a/includes/skins/SkinMinervaBeta.php
b/includes/skins/SkinMinervaBeta.php
index 4b62056..2df1af8 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -16,51 +16,6 @@
protected $mode = 'beta';
/**
- * Whether the new footer is to be used
- * @return boolean
- */
- public function isFooterV2() {
- return true;
- }
-
- /**
- * The "switch-language" is always allowed in MFBeta.
- *
- * @inheritdoc
- */
- protected function isAllowedPageAction( $action ) {
- return !$this->getTitle()->isMainPage() && $action ===
'switch-language' ?
- true : parent::isAllowedPageAction( $action );
- }
-
- /**
- * Do not return secondary actions on the user page.
- *
- * @inheritdoc
- */
- protected function getSecondaryActions( BaseTemplate $tpl ) {
- if ( $this->isUserPage ) {
- return [];
- } else {
- return parent::getSecondaryActions( $tpl );
- }
- }
-
- /**
- * Returns an array with details for a talk button.
- * @param Title $talkTitle Title object of the talk page
- * @param array $talkButton Array with data of desktop talk button
- * @return array
- */
- protected function getTalkButton( $talkTitle, $talkButton ) {
- $button = parent::getTalkButton( $talkTitle, $talkButton );
- // use a button with icon in beta
- $button['attributes']['class'] = MobileUI::iconClass( 'talk',
'before', 'talk icon-32px' );
-
- return $button;
- }
-
- /**
* Returns an array of modules related to the current context of the
page.
* @return array
*/
@@ -100,10 +55,6 @@
protected function getSkinStyles() {
$title = $this->getTitle();
$styles = parent::getSkinStyles();
- if ( $title->isMainPage() ) {
- $styles[] = 'skins.minerva.mainPage.beta.styles';
- }
- $styles[] = 'skins.minerva.content.styles.beta';
$styles[] = 'skins.minerva.icons.images.variants';
return $styles;
diff --git a/resources/skins.minerva.content.styles.beta/styles.less
b/resources/skins.minerva.content.styles.beta/styles.less
deleted file mode 100644
index e69de29..0000000
--- a/resources/skins.minerva.content.styles.beta/styles.less
+++ /dev/null
diff --git a/resources/skins.minerva.mainPage.beta.styles/common.less
b/resources/skins.minerva.mainPage.beta.styles/common.less
deleted file mode 100644
index e69de29..0000000
--- a/resources/skins.minerva.mainPage.beta.styles/common.less
+++ /dev/null
--
To view, visit https://gerrit.wikimedia.org/r/315540
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I084e51dcacdcdc29b55362b06c4001c3dd1344d9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
